Date: Wed, 16 Feb 2011 19:39:58 -0500 (EST) From: Sahil Tandon <sahil@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: doc@FreeBSD.org Subject: docs/154836: [PATCH] Committer's Guide: remove mention of RELENG_6 and bump copyright year Message-ID: <20110217003958.7295F17145@spartan.hamla.org> Resent-Message-ID: <201102170050.p1H0o9Oq056327@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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: freebsd-doc
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: doc-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 17 00:50:09 UTC 2011
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110217003958.7295F17145>