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

Mention the pgpkeys file.

Browse source 
Looked at by:	will

Update copyright.
This commit is contained in:
Trevor Johnson 2001-01-15 03:49:03 +00:00
parent 43501c2b42
commit 05e23a69fd
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=8685
2 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,11 +19,12 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.46 2000/12/28 13:40:03 jedgar Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.47 2001/01/13 02:04:07 dannyboy Exp $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
<year>2000</year> <year>2000</year>
<year>2001</year>
<holder>The FreeBSD Documentation Project</holder> <holder>The FreeBSD Documentation Project</holder>
</copyright> </copyright>
@ -515,11 +516,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.48 2001-01-15 03:49:03 trevor Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.48 2001-01-15 03:49:03 trevor Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.48 2001-01-15 03:49:03 trevor Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -792,6 +793,12 @@ checkout -P</programlisting>
format.</para> format.</para>
</listitem> </listitem>
<listitem>
<para>If you have a PGP or GnuPG key, you may want to add it to
<filename>doc/en_US.ISO_8859-1/books/handbook/pgpkeys</filename>.
</para>
</listitem>
<listitem> <listitem>
<para>Some people also add an entry for themselves to <para>Some people also add an entry for themselves to
<filename>ports/astro/xearth/files/freebsd.committers.markers</filename>.</para> <filename>ports/astro/xearth/files/freebsd.committers.markers</filename>.</para>

15
en_US.ISO_8859-1/articles/committers-guide/article.sgml
View file

@ -19,11 +19,12 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.46 2000/12/28 13:40:03 jedgar Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.47 2001/01/13 02:04:07 dannyboy Exp $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
<year>2000</year> <year>2000</year>
<year>2001</year>
<holder>The FreeBSD Documentation Project</holder> <holder>The FreeBSD Documentation Project</holder>
</copyright> </copyright>
@ -515,11 +516,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.48 2001-01-15 03:49:03 trevor Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.48 2001-01-15 03:49:03 trevor Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.48 2001-01-15 03:49:03 trevor Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -792,6 +793,12 @@ checkout -P</programlisting>
format.</para> format.</para>
</listitem> </listitem>
<listitem>
<para>If you have a PGP or GnuPG key, you may want to add it to
<filename>doc/en_US.ISO_8859-1/books/handbook/pgpkeys</filename>.
</para>
</listitem>
<listitem> <listitem>
<para>Some people also add an entry for themselves to <para>Some people also add an entry for themselves to
<filename>ports/astro/xearth/files/freebsd.committers.markers</filename>.</para> <filename>ports/astro/xearth/files/freebsd.committers.markers</filename>.</para>