committers-guide: update old releases and branches to current reality

[Dmitry Morozovsky]

Dear colleagues,

any objections to the following patch?

Sincerely,
D.Marck                                     [DM5020, MCK-RIPE, DM3-RIPN]
------------------------------------------------------------------------
*** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck at rinet.ru ***
------------------------------------------------------------------------
-------------- next part --------------
Index: article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v
retrieving revision 1.236
diff -u -r1.236 article.sgml
--- article.sgml	20 Feb 2006 07:34:48 -0000	1.236
+++ article.sgml	8 Mar 2006 14:47:57 -0000
@@ -469,9 +469,9 @@
 
 	  <listitem>
 	    <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
 	      branch.</para>
@@ -479,12 +479,12 @@
 
 	  <listitem>
 	    <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
-	      <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>
@@ -718,7 +718,7 @@
 	    <para>Check out the &os.stable; version of the
 	      <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>
@@ -1991,7 +1991,7 @@
 	    fixes, etc.)  In other words, apply common sense.</para>
 
 	  <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
 	    some cases, by a member of the &a.re;.</para>
 	</listitem>
@@ -3069,14 +3069,14 @@
 	  <command>cvs add</command> as you normally would.  For
 	  example, if you wanted to MFC the file
 	  <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>
 
 	  <example>
 	    <title>MFC'ing a New File</title>
 
 	    <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 .
 U clockvar.h
 U console.h
@@ -3088,7 +3088,7 @@
 VERS: 1.1
 ***************
 &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
 &prompt.user; <userinput>cvs commit</userinput>
 	    </screen>