From owner-svn-doc-all@freebsd.org Wed May 3 18:04:26 2017 Return-Path: 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 3C0B5D5CDA2; Wed, 3 May 2017 18:04:26 +0000 (UTC) (envelope-from emaste@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 08AF69EE; Wed, 3 May 2017 18:04:25 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v43I4OHe089442; Wed, 3 May 2017 18:04:24 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v43I4OS8089441; Wed, 3 May 2017 18:04:24 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201705031804.v43I4OS8089441@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 3 May 2017 18:04:24 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r50227 - 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 " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2017 18:04:26 -0000 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 + MFC to: + If the commit should be merged to a subset of + stable branches, specify the branch names. + + + + MFC with: + If the commit should be merged together with + a previous one in a single + MFC commit (for example, where + this commit corrects a bug in the previous change), + specify the corresponding revision number. + + + Relnotes: If the change is a candidate for inclusion in the release notes for the next release from the branch,