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

Add RELENG_5 as a noteworthy CVS tag.

Browse source 
PR:		docs/74448
Submitted by:	Joel Dahl <joel@automatvapen.se>
This commit is contained in:
Murray Stokely 2004-11-27 21:48:00 +00:00
parent 54876df6c3
commit 60bdef3c95
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=23040
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -96,7 +96,7 @@
<row>
<entry><emphasis>Noteworthy CVS Tags</emphasis></entry>
<entry><literal>RELENG_4</literal> (4.X-STABLE), <literal>HEAD</literal> (-CURRENT)</entry>
<entry><literal>RELENG_4</literal> (4.X-STABLE), <literal>RELENG_5</literal> (5.X-STABLE), <literal>HEAD</literal> (-CURRENT)</entry>
</row>
</tbody>
</tgroup>
@ -727,11 +727,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.215 2004-10-11 17:06:14 keramida Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.216 2004-11-27 21:48:00 murray 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.215 2004-10-11 17:06:14 keramida Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.215 2004-10-11 17:06:14 keramida Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.216 2004-11-27 21:48:00 murray Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.216 2004-11-27 21:48:00 murray Exp $</literal> line intact).</para>
</listitem>
<listitem>