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

[Mathieu Arnold]

Author: mat
Date: Tue Jan  3 18:39:02 2017
New Revision: 49792
URL: https://svnweb.freebsd.org/changeset/doc/49792

Log:
  Note the branch name as the first argument of mfh is obsolete.
  
  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	Tue Jan  3 16:43:38 2017	(r49791)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Tue Jan  3 18:39:02 2017	(r49792)
@@ -4739,7 +4739,7 @@ Relnotes:           yes</programlisting>
 	      commit: <filename>ports/Tools/scripts/mfh</filename>.
 	      It is used as follows:</para>
 
-	    <screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh 2015Q1 380362</userinput>
+	    <screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh 380362</userinput>
  U   2015Q1
 Checked out revision 380443.
 A    2015Q1/security
@@ -4825,8 +4825,17 @@ Do you want to commit? (no = start a she
 		messages must be edited to show what is actually being
 		done with the new commit.</para>
 
-	      <screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh 2016Q1 r407208 r407713 r407722 r408567 r408943 r410728</userinput></screen>
+	      <screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh r407208 r407713 r407722 r408567 r408943 r410728</userinput></screen>
 	    </tip>
+
+	    <note>
+	      <para>The mfh script can also take an optional first
+		argument, the branch where the merge is being done.
+		It does, however, select the latest branch, so
+		specifying the branch is discourraged.</para>
+
+	      <screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh 2016Q1 r407208 r407713</userinput></screen>
+	    </note>
 	  </answer>
 	</qandaentry>