From owner-svn-doc-head@FreeBSD.ORG  Mon Dec  9 16:10:05 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BB0BCC41;
 Mon,  9 Dec 2013 16:10:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A7FF016DF;
 Mon,  9 Dec 2013 16:10:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9GA5GJ077042;
 Mon, 9 Dec 2013 16:10:05 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9GA5Fh077041;
 Mon, 9 Dec 2013 16:10:05 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201312091610.rB9GA5Fh077041@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 9 Dec 2013 16:10:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43316 - head/en_US.ISO8859-1/articles/committers-guide
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Dec 2013 16:10:05 -0000

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>