From 1b9e095aa42c78e210e1df3238ccd037d0c513d4 Mon Sep 17 00:00:00 2001
From: Mark Linimon <linimon@FreeBSD.org>
Date: Fri, 23 Nov 2012 04:36:24 +0000
Subject: [PATCH] CVS, why are you being so reluctant to go on the cart?

---
 en_US.ISO8859-1/articles/portbuild/article.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index aa631f9136..93f8c001e3 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -2414,8 +2414,8 @@ ln -s ../<replaceable>arch</replaceable>/<replaceable>branch</replaceable>/build
 
 	    <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>old-branch</replaceable></command></para>
 	  <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/local/ganglia:/bin/sh</screen>
 	    <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>