diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 5e2cae8822..09377eaa7d 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -592,11 +592,11 @@ </itemizedlist> <para>You will almost certainly get a conflict because - of the <literal>$Id: article.sgml,v 1.141 2002-11-02 00:28:25 rwatson Exp $</literal> (or in FreeBSD's case, + of the <literal>$Id: article.sgml,v 1.142 2002-11-02 16:48:43 rwatson 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.141 2002-11-02 00:28:25 rwatson Exp $</literal> line, leaving the original - <literal>$Id: article.sgml,v 1.141 2002-11-02 00:28:25 rwatson Exp $</literal> line intact).</para> + the second <literal>$Id: article.sgml,v 1.142 2002-11-02 16:48:43 rwatson Exp $</literal> line, leaving the original + <literal>$Id: article.sgml,v 1.142 2002-11-02 16:48:43 rwatson Exp $</literal> line intact).</para> </listitem> <listitem> @@ -2026,7 +2026,7 @@ docs:Documentation Bug:nik:</programlisting> with respects to all aspects of the FreeBSD operating system, including installation and development environments.</para> - <para>Current Tier 1 platforms are i386, sparc65, PC98, and + <para>Current Tier 1 platforms are i386, sparc64, PC98, and Alpha.</para> </sect2>