diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index a9fa47258e..459e6cc403 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -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.204 2004-08-05 10:04:26 den Exp $</literal> (or in FreeBSD's case, + of the <literal>$Id: article.sgml,v 1.205 2004-08-06 07:39:09 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.204 2004-08-05 10:04:26 den Exp $</literal> line, - leaving the original <literal>$Id: article.sgml,v 1.204 2004-08-05 10:04:26 den Exp $</literal> line intact).</para> + (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> </listitem> <listitem> @@ -1421,7 +1421,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting> ensuring that the FreeBSD website and documentation on the FTP site is up to date with respect to the CVS tree. It is not a conflict resolution body. The vast majority of documentation - related discussion takes place on the &a.doc;. Committers + related discussion takes place on the &a.doc;. More details regarding the doceng team can be found in its <ulink url="http://www.FreeBSD.org/internal/doceng.html">charter</ulink>. Committers interested in contributing to the documentation should familiarize themselves with the <ulink url="&url.books.fdp-primer;/index.html">Documentation Project