os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Misc fixes to the merging section of the committer's guide:

Browse source 
- add xml:id to section header
	- remove period of title
	- correctly capitalize title
	- adding missing ','

Reported by:	lint^W wblock
This commit is contained in:
Eitan Adler 2013-12-08 02:23:48 +00:00
parent 0ab43263c7
commit 72f4e4107a
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=43292
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
en_US.ISO8859-1/articles/committers-guide/article.xml
View file

@ -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