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

Mention RELENG_7 tag. Wrap long line while I'm here.

Browse source
This commit is contained in:
Dmitry Morozovsky 2007-10-15 13:27:28 +00:00
parent d63ce0223a
commit 31eacb4167
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=30906
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -114,7 +114,11 @@
<row> <row>
<entry><emphasis>Noteworthy CVS Tags</emphasis></entry> <entry><emphasis>Noteworthy CVS Tags</emphasis></entry>
<entry><literal>RELENG_5</literal> (5.X-STABLE), <literal>RELENG_6</literal> (6.X-STABLE), <literal>HEAD</literal> (-CURRENT)</entry> <entry><literal>RELENG_5</literal> (5.X-STABLE),
<literal>RELENG_6</literal> (6.X-STABLE),
<literal>RELENG_7</literal> (7.X-STABLE),
<literal>HEAD</literal> (-CURRENT)
</entry>
</row> </row>
</tbody> </tbody>
</tgroup> </tgroup>
@ -746,11 +750,11 @@ alias scvs cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p
</itemizedlist> </itemizedlist>
<para>You will almost certainly get a conflict because <para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.268 2007-08-10 17:58:16 keramida Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.269 2007-10-15 13:27:28 marck Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict 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.268 2007-08-10 17:58:16 keramida Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.269 2007-10-15 13:27:28 marck Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.268 2007-08-10 17:58:16 keramida Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.269 2007-10-15 13:27:28 marck Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>