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

[Ed Maste]

Author: emaste (src committer)
Date: Wed May  3 18:04:24 2017
New Revision: 50227
URL: https://svnweb.freebsd.org/changeset/doc/50227

Log:
  committer's guide: document MFC to: and MFC with:
  
  There are a couple of different forms of these in use. Add "MFC to:" and
  "MFC with:" tags consistent with the existing "MFC after:", and provide
  a description so that consistent values can be used.
  
  There are ongoing discussions about "X-MFC-*" tags which still need to be
  resolved and documented here, or general guidance on X-MFC-*.
  
  Reviewed by:	bcr, ngie
  Differential Revision:	https://reviews.freebsd.org/D10585

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 May  2 17:05:20 2017	(r50226)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Wed May  3 18:04:24 2017	(r50227)
@@ -2586,6 +2586,21 @@ freebsd-mfc-after = 2 weeks</programlist
 	  </row>
 
 	  <row>
+	    <entry><literal>MFC to:</literal></entry>
+	    <entry>If the commit should be merged to a subset of
+	      stable branches, specify the branch names.</entry>
+	  </row>
+
+	  <row>
+	    <entry><literal>MFC with:</literal></entry>
+	    <entry>If the commit should be merged together with
+	      a previous one in a single
+	      <acronym>MFC</acronym> commit (for example, where
+	      this commit corrects a bug in the previous change),
+	      specify the corresponding revision number.</entry>
+	  </row>
+
+	  <row>
 	    <entry><literal>Relnotes:</literal></entry>
 	    <entry>If the change is a candidate for inclusion in
 	      the release notes for the next release from the branch,