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

Update old release and branch tags to current reality.

Browse source 
No objection from:	-doc
This commit is contained in:
Dmitry Morozovsky 2006-03-10 07:16:55 +00:00
parent 9f12f32fec
commit 72942faa24
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=27295
1 changed files with 13 additions and 13 deletions

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

@ -469,9 +469,9 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
<listitem> <listitem>
<para>Check out the <filename>miscfs</filename> module as <para>Check out the <filename>miscfs</filename> module as
it is in the 4.X branch:</para> it is in the 6.X branch:</para>
<screen>&prompt.user; <userinput>cvs co -rRELENG_4 miscfs</userinput></screen> <screen>&prompt.user; <userinput>cvs co -rRELENG_6 miscfs</userinput></screen>
<para>You can modify the sources and commit along this <para>You can modify the sources and commit along this
branch.</para> branch.</para>
@ -479,12 +479,12 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
<listitem> <listitem>
<para>Check out the <filename>miscfs</filename> module as <para>Check out the <filename>miscfs</filename> module as
it was in 3.4-RELEASE.</para> it was in 6.0-RELEASE.</para>
<screen>&prompt.user; <userinput>cvs co -rRELENG_3_4_0_RELEASE miscfs</userinput></screen> <screen>&prompt.user; <userinput>cvs co -rRELENG_6_0_0_RELEASE miscfs</userinput></screen>
<para>You will not be able to commit modifications, since <para>You will not be able to commit modifications, since
<literal>RELENG_3_4_0_RELEASE</literal> is a point in time, not a branch.</para> <literal>RELENG_6_0_0_RELEASE</literal> is a point in time, not a branch.</para>
</listitem> </listitem>
<listitem> <listitem>
@ -718,7 +718,7 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
<para>Check out the &os.stable; version of the <para>Check out the &os.stable; version of the
<filename>shazam</filename> module:</para> <filename>shazam</filename> module:</para>
<screen>&prompt.user; <userinput>cvs co -rRELENG_5 shazam</userinput></screen> <screen>&prompt.user; <userinput>cvs co -rRELENG_6 shazam</userinput></screen>
</listitem> </listitem>
<listitem> <listitem>
@ -729,11 +729,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
</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.236 2006-02-20 07:34:48 joel Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.237 2006-03-10 07:16:55 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.236 2006-02-20 07:34:48 joel Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.237 2006-03-10 07:16:55 marck Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.236 2006-02-20 07:34:48 joel Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.237 2006-03-10 07:16:55 marck Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1991,7 +1991,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
fixes, etc.) In other words, apply common sense.</para> fixes, etc.) In other words, apply common sense.</para>
<para>Changes to the security branches <para>Changes to the security branches
(for example, <literal>RELENG_4_5</literal>) must be (for example, <literal>RELENG_6_0</literal>) must be
approved by a member of the &a.security-officer;, or in approved by a member of the &a.security-officer;, or in
some cases, by a member of the &a.re;.</para> some cases, by a member of the &a.re;.</para>
</listitem> </listitem>
@ -3069,14 +3069,14 @@ bak/packages packages from last complete &lt;major_version&gt; run on &lt;arch&
<command>cvs add</command> as you normally would. For <command>cvs add</command> as you normally would. For
example, if you wanted to MFC the file example, if you wanted to MFC the file
<filename>src/sys/alpha/include/smp.h</filename> from HEAD <filename>src/sys/alpha/include/smp.h</filename> from HEAD
to RELENG_4 and it does not exist in RELENG_4 yet, you would to RELENG_6 and it does not exist in RELENG_6 yet, you would
use the following steps:</para> use the following steps:</para>
<example> <example>
<title>MFC'ing a New File</title> <title>MFC'ing a New File</title>
<screen>&prompt.user; <userinput>cd sys/alpha/include</userinput> <screen>&prompt.user; <userinput>cd sys/alpha/include</userinput>
&prompt.user; <userinput>cvs update -rRELENG_4</userinput> &prompt.user; <userinput>cvs update -rRELENG_6</userinput>
cvs update: Updating . cvs update: Updating .
U clockvar.h U clockvar.h
U console.h U console.h
@ -3088,7 +3088,7 @@ RCS: /usr/cvs/src/sys/alpha/include/smp.h,v
VERS: 1.1 VERS: 1.1
*************** ***************
&prompt.user; <userinput>cvs add smp.h</userinput> &prompt.user; <userinput>cvs add smp.h</userinput>
cvs add: scheduling file `smp.h' for addition on branch `RELENG_4' cvs add: scheduling file `smp.h' for addition on branch `RELENG_6'
cvs add: use 'cvs commit' to add this file permanently cvs add: use 'cvs commit' to add this file permanently
&prompt.user; <userinput>cvs commit</userinput> &prompt.user; <userinput>cvs commit</userinput>
</screen> </screen>