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

[Mathieu Arnold]

Author: mat
Date: Mon May  1 09:25:11 2017
New Revision: 50215
URL: https://svnweb.freebsd.org/changeset/doc/50215

Log:
  Split the request and the merge actions into two separate questions.
  
  Sponsored by:	Absolight

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	Sun Apr 30 09:36:57 2017	(r50214)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Mon May  1 09:25:11 2017	(r50215)
@@ -4487,7 +4487,16 @@ Relnotes:           yes</programlisting>
 	      to the &a.ports-secteam; and the &a.portmgr; with the revision
 	      number and a small description of why the commit needs
 	      to be merged.</para>
+	  </answer>
+	</qandaentry>
+
+	<qandaentry xml:id="ports-qa-misc-commit-mfh">
+	  <question>
+	    <para>What is the procedure for merging commits to the
+	      quarterly branch?</para>
+	  </question>
 
+	  <answer>
 	    <para>A script is provided to automate merging a specific
 	      commit: <filename>ports/Tools/scripts/mfh</filename>.
 	      It is used as follows:</para>