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

Close / fix pair tags

Browse source
This commit is contained in:
Denis Peplin 2004-07-06 14:25:55 +00:00
parent de61b136c3
commit 59859e64cb
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=21372
11 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
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.196 2004-07-01 18:58:14 maxim Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.197 2004-07-06 14:25:53 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.196 2004-07-01 18:58:14 maxim Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.196 2004-07-01 18:58:14 maxim Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.197 2004-07-06 14:25:53 den Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.197 2004-07-06 14:25:53 den Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -995,6 +995,7 @@ checkout -P</programlisting>
<para>This is a relatively easy task, but remains a good first test of
your CVS skills.</para>
</listitem>
<listitem>
<para>Add yourself to the <quote>Developers</quote> section of