svn commit: r43292 - head/en_US.ISO8859-1/articles/committers-guide
Eitan Adler
eadler at FreeBSD.org
Sun Dec 8 02:23:49 UTC 2013
Author: eadler
Date: Sun Dec 8 02:23:48 2013
New Revision: 43292
URL: http://svnweb.freebsd.org/changeset/doc/43292
Log:
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
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 Sat Dec 7 23:00:33 2013 (r43291)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Dec 8 02:23:48 2013 (r43292)
@@ -1121,11 +1121,12 @@
fact it had not been.</para>
</sect4>
- <sect4>
- <title>Selecting the Source and Target for stable/10 and
- newer.</title>
+ <sect4 xml:id="merge">
+ <title>Selecting the Source and Target for
+ <literal>stable/10</literal> and Newer</title>
- <para>Starting with the stable/10 branch all merges should be
+ <para>Starting with the <literal>stable/10</literal>
+ branch, all merges should be
merged to and committed from the root of the
branch. All merges should look like:</para>
@@ -1137,11 +1138,9 @@
occurs.</para>
</sect4>
-
-
- <sect4>
- <title>Selecting the Source and Target for stable/9 and
- older.</title>
+ <sect4 xml:id="oldmerge">
+ <title>Selecting the Source and Target for
+ <literal>stable/9</literal> and Older</title>
<para>Because of mergeinfo propagation, it is important to
choose the source and target for the merge carefully to
More information about the svn-doc-all
mailing list