From 20a6b41adc152e83acb5ac29b47f3a189a77b9f5 Mon Sep 17 00:00:00 2001
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 21 Nov 2012 19:39:47 +0000
Subject: [PATCH] Various minor changes:

 - we can now build packages for arm.

 - define the term "exp-" before it is introduced.

 - define the supported branches policy (this needs to live elsewhere)

 - miscellaneous wordsmithing.
---
 .../articles/portbuild/article.xml            | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index ed20357af6..0243b3580d 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -66,19 +66,23 @@
       otherwise specified, all paths will be relative to
       this location.  <replaceable>${arch}</replaceable> will
       be used to specify one of the package architectures
-      (amd64, &i386;, ia64, powerpc, and &sparc64;), and
+      (e.g. amd64, arm, &i386;, ia64, powerpc, &sparc64;), and
       <replaceable>${branch}</replaceable> will be used
-      to specify the build branch (7, 7-exp, 8, 8-exp, 9, 9-exp, 10, 10-exp).
+      to specify the build branch (e.g. 7, 7-exp, 8, 8-exp, 9, 9-exp, 10, 10-exp).
+      The set of branches that <username>portmgr</username> currently
+      supports is the same as those that the &os;
+      <ulink url="http://www.freebsd.org/security/index.html#supported-branches">security team</ulink>
+      supports.
     </para>
 
     <note>
-      <para>Packages are no longer built for Releases 4, 5, or 6, nor
+      <para>Packages are no longer built for branches 4, 5, or 6, nor
 	for the alpha architecture.</para>
     </note>
 
     <para>The scripts that control all of this live in
       <filename class="directory">/var/portbuild/scripts/</filename>.
-      These are the checked-out copies from the Subversion repository
+      These are the checked-out copies from the Subversion repository at
       <ulink url="http://svnweb.freebsd.org/base/projects/portbuild/scripts/">
       <filename class="directory">base/projects/portbuild/scripts/</filename>
       </ulink>.</para>
@@ -95,16 +99,19 @@
 	<literal>-CURRENT</literal>
 	</para></listitem>
 
-      <listitem><para>for experimental builds</para></listitem>
+      <listitem><para>for experimental (<literal>"exp-"</literal>) builds</para></listitem>
+
     </itemizedlist>
 
+    <para>Packages from experimental builds are not uploaded.</para>
+
     </sect2>
 
     <sect2 id="codebase-notes">
       <title>Notes on the codebase</title>
 
       <para>Until mid-2010, the scripts were completely specific to
-	<hostid>pointyhat</hostid> as the head (dispatch) node.  During
+	<hostid>pointyhat.FreeBSD.org</hostid> as the head (dispatch) node.  During
 	the summer of 2010, a significant rewrite was done in order to allow
 	for other hosts to be head nodes.  Among the changes were:</para>
 
@@ -326,12 +333,13 @@ PKG_BIN=/usr/local/sbin/pkg</programlisting>
   <sect1 id="starting">
     <title>Starting the Build</title>
 
-    <para>Several separate builds for each architecture - branch combination
+    <para>Separate builds for various combinations of architecture and branch
       are supported.  All data private to a build (ports tree, src tree,
-      packages, distfiles, log files, bindist, Makefile, etc) are located under
-      <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable></filename>.
-      The last created build can be alternatively referenced under buildid
-      <literal>latest</literal>, the one before is called
+      packages, distfiles, log files, bindist, Makefile, etc) are located under the
+      <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable>/</filename>
+      directory.
+      The most recently created build can be alternatively referenced using buildid
+      <literal>latest</literal>, and the one before using
       <literal>previous</literal>.</para>
 
     <para>New builds are cloned from the <literal>latest</literal>, which is
@@ -593,7 +601,7 @@ PKG_BIN=/usr/local/sbin/pkg</programlisting>
       <listitem>
 	<para><literal>-fetch-original</literal> - Fetch the
 	  distfile from the original <literal>MASTER_SITES</literal>
-	  rather than <hostid>ftp-master</hostid>.
+	  rather than any cache such as on <hostid>ftp-master</hostid>.
 	</para>
       </listitem>
 
@@ -623,7 +631,7 @@ PKG_BIN=/usr/local/sbin/pkg</programlisting>
 
     <para>&prompt.user; <userinput>build cleanup <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> -full</userinput></para>
 
-    <para><filename>errors/</filename>,
+    <para>When a new build is created, the directories <filename>errors/</filename>,
       <filename>logs/</filename>, <filename>packages/</filename>, and so
       forth, are cleaned by the scripts.  If you are short of space,
       you can also clean out <filename>ports/distfiles/</filename>.
@@ -2766,8 +2774,6 @@ ln -s ../<replaceable>arch</replaceable>/archive/errorlogs <replaceable>arch</re
     <para>This section only applies to the new codebase.  New installations
       using the old codebase are <emphasis>not</emphasis> supported.</para>
 
-    <para>This section is in progress.</para>
-
     <para>Please talk to Mark Linimon before making any changes.</para>
 
     <sect2 id="pointyhat-basics">