From owner-svn-doc-all@freebsd.org  Mon May  1 09:25:13 2017
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F935D5882B;
 Mon,  1 May 2017 09:25:13 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0F01EE3;
 Mon,  1 May 2017 09:25:12 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v419PCKP070152;
 Mon, 1 May 2017 09:25:12 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v419PCQ1070151;
 Mon, 1 May 2017 09:25:12 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201705010925.v419PCQ1070151@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 1 May 2017 09:25:12 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50215 - head/en_US.ISO8859-1/articles/committers-guide
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 May 2017 09:25:13 -0000

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>