diff options
Diffstat (limited to 'en_US.ISO8859-1/articles/committers-guide/article.sgml')
| -rw-r--r-- | en_US.ISO8859-1/articles/committers-guide/article.sgml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index d815e9ef34..638693ad03 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -19,7 +19,7 @@ </author> </authorgroup> - <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.70 2001/06/03 21:39:50 dd Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.71 2001/06/09 14:01:06 nik Exp $</pubdate> <copyright> <year>1999</year> @@ -519,11 +519,11 @@ </itemizedlist> <para>You'll almost certainly get a conflict because - of the <literal>$Id: article.sgml,v 1.71 2001-06-09 14:01:06 nik Exp $</literal> (or in FreeBSD's case, + of the <literal>$Id: article.sgml,v 1.72 2001-06-11 01:16:39 ache Exp $</literal> (or in FreeBSD's case, <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit the file to resolve the conflict (remove the marker lines and - the second <literal>$Id: article.sgml,v 1.71 2001-06-09 14:01:06 nik Exp $</literal> line, leaving the original - <literal>$Id: article.sgml,v 1.71 2001-06-09 14:01:06 nik Exp $</literal> line intact).</para> + the second <literal>$Id: article.sgml,v 1.72 2001-06-11 01:16:39 ache Exp $</literal> line, leaving the original + <literal>$Id: article.sgml,v 1.72 2001-06-11 01:16:39 ache Exp $</literal> line intact).</para> </listitem> <listitem> @@ -798,7 +798,7 @@ checkout -P</programlisting> <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>. + <filename>doc/en_US.ISO8859-1/books/handbook/pgpkeys</filename>. </para> </listitem> |