From 6a0104e34c75a1dc967af7a53ae2f76ac214bd70 Mon Sep 17 00:00:00 2001
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 11 Feb 2013 13:47:43 +0000
Subject: [PATCH] Move some variable definitions away from control of
 PORTBUILD_USER and into control of SRCBUILD_USER, from
 portbuild/conf/server.conf to portbuild/admin/conf/admin.conf, respectively.

Implicitly requested by:	rwatson
---
 .../articles/portbuild/article.xml            | 37 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index 59514cfce7..6deb3b1815 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -2783,7 +2783,38 @@ sysutils/zfs-stats</programlisting>
 
       <procedure>
 	<step>
-	  <para>(in process of being refactored)</para>
+	  <para>Configure the server by making the following changes to
+	    <filename>/<replaceable>a</replaceable>/portbuild/admin/conf/admin.conf</filename>:</para>
+
+	  <itemizedlist>
+	    <listitem>
+	      <para>For each source branch you will be building for, set
+		<makevar>SRC_BRANCHES</makevar> and
+		<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>
+	    </listitem>
+
+	    <listitem>
+	      <para>Set <makevar>ZFS_VOLUME</makevar> and
+		<makevar>ZFS_MOUNTPOINT</makevar> to whatever you
+		chose above.</para>
+	    </listitem>
+
+	    <listitem>
+	      <para>Set <makevar>VCS_REPOSITORY</makevar> to whatever
+		you chose above.</para>
+	    </listitem>
+
+	    <listitem>
+	      <para>Set <makevar>MASTER_URL</makevar> to the http
+		URL of your server.  This will be stamped into the
+		package build logs and the indices thereof.</para>
+	    </listitem>
+	  </itemizedlist>
+
+	  <para>Most of the other default values should be fine.</para>
 	</step>
       </procedure>
     </sect2>
@@ -2836,6 +2867,7 @@ sysutils/zfs-stats</programlisting>
 		list of architectures you wish to build packages for.</para>
 	    </listitem>
 
+<!--
 	    <listitem>
 	      <para>For each source branch you will be building for, set
 		<makevar>SRC_BRANCHES</makevar> and
@@ -2850,6 +2882,7 @@ sysutils/zfs-stats</programlisting>
 		<makevar>ZFS_MOUNTPOINT</makevar> to whatever you
 		chose above.</para>
 	    </listitem>
+-->
 
 	    <listitem>
 	      <para>Set <makevar>UPLOAD_DIRECTORY</makevar>,
@@ -2858,6 +2891,7 @@ sysutils/zfs-stats</programlisting>
 		for your site.</para>
 	    </listitem>
 
+<!--
 	    <listitem>
 	      <para>Set <makevar>VCS_REPOSITORY</makevar> to whatever
 		you chose above.</para>
@@ -2868,6 +2902,7 @@ sysutils/zfs-stats</programlisting>
 		URL of your server.  This will be stamped into the
 		package build logs and the indices thereof.</para>
 	    </listitem>
+-->
 	  </itemizedlist>
 
 	  <para>Most of the other default values should be fine.</para>