Attachment 113314 Details for Bug 154836 – committers-guide.diff

[patch] committers-guide.diff

committers-guide.diff (text/plain), 1.59 KB, created by Sahil Tandon on 2011-02-17 00:50:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sahil Tandon

Created: 2011-02-17 00:50:09 UTC

Size: 1.59 KB

patch

obsolete

>Index: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml
>===================================================================
>RCS file: /home/dcvs/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v
>retrieving revision 1.290
>diff -u -r1.290 article.sgml
>--- doc/en_US.ISO8859-1/articles/committers-guide/article.sgml	31 Jul 2010 10:39:08 -0000	1.290
>+++ doc/en_US.ISO8859-1/articles/committers-guide/article.sgml	17 Feb 2011 00:29:46 -0000
>@@ -24,6 +24,7 @@
>       <year>2008</year>
>       <year>2009</year>
>       <year>2010</year>
>+      <year>2011</year>
>       <holder>The FreeBSD Documentation Project</holder>
>     </copyright>
> 
>@@ -126,7 +127,6 @@
> 	  <row>
> 	    <entry><emphasis>Noteworthy CVSup Tags</emphasis></entry>
> 	    <entry>
>-	      <literal>RELENG_6</literal> (6.X-STABLE), 
> 	      <literal>RELENG_7</literal> (7.X-STABLE), 
> 	      <literal>RELENG_8</literal> (8.X-STABLE), 
> 	      <literal>HEAD</literal> (-CURRENT)
>@@ -137,7 +137,6 @@
> 	    <entry><emphasis>Noteworthy SVN Branches</emphasis></entry>
> 
> 	    <entry>
>-	      <literal>stable/6</literal> (6.X-STABLE),
> 	      <literal>stable/7</literal> (7.X-STABLE),
> 	      <literal>stable/8</literal> (8.X-STABLE),
> 	      <literal>head</literal> (-CURRENT)
>@@ -2071,7 +2070,7 @@
> 	    fixes, etc.)  In other words, apply common sense.</para>
> 
> 	  <para>Changes to the security branches
>-	    (for example, <literal>RELENG_6_0</literal>) must be
>+	    (for example, <literal>RELENG_7_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>

Actions: View | Diff

Attachments on bug 154836: 113314