From owner-freebsd-doc@FreeBSD.ORG  Thu Feb 17 00:40:10 2011
Return-Path: <owner-freebsd-doc@FreeBSD.ORG>
Delivered-To: doc@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 23DCE1065673;
	Thu, 17 Feb 2011 00:40:10 +0000 (UTC)
	(envelope-from sahil@spartan.hamla.org)
Received: from spartan.hamla.org (spartan.hamla.org [206.251.255.30])
	by mx1.freebsd.org (Postfix) with ESMTP id 99E3A8FC08;
	Thu, 17 Feb 2011 00:40:03 +0000 (UTC)
Received: by spartan.hamla.org (Postfix, from userid 1001)
	id 7295F17145; Wed, 16 Feb 2011 19:39:58 -0500 (EST)
To: FreeBSD-gnats-submit@freebsd.org
From: Sahil Tandon <sahil@FreeBSD.org>
X-send-pr-version: 3.113
X-GNATS-Notify: 
Message-Id: <20110217003958.7295F17145@spartan.hamla.org>
Date: Wed, 16 Feb 2011 19:39:58 -0500 (EST)
Cc: doc@FreeBSD.org
Subject: [PATCH] Committer's Guide: remove mention of RELENG_6 and bump
	copyright year
X-BeenThere: freebsd-doc@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Sahil Tandon <sahil@FreeBSD.org>
List-Id: Documentation project <freebsd-doc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-doc>
List-Post: <mailto:freebsd-doc@freebsd.org>
List-Help: <mailto:freebsd-doc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Feb 2011 00:40:10 -0000


>Submitter-Id:	current-users
>Originator:	Sahil Tandon
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] Committer's Guide: remove mention of RELENG_6 and bump copyright year
>Severity:	non-critical 
>Priority:	low 
>Category:	docs 
>Class:		doc-bug 
>Release:	FreeBSD 9.0-CURRENT i386
>Environment:

	
>Description:
- Update copyright year to include 2011
- Remove mention of RELENG_6
>How-To-Repeat:
	
>Fix:

	



--- committers-guide.diff begins here ---
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>
--- committers-guide.diff ends here ---