From owner-svn-doc-all@FreeBSD.ORG  Mon Dec  9 16:10:34 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@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 E3972CAE;
 Mon,  9 Dec 2013 16:10:34 +0000 (UTC)
Received: from mail0.glenbarber.us (mail0.glenbarber.us [208.86.227.67])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B482F16EB;
 Mon,  9 Dec 2013 16:10:34 +0000 (UTC)
Received: from glenbarber.us (unknown
 [IPv6:2001:470:8:1205:5604:a6ff:fe3a:96ea])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate) (Authenticated sender: gjb)
 by mail0.glenbarber.us (Postfix) with ESMTPSA id 1BB421EFB0;
 Mon,  9 Dec 2013 16:10:33 +0000 (UTC)
DKIM-Filter: OpenDKIM Filter v2.8.3 mail0.glenbarber.us 1BB421EFB0
Authentication-Results: mail0.glenbarber.us; dkim=none
 reason="no signature"; dkim-adsp=none
Date: Mon, 9 Dec 2013 11:10:31 -0500
From: Glen Barber <gjb@FreeBSD.org>
To: Warren Block <wblock@wonkity.com>
Subject: Re: svn commit: r43315 -
 head/en_US.ISO8859-1/articles/committers-guide
Message-ID: <20131209161031.GP1894@glenbarber.us>
References: <201312091537.rB9FbU89065095@svn.freebsd.org>
 <alpine.BSF.2.00.1312090902490.78161@wonkity.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="h9WqFG8zn/Mwlkpe"
Content-Disposition: inline
In-Reply-To: <alpine.BSF.2.00.1312090902490.78161@wonkity.com>
X-Operating-System: FreeBSD 11.0-CURRENT amd64
User-Agent: Mutt/1.5.22 (2013-10-16)
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Dec 2013 16:10:35 -0000


--h9WqFG8zn/Mwlkpe
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, Dec 09, 2013 at 09:04:06AM -0700, Warren Block wrote:
> >+	  <para>Merges to <literal>releng/</literal> branches should
> >+	    always be merged from the corresponding
> >+	    <literal>stable/</literal> branch.  For example:</para>
>=20
> Maybe that would be a little clearer with s/be merged/originate/ ?

Updated in r43316.  Thanks.

Glen


--h9WqFG8zn/Mwlkpe
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (FreeBSD)

iQIcBAEBCAAGBQJSpet3AAoJELls3eqvi17QIzsP/jIuMa0PtlOI262eBv0TG9Ib
4cTwW4nLx7C8pfdpAyUcTKnnavNUTSfZ9bgZp3mGgSe5bO9QMTdNQtriG9o3WF3e
yzLNtzcD1AneC48nw2xBlLMro8SS5mqIOtY0m3pE63vBOygNP5BrLgMOeFv/vrgr
1uMUWV1GfxNW4vn3tll/1vYOfL6M0Qq3V1BNYL2OuFk9Ju2AvPAPtc6wf+vFxUZ5
nlKuFIo1e9ssbs0U9RO78eLCyWfOM+t/wBNaxvUbljUyxCqLsh5IP1QeM9hTAaSg
D+wCe8o51my4Uj9F560Ipxoqa+v/ykmySHy1kQCnReT2yuq3sACn/vawOpqqW6Al
EHseJjODZ1E7Vk9pyht6BLT3zgMlRX/YIiz4WkmZr2GqoAMosTMWXEYI5HBpAfoP
f+6QWvLu8+WX7UlbdripfWtCLV2KNJoDfFPwIBxnHpngjc6cKH8cZQq8V20a8t4N
+R93SIg8MKwK2qZ50x+9lOZSbzHYa3lejdIX5/Z87SXisWxPnDoir9vmyToqxZHm
12T2bpzsGRitYZORHbvZ1thHF85YcVU5cLXqfsM1t3Udw4QX/AXpJt++jX8JTSFY
heUhaEraLsJQIm1J2VdXo+igoCjE81UUwxHpk5wB3ouVa3yLUraOjhDqv03vGnO+
H/AGSoncxlH8Neh5qYKu
=Ty7C
-----END PGP SIGNATURE-----

--h9WqFG8zn/Mwlkpe--