svn commit: r43316 - head/en_US.ISO8859-1/articles/committers-guide
Glen Barber
gjb at FreeBSD.org
Mon Dec 9 16:10:05 UTC 2013
Author: gjb
Date: Mon Dec 9 16:10:05 2013
New Revision: 43316
URL: http://svnweb.freebsd.org/changeset/doc/43316
Log:
Clarify the releng/ merge sentence.
Submitted by: wblock
Sponsored by: The FreeBSD Foundation
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 Mon Dec 9 15:37:30 2013 (r43315)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Dec 9 16:10:05 2013 (r43316)
@@ -1135,7 +1135,7 @@
occurs.</para>
<para>Merges to <literal>releng/</literal> branches should
- always be merged from the corresponding
+ always originate from the corresponding
<literal>stable/</literal> branch. For example:</para>
<screen>&prompt.user; svn merge -c <replaceable>r123456</replaceable> ^/stable/<replaceable>10</replaceable> releng/<replaceable>10.0</replaceable>
More information about the svn-doc-all
mailing list