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

Mention where can be found the FreeBSD.org users PGP keyring.

Browse source
This commit is contained in:
Marc Fonvieille 2004-08-08 10:01:19 +00:00
parent 2f9bce82af
commit 118a8be085
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=21861
1 changed files with 7 additions and 4 deletions

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

@ -715,11 +715,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.205 2004-08-06 07:39:09 blackend Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.206 2004-08-08 10:01:19 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.205 2004-08-06 07:39:09 blackend Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.205 2004-08-06 07:39:09 blackend Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.206 2004-08-08 10:01:19 blackend Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.206 2004-08-08 10:01:19 blackend Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1057,7 +1057,10 @@ checkout -P</programlisting>
<para>It is important to have an up-to-date PGP/GnuPG key in
the Handbook, since the key may be required for positive
identification of a committer, e.g. by the &a.admins; for
account recovery.</para>
account recovery. A complete keyring of <hostid
role="domainname">FreeBSD.org</hostid> users is available
for download from <ulink
url="&url.base;/doc/pgpkeyring.txt">http://www.FreeBSD.org/doc/pgpkeyring.txt</ulink>.</para>
</note>
</listitem>