From 72f4e4107ac3365031a27eb5fcb260f92177805a Mon Sep 17 00:00:00 2001 From: Eitan Adler Date: Sun, 8 Dec 2013 02:23:48 +0000 Subject: [PATCH] Misc fixes to the merging section of the committer's guide: - add xml:id to section header - remove period of title - correctly capitalize title - adding missing ',' Reported by: lint^W wblock --- .../articles/committers-guide/article.xml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml index 8d6d6e6251..af25783120 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.xml +++ b/en_US.ISO8859-1/articles/committers-guide/article.xml @@ -1121,11 +1121,12 @@ fact it had not been. - - Selecting the Source and Target for stable/10 and - newer. + + Selecting the Source and Target for + <literal>stable/10</literal> and Newer - Starting with the stable/10 branch all merges should be + Starting with the stable/10 + branch, all merges should be merged to and committed from the root of the branch. All merges should look like: @@ -1137,11 +1138,9 @@ occurs. - - - - Selecting the Source and Target for stable/9 and - older. + + Selecting the Source and Target for + <literal>stable/9</literal> and Older Because of mergeinfo propagation, it is important to choose the source and target for the merge carefully to