os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update links regarding pgpkeys to match new pgpkeys files location

Browse source 
(doc/share/pgpkeys).
This commit is contained in:
Marc Fonvieille 2003-05-08 10:21:18 +00:00
parent dc68e8657b
commit 4dfc0b1405
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=16833
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -607,11 +607,11 @@
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.165 2003-04-11 01:11:36 keramida Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.166 2003-05-08 10:21:18 blackend Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.165 2003-04-11 01:11:36 keramida Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.165 2003-04-11 01:11:36 keramida Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.166 2003-05-08 10:21:18 blackend Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.166 2003-05-08 10:21:18 blackend Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -931,13 +931,13 @@ checkout -P</programlisting>
<listitem>
<para>If you have a PGP or GnuPG key, you may want to add it to
<filename>doc/en_US.ISO8859-1/books/handbook/pgpkeys</filename>.
<filename>doc/share/pgpkeys</filename>.
</para>
<para>&a.des; has
written a shell script to make this extremely simple. See the
<ulink
url="http://cvsweb.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/pgpkeys/README">README</ulink>
url="http://cvsweb.FreeBSD.org/doc/share/pgpkeys/README">README</ulink>
file for more information.</para>
</listitem>