diff options
| -rw-r--r-- | en_US.ISO8859-1/articles/committers-guide/article.sgml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index f9c3defb30..55cda85b16 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -730,11 +730,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.254 2007-01-10 15:13:57 rwatson Exp $</literal> (or in FreeBSD's case, + of the <literal>$Id: article.sgml,v 1.255 2007-01-31 17:05:51 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.254 2007-01-10 15:13:57 rwatson Exp $</literal> line, - leaving the original <literal>$Id: article.sgml,v 1.254 2007-01-10 15:13:57 rwatson Exp $</literal> line intact).</para> + (remove the marker lines and the second <literal>$Id: article.sgml,v 1.255 2007-01-31 17:05:51 erwin Exp $</literal> line, + leaving the original <literal>$Id: article.sgml,v 1.255 2007-01-31 17:05:51 erwin Exp $</literal> line intact).</para> </listitem> <listitem> @@ -2942,6 +2942,12 @@ docs:Documentation Bug:freebsd-doc:</programlisting> </step> <step> + <para> + Update the list of categories used by &man.sysinstall.8; + in <filename>src/usr.sbin/sysinstall</filename>.</para> + </step> + + <step> <para>Update the documentation by modifying the following:</para> |