From owner-svn-doc-all@FreeBSD.ORG  Sun Dec  8 02:23:49 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 572DA259;
 Sun,  8 Dec 2013 02:23:49 +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 42DE4193F;
 Sun,  8 Dec 2013 02:23:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB82NnCU040148;
 Sun, 8 Dec 2013 02:23:49 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB82Nn7i040147;
 Sun, 8 Dec 2013 02:23:49 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201312080223.rB82Nn7i040147@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 8 Dec 2013 02:23:49 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43292 - 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-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: Sun, 08 Dec 2013 02:23:49 -0000

Author: eadler
Date: Sun Dec  8 02:23:48 2013
New Revision: 43292
URL: http://svnweb.freebsd.org/changeset/doc/43292

Log:
  Misc fixes to the merging section of the committer's guide:
  	- add xml:id to section header
  	- remove period of title
  	- correctly capitalize title
  	- adding missing ','
  
  Reported by:	lint^W wblock

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	Sat Dec  7 23:00:33 2013	(r43291)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Sun Dec  8 02:23:48 2013	(r43292)
@@ -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