diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 29e4a3302c..30226eec20 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -750,11 +750,11 @@ alias scvs cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p </itemizedlist> <para>You will almost certainly get a conflict because - of the <literal>$Id: article.sgml,v 1.274 2008-05-11 19:24:40 pav Exp $</literal> (or in FreeBSD's case, + of the <literal>$Id: article.sgml,v 1.275 2008-06-20 00:28:50 erwin 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.274 2008-05-11 19:24:40 pav Exp $</literal> line, - leaving the original <literal>$Id: article.sgml,v 1.274 2008-05-11 19:24:40 pav Exp $</literal> line intact).</para> + (remove the marker lines and the second <literal>$Id: article.sgml,v 1.275 2008-06-20 00:28:50 erwin Exp $</literal> line, + leaving the original <literal>$Id: article.sgml,v 1.275 2008-06-20 00:28:50 erwin Exp $</literal> line intact).</para> </listitem> <listitem> @@ -2517,8 +2517,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting> <hostid>freefall</hostid>. It will add a port from the directory you specify, determining the category automatically from the port <filename>Makefile</filename>. - It will also add an entry to the - <filename>CVSROOT/modules</filename> file and the port's + It will also add an entry to the port's category <filename>Makefile</filename>. It was written by &a.mharo; and &a.will;, and is currently maintained by &a.garga;, so please send questions/patches about @@ -2614,11 +2613,6 @@ docs:Documentation Bug:freebsd-doc:</programlisting> in the parent directory <filename>Makefile</filename>.</para> </step> - <step> - <para>Remove the module entry in - <filename>CVSROOT/modules</filename>.</para> - </step> - <step> <para>Add an entry to <filename>ports/MOVED</filename>.</para> @@ -2740,11 +2734,6 @@ docs:Documentation Bug:freebsd-doc:</programlisting> <filename>Makefile</filename> accordingly</para> </step> - <step> - <para>Add the new module entry to - <filename>CVSROOT/modules</filename>.</para> - </step> - <step> <para>Add an entry to <filename>ports/MOVED</filename>, if you remove the @@ -3020,23 +3009,6 @@ docs:Documentation Bug:freebsd-doc:</programlisting> for the old category or categories.</para> </step> - <step> - <para>Add the following module entry to - <filename>CVSROOT-ports/modules</filename>: - <programlisting>ports_<replaceable>categoryname</replaceable> <replaceable>categoryname</replaceable></programlisting> - </para> - - <para>The whitespace should be a tab.</para> - - <para>If the <replaceable>categoryname</replaceable> - contains a dash, convert that to an underscore first.</para> - </step> - - <step> - <para>Change all the affected port module entries in - <filename>CVSROOT-ports/modules</filename>.</para> - </step> - <step> <para>Add appropriate entries to <filename>ports/MOVED</filename>.</para>