From sahil@spartan.hamla.org  Thu Feb 17 00:40:10 2011
Return-Path: <sahil@spartan.hamla.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)
Message-Id: <20110217003958.7295F17145@spartan.hamla.org>
Date: Wed, 16 Feb 2011 19:39:58 -0500 (EST)
From: Sahil Tandon <sahil@FreeBSD.org>
Reply-To: Sahil Tandon <sahil@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: doc@FreeBSD.org 
Subject: [PATCH] Committer's Guide: remove mention of RELENG_6 and bump copyright year
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         154836
>Category:       docs
>Synopsis:       [PATCH] Committer's Guide: remove mention of RELENG_6 and bump copyright year
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ryusuke
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 17 00:50:09 UTC 2011
>Closed-Date:    Thu Feb 17 15:44:42 UTC 2011
>Last-Modified:  Thu Feb 17 15:50:05 UTC 2011
>Originator:     Sahil Tandon
>Release:        FreeBSD 9.0-CURRENT i386
>Organization:
>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 ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->ryusuke 
Responsible-Changed-By: ryusuke 
Responsible-Changed-When: Thu Feb 17 15:33:18 UTC 2011 
Responsible-Changed-Why:  
I'll take this.  

http://www.freebsd.org/cgi/query-pr.cgi?pr=154836 
State-Changed-From-To: open->closed 
State-Changed-By: ryusuke 
State-Changed-When: Thu Feb 17 15:43:39 UTC 2011 
State-Changed-Why:  
Committed the patch, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=154836 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/154836: commit references a PR
Date: Thu, 17 Feb 2011 15:43:06 +0000 (UTC)

 ryusuke     2011-02-17 15:43:01 UTC
 
   FreeBSD doc repository
 
   Modified files:
     en_US.ISO8859-1/articles/committers-guide article.sgml 
   Log:
   - Update copyright year to include 2011
   - Remove mention of RELENG_6
   
   PR: docs/154836
   Submitted by: sahil
   
   Revision  Changes    Path
   1.291     +2 -3      doc/en_US.ISO8859-1/articles/committers-guide/article.sgml
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
