From 0bfa1dfac7ef3f98a3f7af57318250400cabd973 Mon Sep 17 00:00:00 2001
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sat, 30 Jun 2007 02:11:52 +0000
Subject: [PATCH] Move one item in the ports section about documentation for
 new categories. This will make the next change clearer.

---
 .../articles/committers-guide/article.sgml     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index c1618dc346..57bc935ba1 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -745,11 +745,11 @@ alias scvs cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p
 	</itemizedlist>
 
 	<para>You will almost certainly get a conflict because
-	  of the <literal>$Id: article.sgml,v 1.264 2007-06-21 04:39:45 linimon Exp $</literal> (or in FreeBSD's case,
+	  of the <literal>$Id: article.sgml,v 1.265 2007-06-30 02:11:52 linimon Exp $</literal> (or in FreeBSD's case,
 	  <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
 	  lines, so you will have to edit the file to resolve the conflict
-	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.264 2007-06-21 04:39:45 linimon Exp $</literal> line,
-	  leaving the original <literal>$Id: article.sgml,v 1.264 2007-06-21 04:39:45 linimon Exp $</literal> line intact).</para>
+	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.265 2007-06-30 02:11:52 linimon Exp $</literal> line,
+	  leaving the original <literal>$Id: article.sgml,v 1.265 2007-06-30 02:11:52 linimon Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -2971,6 +2971,12 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
 		    following:</para>
 
 		  <itemizedlist>
+		    <listitem>
+		      <para>the section of the Handbook that lists the
+			<ulink url="&url.books.handbook;/cvsup.html#CVSUP-COLLEC">
+			cvsup collections</ulink>.</para>
+		    </listitem>
+
 		    <listitem>
 		      <para>the
 		    <ulink url="&url.books.porters-handbook;/makefile-categories.html#PORTING-CATEGORIES">
@@ -2985,12 +2991,6 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
 			<filename>www/en/ports/categories.descriptions</filename>.
 		      </para>
 		    </listitem>
-
-		    <listitem>
-		      <para>the section of the Handbook that lists the
-			<ulink url="&url.books.handbook;/cvsup.html#CVSUP-COLLEC">
-			cvsup collections</ulink>.</para>
-		    </listitem>
 		  </itemizedlist>
 		  <para>(Note: these are
 		    in the docs, not the ports, repository).  If you