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

- Remove the EOLed RELENG4.

Browse source
This commit is contained in:
Chin-San Huang 2007-07-06 16:37:13 +00:00
parent 88efa7a228
commit 40a516f06e
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=30426
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,7 +113,7 @@
<row> <row>
<entry><emphasis>Noteworthy CVS Tags</emphasis></entry> <entry><emphasis>Noteworthy CVS Tags</emphasis></entry>
<entry><literal>RELENG_4</literal> (4.X-STABLE), <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>HEAD</literal> (-CURRENT)</entry>
</row> </row>
</tbody> </tbody>
</tgroup> </tgroup>
@ -745,11 +745,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.266 2007-06-30 02:24:15 linimon Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.267 2007-07-06 16:37:13 chinsan 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.266 2007-06-30 02:24:15 linimon Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.267 2007-07-06 16:37:13 chinsan Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.266 2007-06-30 02:24:15 linimon Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.267 2007-07-06 16:37:13 chinsan Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>