svn commit: r49800 - head/en_US.ISO8859-1/articles/committers-guide

[Glen Barber]

Author: gjb
Date: Fri Jan  6 22:28:56 2017
New Revision: 49800
URL: https://svnweb.freebsd.org/changeset/doc/49800

Log:
  Further clarify the source and target branches when merging.
  While here, bump the Copyright year.
  
  Submitted by:	ngie
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/en_US.ISO8859-1/articles/committers-guide/article.xml

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Fri Jan  6 20:02:33 2017	(r49799)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Fri Jan  6 22:28:56 2017	(r49800)
@@ -33,6 +33,8 @@
       <year>2013</year>
       <year>2014</year>
       <year>2015</year>
+      <year>2016</year>
+      <year>2017</year>
       <holder>The &os; Documentation Project</holder>
     </copyright>
 
@@ -1255,6 +1257,41 @@ You need a Passphrase to protect your se
 	    not been.</para>
 	</sect4>
 
+	<sect4 xml:id="merge-source">
+	  <title>Selecting the Source and Target Branch
+	    When Merging</title>
+
+	  <para>Merging to <literal>stable/</literal> branches should
+	    originate from <literal>head/</literal>.  For
+	    example:</para>
+
+	  <screen>&prompt.user; svn merge -c <replaceable>r123456</replaceable> ^/head/ stable/<replaceable>11</replaceable>
+&prompt.user; svn commit stable/<replaceable>11</replaceable></screen>
+
+	  <note>
+	    <para>Note the sections below which outline changes to
+	      the target location of the <literal>stable</literal>
+	      branch starting with
+	      <literal>stable/10</literal>.</para>
+	  </note>
+
+	  <para>Merges to <literal>releng/</literal> branches should
+	    always originate from the corresponding
+	    <literal>stable/</literal> branch.  For example:</para>
+
+	  <screen>&prompt.user; svn merge -c <replaceable>r123456</replaceable> ^/stable/<replaceable>11</replaceable>  releng/<replaceable>11.0</replaceable>
+&prompt.user; svn commit releng/<replaceable>11.0</replaceable></screen>
+
+	  <note>
+	    <para>Committers are only permitted to commit to the
+	      <literal>releng</literal> branches during a release
+	      cycle after receiving approval from the Release
+	      Engineering Team, after which only the Security Officer
+	      may commit to a <literal>releng</literal> branch for
+	      a Security Advisory or Errata Notice.</para>
+	  </note>
+	</sect4>
+
 	<sect4 xml:id="merge">
 	  <title>Selecting the Source and Target for
 	    <literal>stable/10</literal> and Newer</title>
@@ -1270,12 +1307,6 @@ You need a Passphrase to protect your se
 	  <para>Note that <replaceable>checkout</replaceable> should
 	    be a complete checkout of the branch to which the merge
 	    occurs.</para>
-
-	  <para>Merges to <literal>releng/</literal> branches should
-	    always originate from the corresponding
-	    <literal>stable/</literal> branch.  For example:</para>
-
-	  <screen>&prompt.user; svn merge -c <replaceable>r123456</replaceable> ^/stable/<replaceable>10</replaceable> releng/<replaceable>10.0</replaceable></screen>
 	</sect4>
 
 	<sect4 xml:id="oldmerge">