diff --git a/en_US.ISO8859-1/articles/portbuild/article.sgml b/en_US.ISO8859-1/articles/portbuild/article.sgml
index 9441b30dbe..fc087c4cf8 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.sgml
+++ b/en_US.ISO8859-1/articles/portbuild/article.sgml
@@ -1778,6 +1778,9 @@ ssh_cmd="/usr/local/bin/ssh"
data_source "arch/location Package Build Cluster" 30 hostname
+
+ You will need to restart gmetad.
+
@@ -1843,6 +1846,216 @@ ssh_cmd="/usr/local/bin/ssh"
+
+ How to configure a new &os; branch
+
+ When a new branch is created, some work needs to
+ be done to specify that the previous branch is no longer
+ equivalent to HEAD. The following
+ instructions apply to the previous
+ branch number:
+
+
+
+ Create a new zfs filesystem
+ for sources:
+ zfs create a/snap/src-branch
+
+
+
+
+ Checkout a src tree in the new filesystem:
+ cvs -Rq -d /r/ncvs co -r RELENG-branch
+
+
+
+
+ Edit the master copy of
+ Tools/portbuild/portbuild.conf.
+
+
+
+ For each arch, edit its copy of the above in
+ /var/portbuild/arch/portbuild.conf.
+
+
+
+ Edit /var/portbuild/scripts/buildenv.
+
+
+
+ Add a link from
+ /var/portbuild/scripts/dopackages to
+ /var/portbuild/scripts/dopackages.branch.
+
+
+
+ Modify HEAD_BRANCH and
+ NON_HEAD_BRANCHES in
+ /var/portbuild/scripts/updatesnap.
+
+
+
+ Add the snap directory to
+ /var/portbuild/scripts/zexpire.
+
+
+
+ In the /var/portbuild/errorlogs/
+ directory, create links for the webserver:
+ln -s ../arch/branch/builds/latest/bak/errors arch-branch-full
+ln -s ../arch/branch/builds/latest/bak/logs arch-branch-full-logs
+ln -s ../arch/branch/builds/latest/errors arch-branch-latest
+ln -s ../arch/branch/builds/latest/logs arch-branch-latest-logs
+ln -s ../arch/branch/builds/latest/packages arch-branch-packages-latest
+
+
+
+
+ Kick-start the build for the branch with
+ build create archbranch
+
+
+
+ Create bindist.tar
+ .
+
+
+
+
+
+ How to configure a new architecture
+
+
+
+ Create a new
+ ports-arch
+ user and group.
+
+
+
+ mkdir /var/portbuild/arch
+
+
+
+ Create a new zfs filesystem
+ for backups:
+ zfs create -o mountpoint=/a/portbuild/arch a/portbuild/arch
+
+
+
+
+ Create a link for the webserver:
+ ln -s /dumpster/pointyhat/arch/archive archive
+
+
+
+
+ In the
+ /var/portbuild/arch
+ directory:mkdir clients
+
+
+
+ Populate clients as usual.
+
+
+
+ mkdir loads
+
+
+
+ ln ../make.conf ./make.conf
+
+
+
+ Create an empty mlist file.
+
+
+
+ (TBD if still needed?) Create
+ pnohang.arch.
+
+
+
+ Create a fresh portbuild.conf file
+ from one of the others.
+
+
+
+ Create customized
+ portbuild.machinename.conf
+ files as appropriate.
+
+
+
+ cd .ssh && ssh-keygen
+
+
+
+ Edit the .ssh/config file for
+ convenience in using ssh.
+
+
+
+ Make the private configuration directory:
+ mkdir /var/portbuild/conf/arch
+
+
+
+
+ In that directory: create any dotunnel.*
+ scripts needed.
+
+
+
+ Create a link for backups:
+ mkdir /dumpster/pointyhat/arch/archive
+
+
+
+
+ Tell qmanager about the arch:
+ python /var/portbuild/evil/qmanager/qclient add_acl name=ports-arch uidlist=ports-arch gidlist=portmgr sense=1
+
+
+
+ Edit /var/portbuild/scripts/buildenv.
+
+
+
+ Add the arch directory to
+ /var/portbuild/scripts/zbackup and
+ /var/portbuild/scripts/zexpire.
+
+
+
+ For each branch that will be supported, do the following:
+
+
+
+
+ Kick-start the build for the branch with
+ build create archbranch
+
+
+
+ Create
+ bindist.tar.
+
+
+
+
+
+
+ Only after the first time a
+ dopackages has been run for the
+ arch: add the arch to
+ /var/portbuild/scripts/dopackagestats.
+
+
+
+
Procedures for dealing with disk failures