os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Close para

Browse source
This commit is contained in:
Denis Peplin 2004-07-07 13:22:45 +00:00
parent 77fd23345e
commit 3c5ecbc144
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=21384
1 changed files with 4 additions and 4 deletions

8
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -685,11 +685,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.198 2004-07-06 15:09:51 hrs Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.199 2004-07-07 13:22:45 den 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.198 2004-07-06 15:09:51 hrs Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.198 2004-07-06 15:09:51 hrs Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.199 2004-07-07 13:22:45 den Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.199 2004-07-07 13:22:45 den Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -2637,7 +2637,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
<filename>Makefile</filename>. Do not connect the
new category to the build yet.</para>
<para>To do this, you will need to:
<para>To do this, you will need to:</para>
<procedure>
<step>
<para>Change the port's <makevar>CATEGORIES</makevar>