svn commit: r41355 - in projects/entities/en_US.ISO8859-1: articles/bsdl-gpl articles/casestudy-argentina.com articles/committers-guide articles/compiz-fusion articles/contributors articles/freebsd...

Glen Barber gjb at FreeBSD.org
Wed Apr 3 00:01:37 UTC 2013 

Author: gjb
Date: Wed Apr  3 00:01:34 2013
New Revision: 41355
URL: http://svnweb.freebsd.org/changeset/doc/41355

Log:
  MFH:
   - Merged /head/en_US.ISO8859-1:r40992-41353
  
  Approved by:	doceng (implicit)

Added:
  projects/entities/en_US.ISO8859-1/books/porters-handbook/uses.xml
     - copied unchanged from r41353, head/en_US.ISO8859-1/books/porters-handbook/uses.xml
  projects/entities/en_US.ISO8859-1/htdocs/internal/proposing-committers.xml
     - copied unchanged from r41353, head/en_US.ISO8859-1/htdocs/internal/proposing-committers.xml
  projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2012-07-2012-09.xml
     - copied unchanged from r41353, head/en_US.ISO8859-1/htdocs/news/status/report-2012-07-2012-09.xml
  projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2012-10-2012-12.xml
     - copied unchanged from r41353, head/en_US.ISO8859-1/htdocs/news/status/report-2012-10-2012-12.xml
  projects/entities/en_US.ISO8859-1/htdocs/releases/8.4R/
     - copied from r41353, head/en_US.ISO8859-1/htdocs/releases/8.4R/
Deleted:
  projects/entities/en_US.ISO8859-1/htdocs/availability.xml
  projects/entities/en_US.ISO8859-1/htdocs/vendors.html
Modified:
  projects/entities/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
  projects/entities/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
  projects/entities/en_US.ISO8859-1/articles/committers-guide/article.xml
  projects/entities/en_US.ISO8859-1/articles/compiz-fusion/article.xml
  projects/entities/en_US.ISO8859-1/articles/contributors/article.xml
  projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
  projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
  projects/entities/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
  projects/entities/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
  projects/entities/en_US.ISO8859-1/articles/freebsd-questions/article.xml
  projects/entities/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
  projects/entities/en_US.ISO8859-1/articles/geom-class/article.xml
  projects/entities/en_US.ISO8859-1/articles/hubs/article.xml
  projects/entities/en_US.ISO8859-1/articles/p4-primer/article.xml
  projects/entities/en_US.ISO8859-1/articles/portbuild/article.xml
  projects/entities/en_US.ISO8859-1/articles/pr-guidelines/article.xml
  projects/entities/en_US.ISO8859-1/articles/releng/article.xml
  projects/entities/en_US.ISO8859-1/articles/wp-toolbox/article.xml
  projects/entities/en_US.ISO8859-1/books/arch-handbook/book.xml
  projects/entities/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
  projects/entities/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
  projects/entities/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml
  projects/entities/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
  projects/entities/en_US.ISO8859-1/books/faq/book.xml
  projects/entities/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
  projects/entities/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
  projects/entities/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/audit/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/basics/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/book.xml
  projects/entities/en_US.ISO8859-1/books/handbook/config/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/disks/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/install/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/ports/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/printing/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/security/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/users/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/x11/chapter.xml
  projects/entities/en_US.ISO8859-1/books/porters-handbook/Makefile
  projects/entities/en_US.ISO8859-1/books/porters-handbook/book.xml
  projects/entities/en_US.ISO8859-1/htdocs/Makefile
  projects/entities/en_US.ISO8859-1/htdocs/about.xml
  projects/entities/en_US.ISO8859-1/htdocs/administration.xml
  projects/entities/en_US.ISO8859-1/htdocs/advocacy/index.xml
  projects/entities/en_US.ISO8859-1/htdocs/cgi/query-pr.cgi
  projects/entities/en_US.ISO8859-1/htdocs/developers/cvs.xml
  projects/entities/en_US.ISO8859-1/htdocs/docs/books.xml
  projects/entities/en_US.ISO8859-1/htdocs/features.xml
  projects/entities/en_US.ISO8859-1/htdocs/gnome/index.xsl
  projects/entities/en_US.ISO8859-1/htdocs/index.xsl
  projects/entities/en_US.ISO8859-1/htdocs/internal/Makefile
  projects/entities/en_US.ISO8859-1/htdocs/internal/README.mirror   (contents, props changed)
  projects/entities/en_US.ISO8859-1/htdocs/internal/about.xml
  projects/entities/en_US.ISO8859-1/htdocs/internal/fortunes.xml
  projects/entities/en_US.ISO8859-1/htdocs/internal/mirror.xml
  projects/entities/en_US.ISO8859-1/htdocs/internal/new-account.xml
  projects/entities/en_US.ISO8859-1/htdocs/layout/css/layout.css
  projects/entities/en_US.ISO8859-1/htdocs/news/2012-compromise.xml
  projects/entities/en_US.ISO8859-1/htdocs/news/status/Makefile
  projects/entities/en_US.ISO8859-1/htdocs/news/status/README
  projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2012-04-2012-06.xml
  projects/entities/en_US.ISO8859-1/htdocs/news/status/status.xml
  projects/entities/en_US.ISO8859-1/htdocs/platforms/amd64.xml
  projects/entities/en_US.ISO8859-1/htdocs/projects/newbies.xml
  projects/entities/en_US.ISO8859-1/htdocs/projects/projects.xml
  projects/entities/en_US.ISO8859-1/htdocs/releases/Makefile
  projects/entities/en_US.ISO8859-1/htdocs/releases/index.xml
  projects/entities/en_US.ISO8859-1/htdocs/releng/charter.xml
  projects/entities/en_US.ISO8859-1/htdocs/releng/index.xml
  projects/entities/en_US.ISO8859-1/htdocs/search/sitemap.xml
  projects/entities/en_US.ISO8859-1/htdocs/security/security.xml
  projects/entities/en_US.ISO8859-1/htdocs/where.xml
  projects/entities/en_US.ISO8859-1/share/xml/release.l10n.ent   (contents, props changed)
Directory Properties:
  projects/entities/en_US.ISO8859-1/   (props changed)

Modified: projects/entities/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/articles/bsdl-gpl/article.xml	Wed Apr  3 00:01:08 2013	(r41354)
+++ projects/entities/en_US.ISO8859-1/articles/bsdl-gpl/article.xml	Wed Apr  3 00:01:34 2013	(r41355)
@@ -23,7 +23,6 @@
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
-      &tm-attrib.cvsup;
       &tm-attrib.intel;
       &tm-attrib.general;
     </legalnotice>

Modified: projects/entities/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml	Wed Apr  3 00:01:08 2013	(r41354)
+++ projects/entities/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml	Wed Apr  3 00:01:34 2013	(r41355)
@@ -22,7 +22,6 @@
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
-      &tm-attrib.cvsup;
       &tm-attrib.intel;
       &tm-attrib.xfree86;
       &tm-attrib.general;

Modified: projects/entities/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/articles/committers-guide/article.xml	Wed Apr  3 00:01:08 2013	(r41354)
+++ projects/entities/en_US.ISO8859-1/articles/committers-guide/article.xml	Wed Apr  3 00:01:34 2013	(r41355)
@@ -33,7 +33,6 @@
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.coverity;
-      &tm-attrib.cvsup;
       &tm-attrib.ibm;
       &tm-attrib.intel;
       &tm-attrib.sparc;
@@ -316,9 +315,16 @@
 	<emphasis>r300894</emphasis>.</para>
 
       <para>There are mechanisms in place to automatically merge
-	changes back from the Subversion repository to the
-	<acronym>CVS</acronym> one, so regular users should not notice
-	a difference, however developers most certainly will.</para>
+	changes back from the Subversion <literal>src</literal>
+	repository to the <acronym>CVS</acronym> repository for
+	some &os; branches (<literal>releng/6</literal> through
+	<literal>releng/9</literal>), however this is purely to
+	support pre-existing end-user installs and should not be
+	relied upon, recommended or advertised.  Future branches
+	will not be exported to CVS at all.  The
+	<literal>ports</literal> repository was exported to CVS
+	for a period of time to aid end user migration, but as of
+	28th February 2013 is no longer exported.</para>
 
       <para>Subversion is not that different from
 	<acronym>CVS</acronym> when it comes to daily use, but there
@@ -444,11 +450,11 @@
       <sect3>
 	<title>Checkout from a Mirror</title>
 
-	<para>You can check out a working copy from a mirror by simply
+	<para>Check out a working copy from a mirror by
 	  substituting the mirror's <acronym>URL</acronym> for
 	  <literal>svn+ssh://svn.freebsd.org/base</literal>.  This can
-	  be an official mirror or a mirror you maintain yourself
-	  using <command>svnsync</command> or similar.</para>
+	  be an official mirror or a mirror maintained by
+	  using <command>svnsync</command>.</para>
 
 	<para>There is a serious disadvantage to this method: every
 	  time something is to be committed, a <command>svn switch
@@ -459,8 +465,8 @@
 	  the same UUID, some hacking of the local repository's UUID
 	  has to occur before it is possible to start using it.</para>
 
-	<para>Unlike with <acronym>CVS</acronym> and
-	  <acronym>csup</acronym>, the hassle of a local
+	<para>Unlike with <acronym>CVS</acronym>,
+	  the hassle of a local
 	  <command>svnsync</command> mirror probably is not worth it
 	  unless the network connectivity situation or other factors
 	  demand it.  If it is needed, see the end of this chapter for
@@ -481,10 +487,16 @@
 	<para>For the base repository, HEAD refers to the -CURRENT
 	  tree.  For example, <filename>head/bin/ls</filename> is what
 	  would go into <filename>/usr/src/bin/ls</filename> in a
-	  release.  Some other key locations are:</para>
+	  release.  Some key locations are:</para>
 
 	<itemizedlist>
 	  <listitem>
+	    <para><emphasis>/head/</emphasis>
+	      which corresponds to <literal>HEAD</literal>, also known as
+	      <literal>-CURRENT</literal>.
+	    </para>
+	  </listitem>
+	  <listitem>
 	    <para><emphasis>/stable/<replaceable>n</replaceable></emphasis>
 	      which corresponds to
 	      <literal>RELENG_<replaceable>n</replaceable></literal>.</para>
@@ -678,10 +690,14 @@
 	<para>It is possible to anonymously check out the &os;
 	  repository with Subversion.  This will give access to a
 	  read-only tree that can be updated, but not committed
-	  to.  To do this, use one of the following commands:</para>
+	  to.  To do this, use the following command:</para>
 
-	<screen>&prompt.user; <userinput>svn co svn://svn.freebsd.org/base/head /usr/src</userinput>
-&prompt.user; <userinput>svn co http://svn.freebsd.org/base/head /usr/src</userinput></screen>
+	<screen>&prompt.user; <userinput>svn co <replaceable>https://svn0.us-west.FreeBSD.org</replaceable>/base/head /usr/src</userinput></screen>
+
+	<para>Select the closest mirror and verify the mirror server
+	  certificate from the list of <ulink
+	    url="&url.books.handbook;/svn-mirrors.html">Subversion
+	    mirror sites</ulink>.</para>
       </sect3>
 
       <sect3>
@@ -2295,32 +2311,19 @@ ControlPersist yes</screen>
     </itemizedlist>
 
     <para>You can run a local copy of GNATS, and then integrate the FreeBSD
-      GNATS tree in to it using CVSup.  Then you can run GNATS commands
-      locally.
-      This lets you query the PR database without needing to be connected to
-      the Internet.</para>
+      GNATS tree by creating an <application>rsync</application> mirror.
+      Then you can run GNATS commands locally, allowing you to query the PR
+      database without an Internet connection.</para>
 
     <sect2>
       <title>Mirroring the GNATS Tree</title>
 
-      <para>It is possible to mirror the GNATS database by adding this line
-	to your <filename>supfile</filename>. Note that since
-	GNATS is not under CVS control it has no tag, so if you are adding
-	it to your existing <filename>supfile</filename> it should appear
-	before any <quote>tag=</quote> entry as these remain active once set.</para>
-
-	<programlisting>gnats release=current prefix=/usr</programlisting>
-
-	<para>This will place the FreeBSD GNATS tree in
-	  <filename>/usr/gnats</filename>.  You can use a
-	  <emphasis>refuse</emphasis> file to control which categories to
-	  receive.  For example, to only receive <literal>docs</literal> PRs,
-	  put this line in
-	  <filename>/usr/local/etc/cvsup/sup/refuse</filename><footnote>
-	    <para>The precise path depends on the <literal>*default
-		base</literal> setting in your
-	      <filename>supfile</filename>.</para>
-	  </footnote>.</para>
+      <para>It is possible to mirror the GNATS database by installing
+	<filename role="package">net/rsync</filename>, and
+	 executing:</para>
+
+	<screen>&prompt.user; <userinput>rsync -va rsync://bit0.us-west.freebsd.org/FreeBSD-bit/gnats .</userinput></screen>
+
     </sect2>
 
     <sect2 id="gnatstools">
@@ -3702,7 +3705,7 @@ ControlPersist yes</screen>
 	      specifically permitted by portmgr.  Complete details
 	      about what qualifies as a sweeping change can be found
 	      on the <ulink
-	      url="&url.base/portmgr;/implementation.html">Portmgr
+	      url="&url.base;/portmgr/implementation.html">Portmgr
 	      Implementation page</ulink>.</para>
 
 	    <para>The benefit of a slush as opposed to a complete

Modified: projects/entities/en_US.ISO8859-1/articles/compiz-fusion/article.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/articles/compiz-fusion/article.xml	Wed Apr  3 00:01:08 2013	(r41354)
+++ projects/entities/en_US.ISO8859-1/articles/compiz-fusion/article.xml	Wed Apr  3 00:01:34 2013	(r41355)
@@ -138,9 +138,7 @@
 
       <note>
 	<para>Make sure to update your ports tree using your favorite method
-	  (like <application>csup</application>,
-	  <application>CVSup</application> or
-	  <application>portsnap</application>) before you install any
+	  (e.g., <application>portsnap</application>) before you install any
 	  application from the ports system.  Graphics drivers and the
 	  desktop effects programs are under heavy development, and are
 	  updated regularly.</para>

Modified: projects/entities/en_US.ISO8859-1/articles/contributors/article.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/articles/contributors/article.xml	Wed Apr  3 00:01:08 2013	(r41354)
+++ projects/entities/en_US.ISO8859-1/articles/contributors/article.xml	Wed Apr  3 00:01:34 2013	(r41355)
@@ -15,7 +15,6 @@
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
-      &tm-attrib.cvsup;
       &tm-attrib.sun;
       &tm-attrib.general;
     </legalnotice>

Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Wed Apr  3 00:01:08 2013	(r41354)
+++ projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Wed Apr  3 00:01:34 2013	(r41355)
@@ -843,6 +843,11 @@
     </listitem>
 
     <listitem>
+      <para>Andrew Romanenko
+	<email>melanhit at gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Andrew S. Midthune
 	<email>amidthune at cableone.net</email></para>
     </listitem>
@@ -3572,6 +3577,11 @@
     </listitem>
 
     <listitem>
+      <para>Greg Kennedy
+	<email>kennedy.greg at gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Greg Robinson
 	<email>greg at rosevale.com.au</email></para>
     </listitem>
@@ -4404,6 +4414,11 @@
     </listitem>
 
     <listitem>
+      <para>Javad Kouhi
+	<email>javad.kouhi at gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Javier Martin Rueda
 	<email>jmrueda at diatel.upm.es</email></para>
     </listitem>
@@ -4908,6 +4923,11 @@
     </listitem>
 
     <listitem>
+      <para>John Mehr
+	<email>jcm at visi.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>John Merryweather Cooper
 	<email>jmcoopr at webmail.bmi.net</email></para>
     </listitem>
@@ -5327,6 +5347,11 @@
     </listitem>
 
     <listitem>
+      <para>Kai Wang
+	<email>kaiwang27 at gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Kaleb S. Keithley
 	<email>kaleb at ics.com</email></para>
     </listitem>
@@ -7334,6 +7359,11 @@
     </listitem>
 
     <listitem>
+      <para>Nikolai Lifanov
+	<email>lifanov at mail.lifanov.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Nikos Kokkalis
 	<email>nickkokkalis at gmail.com</email></para>
     </listitem>
@@ -7384,6 +7414,11 @@
     </listitem>
 
     <listitem>
+      <para>Nikola Kolev
+	<email>koue at chaosophia.net</email></para>
+    </listitem>
+
+    <listitem>
       <para>Nikos Ntarmos
 	<email>ntarmos at ceid.upatras.gr</email></para>
     </listitem>
@@ -10073,11 +10108,6 @@
     </listitem>
 
     <listitem>
-      <para>Thomas-Martin Seck
-	<email>tmseck at netcologne.de</email></para>
-    </listitem>
-
-    <listitem>
       <para>Thorsten Greiner
 	<email>thorsten at tgreiner.net</email></para>
     </listitem>
@@ -10243,6 +10273,11 @@
     </listitem>
 
     <listitem>
+      <para>Tomasz Walaszek
+	<email>tmwalaszek at gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Tomaz<!-- ž not rendered?--> Muraus
 	<email>kami at k5-storitve.net</email></para>
     </listitem>
@@ -10378,6 +10413,11 @@
     </listitem>
 
     <listitem>
+      <para>Tzanetos Balitsaris
+	<email>tzabal at it.teithe.gr</email></para>
+    </listitem>
+
+    <listitem>
       <para>UMENO Takashi
 	<email>umeno at rr.iij4u.or.jp</email></para>
     </listitem>
@@ -10684,6 +10724,11 @@
     </listitem>
 
     <listitem>
+      <para>Waitman Gobble
+	<email>waitman at waitman.net</email></para>
+    </listitem>
+
+    <listitem>
       <para>Walt Howard
 	<email>howard at ee.utah.edu</email></para>
     </listitem>

Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Wed Apr  3 00:01:08 2013	(r41354)
+++ projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Wed Apr  3 00:01:34 2013	(r41355)
@@ -524,6 +524,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.smh.email;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.ehaupt.email;</para>
     </listitem>
 
@@ -1304,6 +1308,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.tmseck.email;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.hselasky.email;</para>
     </listitem>
 

Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml	Wed Apr  3 00:01:08 2013	(r41354)
+++ projects/entities/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml	Wed Apr  3 00:01:34 2013	(r41355)
@@ -2,24 +2,29 @@
 
 <!-- $FreeBSD$ -->
   <itemizedlist>
+
     <listitem>
-      <para>&a.wilko.email; (2000 - 2012)</para>
+      <para>&a.randi.email; (2010 - 2012)</para>
     </listitem>
 
     <listitem>
-      <para>&a.dougb.email; (2000 - 2012)</para>
+      <para>&a.zack.email; (2010 - 2012)</para>
     </listitem>
 
     <listitem>
-      <para>&a.murray.email; (2000 - 2012)</para>
+      <para>&a.erik.email; (2008 - 2012)</para>
     </listitem>
 
     <listitem>
-      <para>&a.steve.email; (1996 - 2012)</para>
+      <para>&a.carvay.email; (2008 - 2012)</para>
     </listitem>
 
     <listitem>
-      <para>&a.erik.email; (2008 - 2012)</para>
+      <para>&a.lulf.email; (2007 - 2012)</para>
+    </listitem>
+
+    <listitem>
+      <para>&a.mnag.email; (2005 - 2012)</para>
     </listitem>
 
     <listitem>
@@ -27,15 +32,19 @@
     </listitem>
 
     <listitem>
-      <para>&a.mnag.email; (2005 - 2012)</para>
+      <para>Doug Barton (2000 - 2012)</para>
     </listitem>
 
     <listitem>
-      <para>&a.lulf.email; (2007 - 2012)</para>
+      <para>&a.wilko.email; (2000 - 2012)</para>
     </listitem>
 
     <listitem>
-      <para>&a.niels.email; (2004 - 2011)</para>
+      <para>&a.murray.email; (2000 - 2012)</para>
+    </listitem>
+
+    <listitem>
+      <para>&a.steve.email; (1996 - 2012)</para>
     </listitem>
 
     <listitem>
@@ -63,6 +72,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.niels.email; (2004 - 2011)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.sergei.email; (2003 - 2011)</para>
     </listitem>
 
@@ -71,6 +84,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.mux.email; (2002 - 2011)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.hm.email; (1998 - 2011)</para>
     </listitem>
 
@@ -87,6 +104,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.cbzimmer.email; (2009 - 2010)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.bushman.email; (2007 - 2010)</para>
     </listitem>
 
@@ -207,6 +228,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.kishore.email; (2007 - 2008)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.twinterg.email; (2006 - 2008)</para>
     </listitem>
 
@@ -259,6 +284,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.sah.email; (2004 - 2008)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.rsm.email; (2003 - 2008)</para>
     </listitem>
 
@@ -271,6 +300,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.matk.email; (2003 - 2008)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.seanc.email; (2002 - 2008)</para>
     </listitem>
 
@@ -339,6 +372,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.shige.email; (1999 - 2008)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.hosokawa.email; (1998 - 2008)</para>
     </listitem>
 
@@ -479,6 +516,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.am.email; (2003 - 2006)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.scop.email; (2002 - 2006)</para>
     </listitem>
 
@@ -499,6 +540,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.keichii.email; (2001 - 2006)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.ue.email; (2001 - 2006)</para>
     </listitem>
 

Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml	Wed Apr  3 00:01:08 2013	(r41354)
+++ projects/entities/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml	Wed Apr  3 00:01:34 2013	(r41355)
@@ -3,6 +3,14 @@
 
   <itemizedlist>
     <listitem>
+      <para>&a.beat.email; (2011 - 2013)</para>
+    </listitem>
+
+    <listitem>
+      <para>&a.linimon.email; (2004 - 2013)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.pav.email; (2006 - 2012)</para>
     </listitem>
 

Modified: projects/entities/en_US.ISO8859-1/articles/freebsd-questions/article.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/articles/freebsd-questions/article.xml	Wed Apr  3 00:01:08 2013	(r41354)
+++ projects/entities/en_US.ISO8859-1/articles/freebsd-questions/article.xml	Wed Apr  3 00:01:34 2013	(r41355)
@@ -22,7 +22,6 @@
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.microsoft;
-      &tm-attrib.netscape;
       &tm-attrib.opengroup;
       &tm-attrib.qualcomm;
       &tm-attrib.general;
@@ -312,10 +311,6 @@ your options page that will email your c
 
 	<itemizedlist>
 	  <listitem>
-	    <para>cc:Mail</para>
-	  </listitem>
-
-	  <listitem>
 	    <para>&eudora;</para>
 	  </listitem>
 
@@ -328,22 +323,11 @@ your options page that will email your c
 	  </listitem>
 
 	  <listitem>
-	    <para>µsoft; Internet Mail</para>
-	  </listitem>
-
-	  <listitem>
 	    <para>µsoft; &outlook;</para>
 	  </listitem>
-
-	  <listitem>
-	    <para>&netscape;</para>
-	  </listitem>
 	</itemizedlist>
 
-	<para>As you can see, the mailers in the Microsoft world are frequent
-	  offenders.  If at all possible, use a &unix; mailer. If you must use a
-	  mailer under Microsoft environments, make sure it is set up
-	  correctly. Try not to use <acronym>MIME</acronym>: a lot of people
+	<para>Try not to use <acronym>MIME</acronym>: a lot of people
 	  use mailers which do not get on very well with
 	  <acronym>MIME</acronym>.</para>
       </listitem>

Modified: projects/entities/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/articles/freebsd-update-server/article.xml	Wed Apr  3 00:01:08 2013	(r41354)
+++ projects/entities/en_US.ISO8859-1/articles/freebsd-update-server/article.xml	Wed Apr  3 00:01:34 2013	(r41355)
@@ -22,6 +22,7 @@
       <year>2009</year>
       <year>2010</year>
       <year>2011</year>
+      <year>2013</year>
       <holder role="mailto:jgh at FreeBSD.org">Jason Helfman</holder>
     </copyright>
 
@@ -40,8 +41,8 @@
   <abstract>
     <para>This article describes building an internal &fbus.ap;.
       The <ulink
-	url="&url.base;/cgi/cvsweb.cgi/projects/freebsd-update-server/">freebsd-update-server</ulink> software
-      is written by &a.cperciva.email;, current Security Officer of &os;.
+	url="http://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/">freebsd-update-server</ulink>
+      is written by &a.cperciva.email;, Security Officer Emeritus of &os;.
       For users that think it is convenient to update their systems
       against an official update server, building their own &fbus.ap; may
       help to extend its functionality by supporting manually-tweaked
@@ -118,11 +119,11 @@
     <title>Configuration: Installation & Setup</title>
 
     <para>Download the <ulink
-	url="&url.base;/cgi/cvsweb.cgi/projects/freebsd-update-server/">freebsd-update-server</ulink>
-      software as a <ulink
-	url="&url.base;/cgi/cvsweb.cgi/projects/freebsd-update-server/freebsd-update-server.tar.gz?tarball=1">tar archive</ulink>,
-      or use &man.csup.1; and the <literal>projects-all</literal>
-      collection.</para>
+	url="http://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/">
+      freebsd-update-server</ulink> software by installing <filename
+	role="package">devel/subversion </filename>, and execute:</para>
+
+    <screen>&prompt.user; <userinput>svn co http://svn.freebsd.org/base/user/cperciva/freebsd-update-build freebsd-update-server</userinput></screen>
 
     <para>Update <filename>scripts/build.conf</filename> appropriately.
       It is sourced during all build operations.</para>
@@ -353,9 +354,9 @@ world|base|/usr/lib/libalias_ftp.a
 
     <warning>
       <para>During this second build cycle, the network time protocol
-	daemon, &man.ntpd.8;, is turned off.  Per &a.cperciva.email;, current
-	Security Officer of &os;, "the <ulink
-	  url="&url.base;/cgi/cvsweb.cgi/projects/freebsd-update-server/">freebsd-update-server</ulink>
+	daemon, &man.ntpd.8;, is turned off.  Per &a.cperciva.email;,
+	Security Officer Emeritus of &os;, "the <ulink
+	  url="http://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/">freebsd-update-server</ulink>
 	build code needs to identify timestamps which are stored in files so
 	that they can be ignored when comparing builds to determine which
 	files need to be updated.  This timestamp-finding works by doing two
@@ -778,7 +779,6 @@ the new builds.</screen>
 	}
 	</screen>
       </listitem>
-	<!-- this tip will speed up your build process, however it is not necessary -->
       <listitem>
 	<para>Adding <option>-j <replaceable>NUMBER</replaceable></option>
 	  flags to <maketarget>buildworld</maketarget> and
@@ -801,28 +801,12 @@ the new builds.</screen>
       </listitem>
 
       <listitem>
-<!-- Parse error.  I don't understand what this paragraph suggests or
-     recommends.  Also, why do we need to block RSTs?  I don't really
-     like gratuitous blocking of RST, ICMP or other packets.  Our
-     kernel can rate-limit most of the "strange" packets alredy. -->
-
-<!-- there is a bug in earlier versions of the software that get the updates, and not blocking them will result in failure to update systems -->
-
-	<para>Create a <ulink
-	    url="&url.books.handbook;/firewalls.html">firewall</ulink>
-	  rule to block outgoing RST packets.  Due to a bug noted <ulink
-	    url="http://lists.freebsd.org/pipermail/freebsd-stable/2009-April/049578.html">in a posting</ulink>
-	  on the &a.stable; in April 2009, there may be
-	  time-outs and failures when updating a system.</para>
-      </listitem>
-
-	<!-- this tip is not necessary, however if you wish to retain mirrors and redundancy, this tip will help you. -->
-      <listitem>
 	<para>Create an appropriate <ulink
 	    url="&url.books.handbook;/network-dns.html">DNS</ulink>
 	  SRV record for the update server, and put others behind it with
 	  variable weights.  Using this facility will provide update
-	  mirrors.</para>
+	  mirrors, however this tip is not necessary unless you wish to
+	  provide a redundant service.</para>
 
 	<screen> _http._tcp.update.myserver.com.                  IN SRV   0 2 80   host1.myserver.com.
 							     SRV   0 1 80   host2.myserver.com.

Modified: projects/entities/en_US.ISO8859-1/articles/geom-class/article.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/articles/geom-class/article.xml	Wed Apr  3 00:01:08 2013	(r41354)
+++ projects/entities/en_US.ISO8859-1/articles/geom-class/article.xml	Wed Apr  3 00:01:34 2013	(r41355)
@@ -22,7 +22,6 @@
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
-      &tm-attrib.cvsup;
       &tm-attrib.intel;
       &tm-attrib.general;
     </legalnotice>

Modified: projects/entities/en_US.ISO8859-1/articles/hubs/article.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/articles/hubs/article.xml	Wed Apr  3 00:01:08 2013	(r41354)
+++ projects/entities/en_US.ISO8859-1/articles/hubs/article.xml	Wed Apr  3 00:01:34 2013	(r41355)
@@ -780,13 +780,6 @@ cvspserver stream tcp nowait root /usr/b
         <procedure>
           <step>
             <para>
-              Look at available mirrors in your country.
-              The <ulink url="http://mirrorlist.FreeBSD.org/">FreeBSD
-              Mirror Database</ulink> can help you with this.
-            </para>
-          </step>
-          <step>
-            <para>
               Check for those which provide fastest access
               (number of hops, round-trip-times)
               and offer the services you intend to

Modified: projects/entities/en_US.ISO8859-1/articles/p4-primer/article.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/articles/p4-primer/article.xml	Wed Apr  3 00:01:08 2013	(r41354)
+++ projects/entities/en_US.ISO8859-1/articles/p4-primer/article.xml	Wed Apr  3 00:01:34 2013	(r41355)
@@ -37,7 +37,7 @@
 
   <para>The &os; project uses the <application>Perforce</application>
     version control system to manage experimental projects that are
-    not ready for the main CVS repository.</para>
+    not ready for the main Subversion repository.</para>
 
   <sect2 id="resources">
     <title>Availability, Documentation, and Resources</title>
@@ -68,9 +68,9 @@
     <para>The &os; <application>Perforce</application> server is
       hosted on <hostid role="fqdn">perforce.freebsd.org</hostid>,
       port <literal>1666</literal>.  The repository is browsable
-      online at <ulink url="http://perforce.freebsd.org"></ulink>.
+      online at <ulink url="http://p4web.freebsd.org"></ulink>.
       Some portions of the repository are also automatically exported
-      to a number of <application>CVSup</application> servers.</para>
+      to a number of legacy <application>CVSup</application> servers.</para>
   </sect2>
 </sect1>
 
@@ -334,7 +334,8 @@
     with &os;.  Frequent submits of changes to the server are also
     encouraged.</para>
 
-  <para>The <application>Perforce</application> repository (the
+  <para>sSimilar to <application>Subversion</application>, the
+    <application>Perforce</application> repository (the
     <quote>depot</quote>)  is a single flat tree.  Every file, whether
     a unique creation or a derivative from a branch, is accessible via
     a simple path under the server <filename
@@ -806,12 +807,12 @@
 </sect1>
 
 <sect1 id="freebsd-cvs-and-p4">
-  <title>Interactions between &os; CVS and Perforce</title>
+  <title>Interactions between &os; Subversion and Perforce</title>
 
-  <para>The &os; <application>Perforce</application> and CVS
-    repositories are completely separate.  However, changes to CVS are
+  <para>The &os; <application>Perforce</application> and <application>Subversion</application>
+    repositories are completely separate.  However, changes to Subversion are
     tracked at near-real-time in <application>Perforce</application>.
-    Every 2 minutes, the CVS server is polled for updates in the HEAD
+    Every 2 minutes, the Subversion server is polled for updates in the HEAD
     branch, and those updates are committed to
     <application>Perforce</application> in the <filename
     class="directory">//depot/vendor/freebsd/...</filename> tree.  This
@@ -822,10 +823,10 @@
     should be done so that your tree stays up to date and avoids
     conflicts with mainline development.</para>
 
-  <para>The bridge between CVS and <application>Perforce</application>
-    is one-way; changes to CVS will be reflected in
+  <para>The bridge between Subversion and <application>Perforce</application>
+    is one-way; changes to Subversion will be reflected in
     <application>Perforce</application>, but changes in Perforce will
-    not be reflected in CVS.  On request, some parts of the
+    not be reflected in Subversion.  On request, some parts of the
     <application>Perforce</application> repo can be exported to
     <application>CVSup</application> and made available for
     distribution that way.  Contact the &os;

Modified: projects/entities/en_US.ISO8859-1/articles/portbuild/article.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Apr  3 00:01:08 2013	(r41354)
+++ projects/entities/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Apr  3 00:01:34 2013	(r41355)
@@ -631,19 +631,19 @@ PKG_BIN=/usr/local/sbin/pkg</programlist
       <example>
 	<title>Update the i386-7 tree and do a complete build</title>
 
-	<screen>&prompt.user; <userinput>dopackages.wrapper i386 7 -nosrc -norestr -nofinish</userinput></screen>
+	<screen>&prompt.user; <userinput>dopackages.wrapper i386 8 latest -nosrc -norestr -nofinish</userinput></screen>
       </example>
 
       <example>
 	<title>Restart an interrupted amd64-8 build without updating</title>
 
-	<screen>&prompt.user; <userinput>dopackages.wrapper amd64 8 -nosrc -noports -norestr -continue -noindex -noduds -nofinish</userinput></screen>
+	<screen>&prompt.user; <userinput>dopackages.wrapper amd64 8 latest -nosrc -noports -norestr -continue -noindex -noduds -nofinish</userinput></screen>
       </example>
 
       <example>
-	<title>Post-process a completed sparc64-7 tree</title>
+	<title>Post-process a completed sparc64-8 tree</title>
 
-	<screen>&prompt.user; <userinput>dopackages.wrapper sparc64 7 -finish</userinput></screen>
+	<screen>&prompt.user; <userinput>dopackages.wrapper sparc64 8 -finish</userinput></screen>
       </example>
 
       <para>Hint: it is usually best to run the <command>dopackages</command>
@@ -1361,7 +1361,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5
     <para>The following command will set up the control branch for
       the partial build:</para>
 
-    <screen>&prompt.user; <userinput>/a/portbuild/scripts/dopackages.wrapper i386 8 -noportsvcs -nobuild -novcs -nofinish</userinput></screen>
+    <screen>&prompt.user; <userinput>/a/portbuild/scripts/dopackages.wrapper i386 8 latest -noportsvcs -nobuild -novcs -nofinish</userinput></screen>
 
     <!-- XXX MCL obsolete -->
     <para>The builds must be performed from the
@@ -1501,6 +1501,14 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5
 	      command is no longer used.</para>
 	  </note>
 	</step>
+
+	<step>
+	  <para>Decide if you will be using a local
+	    <application>squid</application> cache on the client,
+	    instead of the server.  It is more efficient to run it
+	    on the server.  If you are doing that, skip the "squid"
+	    steps below.)</para>
+	</step>
       </procedure>
     </sect2>
 
@@ -1627,12 +1635,21 @@ options         NFSSERVER               
 	    </listitem>
 
 	    <listitem>
-	      <para>Also add the following users:</para>
+	      <para>If you are using <application>ganglia</application>
+		for monitoring, add the following user:</para>
 
-	      <programlisting>squid:*:100:100::0:0:User &:/usr/local/squid:/bin/sh
-ganglia:*:102:102::0:0:User &:/usr/local/ganglia:/bin/sh</programlisting>
+	      <programlisting>ganglia:*:102:102::0:0:User &:/usr/local/ganglia:/bin/sh</programlisting>
 
-	      <para>Add them to <filename>etc/group</filename> as well.</para>
+	      <para>Add it to <filename>etc/group</filename> as well.</para>
+	    </listitem>
+
+	    <listitem>
+	      <para>If you are using a local <application>squid</application>
+		cache on the client, add the following user:</para>
+
+	      <programlisting>squid:*:100:100::0:0:User &:/usr/local/squid:/bin/sh</programlisting>
+
+	      <para>Add it to <filename>etc/group</filename> as well.</para>
 	    </listitem>
 
 	    <listitem>
@@ -1682,13 +1699,19 @@ nfs_client_enable="YES"
 ntpd_enable="YES"
 sendmail_enable="NONE"
 sshd_enable="YES"
-sshd_program="/usr/local/sbin/sshd"
+sshd_program="/usr/local/sbin/sshd"</programlisting>
 
-gmond_enable="YES"
-squid_enable="YES"
-squid_chdir="<filename>/<replaceable>usr2</replaceable>/squid/logs</filename>"
-squid_pidfile="<filename>/<replaceable>usr2</replaceable>/squid/logs/squid.pid</filename>"</programlisting>
+	      <para>If you are using <application>ganglia</application>
+		for monitoring, add the following</para>
+
+	      <programlisting>gmond_enable="YES"</programlisting>
 
+	      <para>If you are using a local <application>squid</application>
+		cache on the client, add the following</para>
+
+	      <programlisting>squid_enable="YES"
+squid_chdir="<filename>/<replaceable>a</replaceable>/squid/logs</filename>"
+squid_pidfile="<filename>/<replaceable>a</replaceable>/squid/logs/squid.pid</filename>"</programlisting>
 	      <para>Required entries for VMWare-based nodes:</para>
 
 	      <programlisting>vmware_guest_vmmemctl_enable="YES"
@@ -1709,8 +1732,8 @@ sshd_program="/usr/local/sbin/sshd"
 
 gmond_enable="YES"
 squid_enable="YES"
-squid_chdir="<filename>/<replaceable>usr2</replaceable>/squid/logs</filename>"
-squid_pidfile="<filename>/<replaceable>usr2</replaceable>/squid/logs/squid.pid</filename>"</programlisting>
+squid_chdir="<filename>/<replaceable>a</replaceable>/squid/logs</filename>"
+squid_pidfile="<filename>/<replaceable>a</replaceable>/squid/logs/squid.pid</filename>"</programlisting>
 
 	      <para>&man.ntpd.8; should <emphasis>not</emphasis>
 		be enabled for VMWare instances.</para>
@@ -1718,7 +1741,7 @@ squid_pidfile="<filename>/<replaceable>u
 	      <para>Also, it may be possible to leave
 		<application>squid</application> disabled by default
 		so as to not have
-		<filename>/<replaceable>usr2</replaceable></filename>
+		<filename>/<replaceable>a</replaceable></filename>
 		persistent (which should save instantiation time.)
 		Work is still ongoing.
 	      </para>
@@ -1733,7 +1756,7 @@ squid_pidfile="<filename>/<replaceable>u
 	      <para>Modify <filename>etc/sysctl.conf</filename>:</para>
 
 	      <screen>9a10,30
-> kern.corefile=<filename>/<replaceable>usr2</replaceable>/%N.core</filename>
+> kern.corefile=<filename>/<replaceable>a</replaceable>/%N.core</filename>
 > kern.sugid_coredump=1
 > #debug.witness_ddb=0
 > #debug.witness_watch=0
@@ -1774,13 +1797,21 @@ squid_pidfile="<filename>/<replaceable>u
 	  <para>Install the following ports:</para>
 
 	  <programlisting>net/rsync
-security/openssh-portable (with HPN on)
-security/sudo
-sysutils/ganglia-monitor-core (with GMETAD off)
-www/squid (with SQUID_AUFS on)</programlisting>
+security/sudo</programlisting>
+
+	  <para>You may also wish to install:</para>
+
+	  <programlisting>security/openssh-portable (with HPN on)</programlisting>
+
+	  <para>If you are using <application>ganglia</application>
+	    for monitoring, install the following:</para>
+
+	  <programlisting>sysutils/ganglia-monitor-core (with GMETAD off)</programlisting>
+
+	  <para>If you are using a local <application>squid</application>
+	    cache on the client, install the following</para>
 
-	  <para>There is a WIP to create a meta-port, but it is not yet
-	    complete.</para>
+	  <programlisting>www/squid31 (with SQUID_AUFS on)</programlisting>
 	</step>
 
 	<step>
@@ -1801,7 +1832,8 @@ www/squid (with SQUID_AUFS on)</programl
 
 	  <itemizedlist>
 	    <listitem>
-	      <para>Modify
+	      <para>If you are using <application>ganglia</application>,
+	        modify
 		<filename>usr/local/etc/gmond.conf</filename>:</para>
 
 	      <screen>21,22c21,22
@@ -1832,7 +1864,7 @@ www/squid (with SQUID_AUFS on)</programl
 #
 # Configure a package build system post-boot
 
-scratchdir=<filename>/<replaceable>usr2</replaceable></filename>
+scratchdir=<filename>/<replaceable>a</replaceable></filename>
 
 ln -sf ${scratchdir}/portbuild /var/
 
@@ -1849,7 +1881,8 @@ touch /tmp/.boot_finished</programlistin
 	    </listitem>
 
 	    <listitem>
-	      <para>Modify
+	      <para>If you are using a local <application>squid</application>
+		cache, modify,
 		<filename>usr/local/etc/squid/squid.conf</filename>:</para>
 
 	      <screen>288,290c288,290
@@ -1924,8 +1957,12 @@ portbuild     ALL=(ALL) NOPASSWD: ALL</p
 	  <screen>&prompt.root; <userinput>mkdir portbuild</userinput>
 &prompt.root; <userinput>chown portbuild:portbuild portbuild</userinput>
 &prompt.root; <userinput>mkdir pkgbuild</userinput>
-&prompt.root; <userinput>chown portbuild:portbuild pkgbuild</userinput>
-&prompt.root; <userinput>mkdir squid</userinput>
+&prompt.root; <userinput>chown portbuild:portbuild pkgbuild</userinput></screen>
+
+	  <para>If you are using a local <application>squid</application>
+	    cache:</para>
+
+	  <screen>&prompt.root; <userinput>mkdir squid</userinput>
 &prompt.root; <userinput>mkdir squid/cache</userinput>
 &prompt.root; <userinput>mkdir squid/logs</userinput>
 &prompt.root; <userinput>chown -R squid:squid squid</userinput></screen>
@@ -1946,7 +1983,8 @@ portbuild     ALL=(ALL) NOPASSWD: ALL</p
 	</step>
 
 	<step>
-	  <para>As root, initialize the <command>squid</command>
+	  <para>If you are using a local <application>squid</application>
+	    cache, as root, initialize the <command>squid</command>
 	    directories:</para>
 
 	  <screen><userinput>squid -z</userinput></screen>
@@ -2033,8 +2071,6 @@ MASTER_SITE_OVERRIDE= \
 	  <para>Suggested values:</para>
 
 	  <programlisting>disconnected=1
-http_proxy="http://localhost:3128/"
-squid_dir=<filename>/<replaceable>usr2</replaceable>/squid</filename>
 scratchdir=<filename>/<replaceable>usr2</replaceable>/pkgbuild</filename>
 client_user=portbuild
 sudo_cmd="sudo -H"
@@ -2043,6 +2079,18 @@ rsync_gzip=-z
 infoseek_host=localhost
 infoseek_port=<replaceable>${tunelled-tcp-port}</replaceable></programlisting>
 
+	  <para>If you will be using <application>squid</application>
+	    on the client:</para>
+
+	  <programlisting>http_proxy="http://localhost:3128/"
+squid_dir=<filename>/<replaceable>usr2</replaceable>/squid</filename></programlisting>
+
+	  <para>If, instead, you will be using <application>squid</application>
+	    on the server:</para>
+
+	  <programlisting>
+http_proxy="http://<replaceable>servername</replaceable>:3128/"</programlisting>
+
 	  <para>Possible other values:</para>
 
 	  <programlisting>use_md_swap=1
@@ -2064,7 +2112,8 @@ ssh_cmd="/usr/local/bin/ssh"</programlis
 	</step>
 
 	<step>
-	  <para>Add an appropriate <literal>data_source</literal> entry to
+	  <para>If you are using <application>ganglia</application>,
+	    add an appropriate <literal>data_source</literal> entry to
 	    <filename>/usr/local/etc/gmetad.conf</filename>:</para>
 
 	  <programlisting>data_source "<replaceable>arch</replaceable>/<replaceable>location</replaceable> Package Build Cluster" 30 <replaceable>hostname</replaceable></programlisting>
@@ -2110,7 +2159,7 @@ ssh_cmd="/usr/local/bin/ssh"</programlis
       </procedure>
 
       <para>This step needs to be taken by a <literal>portmgr</literal>
-	acting as <literal>root</literal>:</para>

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-doc-projects mailing list