From owner-svn-doc-all@FreeBSD.ORG  Fri Nov 23 04:36:25 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 17C76F32;
 Fri, 23 Nov 2012 04:36:25 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D15EA8FC08;
 Fri, 23 Nov 2012 04:36:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAN4aOLO037474;
 Fri, 23 Nov 2012 04:36:24 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAN4aOJi037473;
 Fri, 23 Nov 2012 04:36:24 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201211230436.qAN4aOJi037473@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Fri, 23 Nov 2012 04:36:24 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40137 - head/en_US.ISO8859-1/articles/portbuild
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.14
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: Fri, 23 Nov 2012 04:36:25 -0000

Author: linimon
Date: Fri Nov 23 04:36:24 2012
New Revision: 40137
URL: http://svnweb.freebsd.org/changeset/doc/40137

Log:
  CVS, why are you being so reluctant to go on the cart?

Modified:
  head/en_US.ISO8859-1/articles/portbuild/article.xml

Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/portbuild/article.xml	Fri Nov 23 04:26:02 2012	(r40136)
+++ head/en_US.ISO8859-1/articles/portbuild/article.xml	Fri Nov 23 04:36:24 2012	(r40137)
@@ -2414,8 +2414,8 @@ ln -s ../<replaceable>arch</replaceable>
 
 	    <listitem>
 	      <para>Delete
-		<makevar>SRC_BRANCH_<replaceable>old-branch</replaceable>_TAG</makevar>
-		<literal>=<replaceable>whatever</replaceable></literal></para>
+		<makevar>SRC_BRANCH_<replaceable>old-branch</replaceable>_SUBDIR</makevar><literal>=</literal>
+		  <replaceable>whatever</replaceable></para>
 	    </listitem>
 	  </itemizedlist>
       </listitem>
@@ -2486,8 +2486,8 @@ zfs destroy -r a/snap/src-<replaceable>o
 	  <itemizedlist>
 	    <listitem>
 	      <para>Change the value of
-	        <makevar>SRC_BRANCH_<replaceable>branch</replaceable>_TAG</makevar> to
-	        <literal>RELENG_<replaceable>branch</replaceable>_<replaceable>N</replaceable></literal>
+	        <makevar>SRC_BRANCH_<replaceable>branch</replaceable>_SUBDIR</makevar> to
+	        <literal>releng/</literal><replaceable>branch</replaceable>.<replaceable>N</replaceable>
 	        where <literal>N</literal> is the newest 'oldest' release
 	        for that branch.</para>
 	    </listitem>
@@ -3083,7 +3083,7 @@ ganglia:*:102:102::0:0:User &amp;:/usr/l
 	    <listitem>
 	      <para>For each source branch you will be building for, set
 		<makevar>SRC_BRANCHES</makevar> and
-		<makevar>SRC_BRANCH_<replaceable>branch</replaceable>_TAG</makevar>
+		<makevar>SRC_BRANCH_<replaceable>branch</replaceable>_SUBDIR</makevar>
 		as detailed in <xref linkend="new-branch-pre-qmanager"/>.
 		You should not need to change
 		<makevar>SRC_BRANCHES_PATTERN</makevar>.</para>