View | Details | Raw Unified | Return to bug 154836
Collapse All | Expand All

(-)doc/en_US.ISO8859-1/articles/committers-guide/article.sgml (-3 / +2 lines)
Lines 24-29 Link Here
24
      <year>2008</year>
24
      <year>2008</year>
25
      <year>2009</year>
25
      <year>2009</year>
26
      <year>2010</year>
26
      <year>2010</year>
27
      <year>2011</year>
27
      <holder>The FreeBSD Documentation Project</holder>
28
      <holder>The FreeBSD Documentation Project</holder>
28
    </copyright>
29
    </copyright>
29
30
Lines 126-132 Link Here
126
	  <row>
127
	  <row>
127
	    <entry><emphasis>Noteworthy CVSup Tags</emphasis></entry>
128
	    <entry><emphasis>Noteworthy CVSup Tags</emphasis></entry>
128
	    <entry>
129
	    <entry>
129
	      <literal>RELENG_6</literal> (6.X-STABLE), 
130
	      <literal>RELENG_7</literal> (7.X-STABLE), 
130
	      <literal>RELENG_7</literal> (7.X-STABLE), 
131
	      <literal>RELENG_8</literal> (8.X-STABLE), 
131
	      <literal>RELENG_8</literal> (8.X-STABLE), 
132
	      <literal>HEAD</literal> (-CURRENT)
132
	      <literal>HEAD</literal> (-CURRENT)
Lines 137-143 Link Here
137
	    <entry><emphasis>Noteworthy SVN Branches</emphasis></entry>
137
	    <entry><emphasis>Noteworthy SVN Branches</emphasis></entry>
138
138
139
	    <entry>
139
	    <entry>
140
	      <literal>stable/6</literal> (6.X-STABLE),
141
	      <literal>stable/7</literal> (7.X-STABLE),
140
	      <literal>stable/7</literal> (7.X-STABLE),
142
	      <literal>stable/8</literal> (8.X-STABLE),
141
	      <literal>stable/8</literal> (8.X-STABLE),
143
	      <literal>head</literal> (-CURRENT)
142
	      <literal>head</literal> (-CURRENT)
Lines 2071-2077 Link Here
2071
	    fixes, etc.)  In other words, apply common sense.</para>
2070
	    fixes, etc.)  In other words, apply common sense.</para>
2072
2071
2073
	  <para>Changes to the security branches
2072
	  <para>Changes to the security branches
2074
	    (for example, <literal>RELENG_6_0</literal>) must be
2073
	    (for example, <literal>RELENG_7_0</literal>) must be
2075
	    approved by a member of the &a.security-officer;, or in
2074
	    approved by a member of the &a.security-officer;, or in
2076
	    some cases, by a member of the &a.re;.</para>
2075
	    some cases, by a member of the &a.re;.</para>
2077
	</listitem>
2076
	</listitem>

Return to bug 154836