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

Improve wording.

Browse source 
Suggested by:	wblock
Approved by:	joel (mentor)
This commit is contained in:
Niclas Zeising 2012-08-22 18:11:32 +00:00
parent 82eb8fca83
commit a99fa7ec07
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=39420
1 changed files with 4 additions and 4 deletions

8
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -1452,7 +1452,7 @@ $target - head/$source:$P,$Q,$R</screen>
all paths are relative to the top of the svn repository.
for more information on the directory layout, see
<xref linkend="subversion-primer-base-layout">.</para>
<para>The first step is to check the existing mergeinfo.</para>
<para>The first step is to inspect the existing mergeinfo.</para>
<screen>&prompt.user; <userinput>svn propget svn:mergeinfo -R stable/9/share/man/man4</userinput></screen>
@ -1466,9 +1466,9 @@ U stable/9/share/man/man4/netmap.4
'stable/9/share/man/man4':
U stable/9/share/man/man4</screen>
<para>Check that the merge info is still ok; the revision
number of the merged revision should be added. Once this
is checked, the only thing left is the actual commit.</para>
<para>Check that the revision number of the merged revision
has been added. Once this is verified, the only thing left
is the actual commit.</para>
<screen>&prompt.user; <userinput>svn commit stable/9/share/man/man4</userinput></screen>
</sect5>