White space fix only. Translators can ignore.

Sponsored by: iXsystems

1 files changed, 269 insertions, 236 deletions

diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
index 154047650d..910ccad7ee 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -28,7 +28,8 @@
 	    Phone: <phone>+1 925 240-6652</phone>
 	    Fax: <fax>+1 925 674-0821</fax>
 	    Email: <email>info@freebsdmall.com</email>
-	    WWW: <otheraddr xlink:href="http://www.freebsdmall.com/">http://www.freebsdmall.com/</otheraddr>
+	    WWW: <otheraddr
+	      xlink:href="http://www.freebsdmall.com/">http://www.freebsdmall.com/</otheraddr>
 	  </address>
 	</listitem>
 
@@ -39,7 +40,8 @@
 	    <postcode>D-81371</postcode> <city>M&uuml;nchen</city>
 	    <country>Germany</country>
 	    Phone: <phone>(0177) 428 419 0</phone>
-	    WWW: <otheraddr xlink:href="http://www.hinner.de/linux/freebsd.html">http://www.hinner.de/linux/freebsd.html</otheraddr>
+	    WWW: <otheraddr
+	      xlink:href="http://www.hinner.de/linux/freebsd.html">http://www.hinner.de/linux/freebsd.html</otheraddr>
 	  </address>
 	</listitem>
 
@@ -50,7 +52,8 @@
 	    <city>Margate</city>
 	    <postcode>CT9 2TB</postcode>
 	    <country>United Kingdom</country>
-	    WWW: <otheraddr xlink:href="https://linux-distro.co.uk/">https://linux-distro.co.uk/</otheraddr>
+	    WWW: <otheraddr
+	      xlink:href="https://linux-distro.co.uk/">https://linux-distro.co.uk/</otheraddr>
 	  </address>
 	</listitem>
 
@@ -63,7 +66,8 @@
 	    <country>United Kingdom</country>
 	    Phone: <phone>+44 (0)247 615 8121</phone>
 	    Fax: <fax>+44 1491 837016</fax>
-	    WWW: <otheraddr xlink:href="http://www.linuxemporium.co.uk/products/bsd/">http://www.linuxemporium.co.uk/products/bsd/</otheraddr>
+	    WWW: <otheraddr
+	      xlink:href="http://www.linuxemporium.co.uk/products/bsd/">http://www.linuxemporium.co.uk/products/bsd/</otheraddr>
 	  </address>
 	</listitem>
 
@@ -76,7 +80,8 @@
 	    <country>Russia</country>
 	    Phone: <phone>+7-812-3125208</phone>
 	    Email: <email>info@linuxcenter.ru</email>
-	    WWW: <otheraddr xlink:href="http://linuxcenter.ru/shop/freebsd">http://linuxcenter.ru/shop/freebsd</otheraddr>
+	    WWW: <otheraddr
+	      xlink:href="http://linuxcenter.ru/shop/freebsd">http://linuxcenter.ru/shop/freebsd</otheraddr>
 	  </address>
 	</listitem>
       </itemizedlist>
@@ -87,26 +92,28 @@
     <title><acronym>FTP</acronym> Sites</title>
 
     <para>The official sources for &os; are available via anonymous
-      <acronym>FTP</acronym> from a worldwide set of mirror sites.  The site
-      <uri xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/">ftp://ftp.FreeBSD.org/pub/FreeBSD/</uri> is well
-      connected and allows a large number of connections to it, but
-      you are probably better off finding a <quote>closer</quote>
-      mirror site (especially if you decide to set up some sort of
-      mirror site).</para>
-
-    <para>Additionally, &os; is available via anonymous <acronym>FTP</acronym> from the
-      following mirror sites.  If you choose to obtain &os; via
-      anonymous <acronym>FTP</acronym>, please try to use a site near you.  The mirror
-      sites listed as <quote>Primary Mirror Sites</quote> typically
-      have the entire &os; archive (all the currently available
-      versions for each of the architectures) but you will probably
-      have faster download times from a site that is in your country
-      or region.  The regional sites carry the most recent versions
-      for the most popular architecture(s) but might not carry the
-      entire &os; archive.  All sites provide access via anonymous <acronym>FTP</acronym>
-      but some sites also provide access via other methods.  The
-      access methods available for each site are provided in
-      parentheses after the hostname.</para>
+      <acronym>FTP</acronym> from a worldwide set of mirror sites.
+      The site <uri
+	xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/">ftp://ftp.FreeBSD.org/pub/FreeBSD/</uri>
+      is well connected and allows a large number of connections to
+      it, but you are probably better off finding a
+      <quote>closer</quote> mirror site (especially if you decide to
+      set up some sort of mirror site).</para>
+
+    <para>Additionally, &os; is available via anonymous
+      <acronym>FTP</acronym> from the following mirror sites.  If you
+      choose to obtain &os; via anonymous <acronym>FTP</acronym>,
+      please try to use a site near you.  The mirror sites listed as
+      <quote>Primary Mirror Sites</quote> typically have the entire
+      &os; archive (all the currently available versions for each of
+      the architectures) but you will probably have faster download
+      times from a site that is in your country or region.  The
+      regional sites carry the most recent versions for the most
+      popular architecture(s) but might not carry the entire &os;
+      archive.  All sites provide access via anonymous
+      <acronym>FTP</acronym> but some sites also provide access via
+      other methods.  The access methods available for each site are
+      provided in parentheses after the hostname.</para>
 
     &chap.mirrors.ftp.index.inc;
 
@@ -123,8 +130,8 @@
 
       <warning>
 	<para>CVS has been deprecated by the project, and its use is
-	  not recommended.  
-	  <link xlink:href="&url.books.handbook;/svn.html">Subversion</link>
+	  not recommended.  <link
+	    xlink:href="&url.books.handbook;/svn.html">Subversion</link>
 	  should be used instead.</para>
       </warning>
     </sect2>
@@ -138,44 +145,44 @@
     </indexterm>
 
     <para><application>CTM</application> is a method for keeping a
-      remote directory tree in sync with a central one.  It is built into &os;
-      and can be used to synchronize a system with &os;'s source repositories.
-      It supports synchronization of an entire repository or just the specified branches.</para>
-
-      <para><application>CTM</application> is specifically designed for use on
-	lousy or non-existent TCP/IP connections.  It provides the ability
-	for changes to be automatically sent by email.  It requires the user
-	to obtain up to three deltas per day for the most active
-	branches.  Update sizes are always kept as
-	small as possible and are typically less than 5K.  About one in very ten
-	updates is 10-50K in size, and there will occasionally be an update
-	larger than 100K+.</para>
-
-      <para>When using <application>CTM</application> to track &os; development,
-	refer to the
-	caveats related to working directly from the development
-	sources rather than a pre-packaged release.  These are discussed
-	in <link linkend="current-stable">Tracking a Development Branch</link>.</para>
-
-      <para>Little documentation exists on
-      the process of creating deltas or using <application>CTM</application>
-      for other purposes.  Contact the
-      &a.ctm-users.name; mailing list for questions on using
-      <application>CTM</application>.</para>
+      remote directory tree in sync with a central one.  It is built
+      into &os; and can be used to synchronize a system with &os;'s
+      source repositories.  It supports synchronization of an entire
+      repository or just the specified branches.</para>
+
+    <para><application>CTM</application> is specifically designed for
+      use on lousy or non-existent TCP/IP connections.  It provides
+      the ability for changes to be automatically sent by email.  It
+      requires the user to obtain up to three deltas per day for the
+      most active branches.  Update sizes are always kept as small as
+      possible and are typically less than 5K.  About one in very ten
+      updates is 10-50K in size, and there will occasionally be an
+      update larger than 100K+.</para>
+
+    <para>When using <application>CTM</application> to track &os;
+      development, refer to the caveats related to working directly
+      from the development sources rather than a pre-packaged release.
+      These are discussed in <link linkend="current-stable">Tracking
+	a Development Branch</link>.</para>
+
+    <para>Little documentation exists on the process of creating
+      deltas or using <application>CTM</application> for other
+      purposes.  Contact the &a.ctm-users.name; mailing list for
+      questions on using <application>CTM</application>.</para>
 
     <sect2 xml:id="mirrors-ctm">
       <title>Getting Deltas</title>
 
       <para>The <quote>deltas</quote> used by
 	<application>CTM</application> can be obtained either through
-	anonymous <acronym>FTP</acronym> or
-	email.</para>  
-	    
-      <para><acronym>FTP</acronym> deltas can be obtained from the following mirror sites.
-	When using anonymous <acronym>FTP</acronym> to obtain <application>CTM</application> deltas,
-	select a geographically close mirror.
-	In case of problems, contact the &a.ctm-users.name;
-	mailing list.</para>
+	anonymous <acronym>FTP</acronym> or email.</para>
+
+      <para><acronym>FTP</acronym> deltas can be obtained from the
+	following mirror sites.  When using anonymous
+	<acronym>FTP</acronym> to obtain
+	<application>CTM</application> deltas, select a geographically
+	close mirror.  In case of problems, contact the
+	&a.ctm-users.name; mailing list.</para>
 
       <variablelist>
 	<varlistentry>
@@ -184,10 +191,12 @@
 	  <listitem>
 	    <itemizedlist>
 	      <listitem>
-		<para><uri xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CTM/">ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CTM/</uri></para>
+		<para><uri
+		  xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CTM/">ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CTM/</uri></para>
 	      </listitem>
 	      <listitem>
-		<para><uri xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CTM/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CTM/</uri></para>
+		<para><uri
+		  xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CTM/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CTM/</uri></para>
 	      </listitem>
 	    </itemizedlist>
 	  </listitem>
@@ -199,7 +208,8 @@
 	  <listitem>
 	    <itemizedlist>
 	      <listitem>
-		<para><uri xlink:href="ftp://ftp.za.FreeBSD.org/pub/FreeBSD/CTM/">ftp://ftp.za.FreeBSD.org/pub/FreeBSD/CTM/</uri></para>
+		<para><uri
+		  xlink:href="ftp://ftp.za.FreeBSD.org/pub/FreeBSD/CTM/">ftp://ftp.za.FreeBSD.org/pub/FreeBSD/CTM/</uri></para>
 	      </listitem>
 	    </itemizedlist>
 	  </listitem>
@@ -211,99 +221,97 @@
 	  <listitem>
 	    <itemizedlist>
 	      <listitem>
-		<para><uri xlink:href="ftp://ctm.tw.FreeBSD.org/pub/FreeBSD/development/CTM/">ftp://ctm.tw.FreeBSD.org/pub/FreeBSD/development/CTM/</uri></para>
+		<para><uri
+		  xlink:href="ftp://ctm.tw.FreeBSD.org/pub/FreeBSD/development/CTM/">ftp://ctm.tw.FreeBSD.org/pub/FreeBSD/development/CTM/</uri></para>
 	      </listitem>
 
 	      <listitem>
-		<para><uri xlink:href="ftp://ctm2.tw.FreeBSD.org/pub/FreeBSD/development/CTM/">ftp://ctm2.tw.FreeBSD.org/pub/FreeBSD/development/CTM/</uri></para>
+		<para><uri
+		  xlink:href="ftp://ctm2.tw.FreeBSD.org/pub/FreeBSD/development/CTM/">ftp://ctm2.tw.FreeBSD.org/pub/FreeBSD/development/CTM/</uri></para>
 	      </listitem>
 
 	      <listitem>
-		<para><uri xlink:href="ftp://ctm3.tw.FreeBSD.org/pub/FreeBSD/development/CTM/">ftp://ctm3.tw.FreeBSD.org/pub/FreeBSD/development/CTM/</uri></para>
+		<para><uri
+		  xlink:href="ftp://ctm3.tw.FreeBSD.org/pub/FreeBSD/development/CTM/">ftp://ctm3.tw.FreeBSD.org/pub/FreeBSD/development/CTM/</uri></para>
 	      </listitem>
 	    </itemizedlist>
 	  </listitem>
 	</varlistentry>
       </variablelist>
 
-      <para>To instead receive deltas through email, subscribe to one of the
-	<literal>ctm-src</literal> distribution lists available from
-	<uri xlink:href="http://lists.freebsd.org/mailman/listinfo">http://lists.freebsd.org/mailman/listinfo</uri>.  For example,
-	&a.ctm-src-cur.name; supports the HEAD of the development
-	branch and  &a.ctm-src-9.name; supports the 9.X release branch.</para>
-
-      <para>As
-	<application>CTM</application> updates arrive through email,
-	use <command>ctm_rmail</command> to unpack and
-	apply them.  This command can be run directly from an entry in
-	<filename>/etc/aliases</filename> in order to
-	automate this process.  Refer to
-	&man.ctm.rmail.1; for more
-	details.</para>
+      <para>To instead receive deltas through email, subscribe to one
+	of the <literal>ctm-src</literal> distribution lists available
+	from <uri
+	  xlink:href="http://lists.freebsd.org/mailman/listinfo">http://lists.freebsd.org/mailman/listinfo</uri>.
+	For example, &a.ctm-src-cur.name; supports the HEAD of the
+	development branch and  &a.ctm-src-9.name; supports the 9.X
+	release branch.</para>
+
+      <para>As <application>CTM</application> updates arrive through
+	email, use <command>ctm_rmail</command> to unpack and apply
+	them.  This command can be run directly from an entry in
+	<filename>/etc/aliases</filename> in order to automate this
+	process.  Refer to &man.ctm.rmail.1; for more details.</para>
 
       <note>
 	<para>Regardless of the method which is used to get deltas,
 	  <application>CTM</application> users should subscribe
-	  to the &a.ctm-announce.name; mailing list as
-	  this is the only place where announcements concerning
-	  the operation of the <application>CTM</application> system
-	  are posted.</para>
+	  to the &a.ctm-announce.name; mailing list as this is the
+	  only place where announcements concerning the operation of
+	  the <application>CTM</application> system are posted.</para>
       </note>
     </sect2>
 
     <sect2>
       <title><application>CTM</application> Usage</title>
 
-      <para>Before <application>CTM</application>
-	deltas can be used for the first time, a starting point
-	must be produced.</para>
-
-      <para>One method is to apply a <quote>starter</quote> delta to an
-	empty directory.  A 
-	starter delta can be recognized by
-	the <filename>XEmpty</filename> in its name, such as
-	<filename>src-cur.3210XEmpty.gz</filename>.
-	The designation following the <literal>X</literal> corresponds
-	to the origin of the initial <quote>seed</quote>, where
-	<filename>Empty</filename> is an empty directory.  As a rule, a
-	base transition from <literal>Empty</literal> is produced
+      <para>Before <application>CTM</application> deltas can be used
+	for the first time, a starting point must be produced.</para>
+
+      <para>One method is to apply a <quote>starter</quote> delta to
+	an empty directory.  A  starter delta can be recognized by the
+	<filename>XEmpty</filename> in its name, such as
+	<filename>src-cur.3210XEmpty.gz</filename>.  The designation
+	following the <literal>X</literal> corresponds to the origin
+	of the initial <quote>seed</quote>, where
+	<filename>Empty</filename> is an empty directory.  As a rule,
+	a base transition from <literal>Empty</literal> is produced
 	every 100 deltas.  Be aware that starter deltas are large and
-	70 to 80
-	Megabytes of <command>gzip</command>'d data is common for the
-	<filename>XEmpty</filename> deltas.</para>
+	70 to 80 Megabytes of <command>gzip</command>'d data is common
+	for the <filename>XEmpty</filename> deltas.</para>
 
-      <para>Another method is to copy or extract an initial source from 
-	a
-	RELEASE media as this can 
-	save a significant transfer of data from the Internet.</para>
+      <para>Another method is to copy or extract an initial source
+	from  a RELEASE media as this can  save a significant transfer
+	of data from the Internet.</para>
 
-      <para>Once a base delta has been created, apply
-	all deltas with higher numbers.  To apply the deltas:</para>
+      <para>Once a base delta has been created, apply all deltas with
+	higher numbers.  To apply the deltas:</para>
 
       <screen>&prompt.root; <userinput>cd /directory/to/store/the/stuff</userinput>
 &prompt.root; <userinput>ctm -v -v /directory/which/stores/the/deltas/src-xxx.*</userinput></screen>
 
-      <para>Multiple deltas can be applied at one time as they
-	will be processed one at a time and any deltas that are already
-	applied will be ignored.  <application>CTM</application> understands deltas which
-	have been put through <command>gzip</command>, which saves disk
-	space.</para>
-
-      <para>To
-	verify a delta without applying it, include <option>-c</option>.
-	<application>CTM</application> will not actually touch
-	the local tree but will instead verify the integrity of the delta
-	to see if it would apply cleanly.  Refer to &man.ctm.1; for
-	more information about available switches and an overview of
-	the process <application>CTM</application> uses when applying
+      <para>Multiple deltas can be applied at one time as they will
+	be processed one at a time and any deltas that are already
+	applied will be ignored.  <application>CTM</application>
+	understands deltas which have been put through
+	<command>gzip</command>, which saves disk space.</para>
+
+      <para>To verify a delta without applying it, include
+	<option>-c</option>.  <application>CTM</application> will not
+	actually touch the local tree but will instead verify the
+	integrity of the delta to see if it would apply cleanly.
+	Refer to &man.ctm.1; for more information about available
+	switches and an overview of the process
+	<application>CTM</application> uses when applying
 	deltas.</para>
 
       <para>To keep the local source tree up-to-date, every time a
-	new delta becomes available, apply it through <application>CTM</application>.</para>
+	new delta becomes available, apply it through
+	<application>CTM</application>.</para>
 
-      <para>Once applied, it is recommended to not delete the deltas if it is a burden to download
-	them again.  This way, a local copy is available in case
-	something bad happens.</para>
+      <para>Once applied, it is recommended to not delete the deltas
+	if it is a burden to download them again.  This way, a loca
+	copy is available in case something bad happens.</para>
     </sect2>
 
     <sect2>
@@ -315,76 +323,77 @@
 	a limited way: before checking for the presence of a file,
 	it first looks for a file with the same name and a
 	<filename>.ctm</filename> extension.  If this file exists,
-	<application>CTM</application> will operate on it instead of the
-	original filename.</para>
+	<application>CTM</application> will operate on it instead of
+	the original filename.</para>
 
       <para>This behavior provides a simple way to maintain local
-	changes. Before modifying a file, make a copy with a
-	<filename>.ctm</filename>
-	suffix.  Make any changes to the original filename, knowing that
-	<application>CTM</application> will only apply updates to the file with the
-	<filename>.ctm</filename> suffix.</para>
+	changes.  Before modifying a file, make a copy with a
+	<filename>.ctm</filename> suffix.  Make any changes to the
+	original filename, knowing that
+	<application>CTM</application> will only apply updates to the
+	file with the <filename>.ctm</filename> suffix.</para>
     </sect2>
 
     <sect2>
-      <title>Other <application>CTM</application>
-	Options</title>
+      <title>Other <application>CTM</application> Options</title>
 
       <variablelist>
-      <varlistentry>
-	<term>Finding Out Exactly What Would Be Touched by an
-	  Update</term>
+	<varlistentry>
+	  <term>Finding Out Exactly What Would Be Touched by an
+	    Update</term>
 
- <listitem>
-	<para>To determine the list of changes that
-	  <application>CTM</application> will make to the local source
-	  repository, use <option>-l</option>.  This option is useful for creating logs of the
-	  changes or when performing pre- or post-processing on any of the modified files.</para>
-      </listitem>
-    </varlistentry>
+	  <listitem>
+	    <para>To determine the list of changes that
+	      <application>CTM</application> will make to the local
+	      source repository, use <option>-l</option>.  This option
+	      is useful for creating logs of the changes or when
+	      performing pre- or post-processing on any of the
+	      modified files.</para>
+	  </listitem>
+	</varlistentry>
 
-      <varlistentry>
-	<term>Making Backups Before Updating</term>
+	<varlistentry>
+	  <term>Making Backups Before Updating</term>
 
-	<listitem>
-	<para>To backup all of the files that
-	  would be changed by a <application>CTM</application>
-	  update, specify <option>-B backup-file</option>.  This option
-	  tells <application>CTM</application> to backup all files
-	  touched by the applied
-	  <application>CTM</application> delta to
-	  <filename>backup-file</filename>.</para>
-	</listitem>
-      </varlistentry>
+	  <listitem>
+	    <para>To backup all of the files that would be changed by
+	      a <application>CTM</application> update, specify
+	      <option>-B backup-file</option>.  This option tells
+	      <application>CTM</application> to backup all files
+	      touched by the applied <application>CTM</application>
+	      delta to <filename>backup-file</filename>.</para>
+	  </listitem>
+	</varlistentry>
 
-      <varlistentry>
-	<term>Restricting the Files Touched by an Update</term>
+	<varlistentry>
+	  <term>Restricting the Files Touched by an Update</term>
 
- <listitem>
-	<para>To restrict the
-	  scope of a given <application>CTM</application> update, or
-	  to extract just a few files from a
-	  sequence of deltas,
-	  filtering regular expressions can be specified using
-	  <option>-e</option>, which specifies which files to process, or <option>-x</option>, which specifies which files to ignore.</para>
+	  <listitem>
+	    <para>To restrict the scope of a given
+	      <application>CTM</application> update, or to extract
+	      just a few files from a sequence of deltas, filtering
+	      regular expressions can be specified using
+	      <option>-e</option>, which specifies which files to
+	      process, or <option>-x</option>, which specifies which
+	      files to ignore.</para>
 
-	<para>For example, to extract an up-to-date copy of
-	  <filename>lib/libc/Makefile</filename> from a collection
-	  of saved <application>CTM</application> deltas:</para>
+	    <para>For example, to extract an up-to-date copy of
+	      <filename>lib/libc/Makefile</filename> from a collection
+	      of saved <application>CTM</application> deltas:</para>
 
-	<screen>&prompt.root; <userinput>cd /directory/to/extract/to/</userinput>
+	    <screen>&prompt.root; <userinput>cd /directory/to/extract/to/</userinput>
 &prompt.root; <userinput>ctm -e '^lib/libc/Makefile' /directory/which/stores/the/deltas/src-xxx.*</userinput></screen>
 
-	<para>For every file specified in a
-	  <application>CTM</application> delta,
-	  <option>-e</option> and <option>-x</option> are
-	  applied in the order given on the command line.  A file is
-	  processed by <application>CTM</application> only if it is
-	  marked as eligible after all <option>-e</option> and
-	  <option>-x</option> options are applied.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
+	    <para>For every file specified in a
+	      <application>CTM</application> delta,
+	      <option>-e</option> and <option>-x</option> are
+	      applied in the order given on the command line.  A file
+	      is processed by <application>CTM</application> only if
+	      it is marked as eligible after all <option>-e</option>
+	      and <option>-x</option> options are applied.</para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
     </sect2>
 <!--
 Comment out for now until these can be verified.
@@ -425,15 +434,18 @@ Comment out for now until these can be verified.
     <sect2 xml:id="svn-intro">
       <title>Introduction</title>
 
-      <para>As of July 2012, &os; uses <link xlink:href="http://subversion.apache.org/">Subversion</link>
+      <para>As of July 2012, &os; uses <link
+	  xlink:href="http://subversion.apache.org/">Subversion</link>
 	(<emphasis>svn</emphasis>) as the primary version control
 	system for storing all of &os;'s source code, documentation,
 	and the Ports Collection.</para>
 
       <note>
 	<para>Subversion is generally a developer tool.  Most users
-	  should use <link linkend="updating-upgrading-freebsdupdate">FreeBSD
-	    Update</link> to update the &os; base system, and <link linkend="ports-using">Portsnap</link> to
+	  should use <link
+	    linkend="updating-upgrading-freebsdupdate">FreeBSD
+	    Update</link> to update the &os; base system, and <link
+	    linkend="ports-using">Portsnap</link> to
 	  update the &os; Ports Collection.</para>
       </note>
 
@@ -448,8 +460,9 @@ Comment out for now until these can be verified.
 	documentation.  For example, the URL
 	<literal>svn://svn0.us-east.FreeBSD.org/ports/head/</literal>
 	specifies the main branch of the ports repository on the
-	<systemitem class="fqdomainname">svn0.us-east.FreeBSD.org</systemitem> mirror,
-	using the <literal>svn</literal> protocol.</para>
+	<systemitem
+	  class="fqdomainname">svn0.us-east.FreeBSD.org</systemitem>
+	mirror, using the <literal>svn</literal> protocol.</para>
     </sect2>
 
     <sect2 xml:id="svn-install">
@@ -591,9 +604,9 @@ Comment out for now until these can be verified.
       <para>For other information about using
 	<application>Subversion</application>, please see the
 	<quote>Subversion Book</quote>, titled
-	<link xlink:href="http://svnbook.red-bean.com/">Version Control with
-	  Subversion</link>, or the
-	<link xlink:href="http://subversion.apache.org/docs/">Subversion
+	<link xlink:href="http://svnbook.red-bean.com/">Version
+	  Control with Subversion</link>, or the <link
+	  xlink:href="http://subversion.apache.org/docs/">Subversion
 	  Documentation</link>.</para>
     </sect2>
   </sect1>
@@ -609,11 +622,13 @@ Comment out for now until these can be verified.
     <para>All mirrors carry all repositories.</para>
 
     <para>The master &os; <application>Subversion</application>
-      server, <systemitem class="fqdomainname">svn.FreeBSD.org</systemitem>, is
+      server, <systemitem
+	class="fqdomainname">svn.FreeBSD.org</systemitem>, is
       publicly accessible, read-only.  That may change in the future,
       so users are encouraged to use one of the official mirrors.  To
       view the &os; <application>Subversion</application> repositories
-      through a browser, use <link xlink:href="http://svnweb.FreeBSD.org/">http://svnweb.FreeBSD.org/</link>.</para>
+      through a browser, use <link
+	xlink:href="http://svnweb.FreeBSD.org/">http://svnweb.FreeBSD.org/</link>.</para>
 
     <note>
       <para>The &os; svn mirror network is still in its early days,
@@ -642,10 +657,13 @@ Comment out for now until these can be verified.
 
 	<tbody>
 	  <row>
-	    <entry><systemitem class="fqdomainname">svn0.us-west.FreeBSD.org</systemitem></entry>
+	    <entry><systemitem
+	      class="fqdomainname">svn0.us-west.FreeBSD.org</systemitem></entry>
 
-	    <entry>svn, <link xlink:href="http://svn0.us-west.FreeBSD.org/">http</link>,
-	      <link xlink:href="https://svn0.us-west.FreeBSD.org/">https</link></entry>
+	    <entry>svn, <link
+		xlink:href="http://svn0.us-west.FreeBSD.org/">http</link>,
+	      <link
+		xlink:href="https://svn0.us-west.FreeBSD.org/">https</link></entry>
 
 	    <entry>USA, California</entry>
 
@@ -654,10 +672,14 @@ Comment out for now until these can be verified.
 	  </row>
 
 	  <row>
-	    <entry><systemitem class="fqdomainname">svn0.us-east.FreeBSD.org</systemitem></entry>
+	    <entry><systemitem
+	      class="fqdomainname">svn0.us-east.FreeBSD.org</systemitem></entry>
 
-	    <entry>svn, <link xlink:href="http://svn0.us-east.FreeBSD.org/">http</link>,
-	      <link xlink:href="https://svn0.us-east.FreeBSD.org/">https</link>, rsync</entry>
+	    <entry>svn, <link
+		xlink:href="http://svn0.us-east.FreeBSD.org/">http</link>,
+	      <link
+		xlink:href="https://svn0.us-east.FreeBSD.org/">https</link>,
+	      rsync</entry>
 
 	    <entry>USA, New Jersey</entry>
 
@@ -666,10 +688,14 @@ Comment out for now until these can be verified.
 	  </row>
 
 	  <row>
-	    <entry><systemitem class="fqdomainname">svn0.eu.FreeBSD.org</systemitem></entry>
+	    <entry><systemitem
+		class="fqdomainname">svn0.eu.FreeBSD.org</systemitem></entry>
 
-	    <entry>svn, <link xlink:href="http://svn0.eu.FreeBSD.org/">http</link>,
-	      <link xlink:href="https://svn0.eu.FreeBSD.org/">https</link>, rsync</entry>
+	    <entry>svn, <link
+		xlink:href="http://svn0.eu.FreeBSD.org/">http</link>,
+	      <link
+		xlink:href="https://svn0.eu.FreeBSD.org/">https</link>,
+	      rsync</entry>
 
 	    <entry>Europe, UK</entry>
 
@@ -778,13 +804,13 @@ Certificate information:
 
       <para>The easiest way to install
 	<application>CVSup</application> is to use the precompiled
-	<package>net/cvsup</package> package from the
-	&os; <link linkend="ports">packages collection</link>. If you
+	<package>net/cvsup</package> package from the &os; <link
+	  linkend="ports">packages collection</link>. If you
 	prefer to build <application>CVSup</application> from source,
-	you can use the <package>net/cvsup</package>
-	port instead.  But be forewarned: the <package>net/cvsup</package> port depends on the
-	Modula-3 system, which takes a substantial amount of time and
-	disk space to download and build.</para>
+	you can use the <package>net/cvsup</package> port instead.
+	But be forewarned: the <package>net/cvsup</package> port
+	depends on the Modula-3 system, which takes a substantial
+	amount of time and disk space to download and build.</para>
 
       <note>
 	<para>If you are going to be using
@@ -802,7 +828,8 @@ Certificate information:
       <para><application>CVSup</application>'s operation is controlled
 	by a configuration file called the
 	<filename>supfile</filename>.  There are some sample
-	<filename>supfiles</filename> in the directory <link xlink:href="file://localhost/usr/share/examples/cvsup/"><filename>/usr/share/examples/cvsup/</filename></link>.</para>
+	<filename>supfiles</filename> in the directory <link
+	  xlink:href="file://localhost/usr/share/examples/cvsup/"><filename>/usr/share/examples/cvsup/</filename></link>.</para>
 
       <para>The information in a <filename>supfile</filename> answers
 	the following questions for
@@ -884,8 +911,8 @@ Certificate information:
 
       <itemizedlist>
 	<listitem>
-	  <para><anchor xml:id="cvsup-config-files"/>Which files do you
-	    want to receive?</para>
+	  <para><anchor xml:id="cvsup-config-files"/>Which files do
+	    you want to receive?</para>
 
 	  <para>The files available via
 	    <application>CVSup</application> are organized into named
@@ -904,8 +931,8 @@ Certificate information:
 	</listitem>
 
 	<listitem>
-	  <para><anchor xml:id="cvsup-config-vers"/>Which version(s) of
-	    them do you want?</para>
+	  <para><anchor xml:id="cvsup-config-vers"/>Which version(s)
+	    of them do you want?</para>
 
 	  <para>With <application>CVSup</application>, you can receive
 	    virtually any version of the sources that ever existed.
@@ -983,17 +1010,17 @@ Certificate information:
 	</listitem>
 
 	<listitem>
-	  <para><anchor xml:id="cvsup-config-where"/>Where do you want to
-	    get them from?</para>
+	  <para><anchor xml:id="cvsup-config-where"/>Where do you want
+	    to get them from?</para>
 
 	  <para>We use the <literal>host=</literal> field to tell
 	    <command>cvsup</command> where to obtain its updates.  Any
-	    of the
-	    <link linkend="cvsup-mirrors">CVSup mirror sites</link>
-	    will do, though you should try to select one that is close
-	    to you in cyberspace.  In this example we will use a
-	    fictional &os; distribution site,
-	    <systemitem class="fqdomainname">cvsup99.FreeBSD.org</systemitem>:</para>
+	    of the <link
+	      linkend="cvsup-mirrors">CVSup mirror sites</link> will
+	    do, though you should try to select one that is close to
+	    you in cyberspace.  In this example we will use a
+	    fictional &os; distribution site, <systemitem
+	      class="fqdomainname">cvsup99.FreeBSD.org</systemitem>:</para>
 
 	  <programlisting>*default host=cvsup99.FreeBSD.org</programlisting>
 
@@ -1006,8 +1033,8 @@ Certificate information:
 	</listitem>
 
 	<listitem>
-	  <para><anchor xml:id="cvsup-config-dest"/>Where do you want to
-	    put them on your own machine?</para>
+	  <para><anchor xml:id="cvsup-config-dest"/>Where do you want
+	    to put them on your own machine?</para>
 
 	  <para>The <literal>prefix=</literal> field tells
 	    <command>cvsup</command> where to put the files it
@@ -1160,7 +1187,8 @@ usr.bin/</programlisting>
 
       <para>Since you are updating your actual
 	<filename>/usr/src</filename> tree in this example, you will
-	need to run the program as <systemitem class="username">root</systemitem> so that
+	need to run the program as <systemitem
+	  class="username">root</systemitem> so that
 	<command>cvsup</command> has the permissions it needs to
 	update your files.  Having just created your configuration
 	file, and having never used this program before, that might
@@ -1183,8 +1211,8 @@ usr.bin/</programlisting>
 	versions of those files will be written into the specified
 	directory.  As long as you have read access to
 	<filename>/usr/src</filename>, you do not even need to be
-	<systemitem class="username">root</systemitem> to perform this kind of trial
-	run.</para>
+	<systemitem class="username">root</systemitem> to perform this
+	kind of trial run.</para>
 
       <para>If you are not running X11 or if you just do not like
 	GUIs, you should add a couple of options to the command line
@@ -2000,16 +2028,15 @@ usr.bin/</programlisting>
 	particular version of &os; was released.  The release
 	engineering process is documented in more detail by the
 	<link xlink:href="&url.base;/releng/">Release Engineering
-	  Information</link> and
-	<link xlink:href="&url.articles.releng;/release-proc.html">Release
+	  Information</link> and <link
+	  xlink:href="&url.articles.releng;/release-proc.html">Release
 	  Process</link> documents.  The
 	<filename>src</filename> tree uses tag names
 	that start with <literal>RELENG_</literal> tags.  The
-	<filename>ports</filename> and
-	<filename>doc</filename> trees use tags
-	whose names begin with <literal>RELEASE</literal> tags.
-	Finally, the <filename>www</filename> tree
-	is not tagged with any special name for releases.</para>
+	<filename>ports</filename> and <filename>doc</filename> trees
+	use tags whose names begin with <literal>RELEASE</literal>
+	tags.  Finally, the <filename>www</filename> tree is not
+	tagged with any special name for releases.</para>
 
       <variablelist>
 	<varlistentry>
@@ -2457,12 +2484,13 @@ usr.bin/</programlisting>
 	  <para>Available collections:</para>
 	  <itemizedlist>
 	    <listitem>
-	      <para>ftp: A partial mirror of the &os; <acronym>FTP</acronym>
-		server.</para>
+	      <para>ftp: A partial mirror of the &os;
+		<acronym>FTP</acronym> server.</para>
 	    </listitem>
 
 	    <listitem>
-	      <para>&os;: A full mirror of the &os; <acronym>FTP</acronym> server.</para>
+	      <para>&os;: A full mirror of the &os;
+		<acronym>FTP</acronym> server.</para>
 	    </listitem>
 	  </itemizedlist>
 	</listitem>
@@ -2477,7 +2505,8 @@ usr.bin/</programlisting>
 	  <para>Available collections:</para>
 	  <itemizedlist>
 	    <listitem>
-	      <para>&os;: A full mirror of the &os; <acronym>FTP</acronym> server.</para>
+	      <para>&os;: A full mirror of the &os;
+		<acronym>FTP</acronym> server.</para>
 	    </listitem>
 	  </itemizedlist>
 	</listitem>
@@ -2493,7 +2522,8 @@ usr.bin/</programlisting>
 
 	  <itemizedlist>
 	    <listitem>
-	      <para>&os;: A full mirror of the &os; <acronym>FTP</acronym> server.</para>
+	      <para>&os;: A full mirror of the &os;
+		<acronym>FTP</acronym> server.</para>
 	    </listitem>
 
 	    <listitem>
@@ -2518,7 +2548,8 @@ usr.bin/</programlisting>
 	  <para>Available collections:</para>
 	  <itemizedlist>
 	    <listitem>
-	      <para>&os;: A full mirror of the &os; <acronym>FTP</acronym> server.</para>
+	      <para>&os;: A full mirror of the &os;
+		<acronym>FTP</acronym> server.</para>
 	    </listitem>
 	  </itemizedlist>
 	</listitem>
@@ -2537,7 +2568,8 @@ usr.bin/</programlisting>
 	  <para>Available collections:</para>
 	  <itemizedlist>
 	    <listitem>
-	      <para>&os;: A full mirror of the &os; <acronym>FTP</acronym> server.</para>
+	      <para>&os;: A full mirror of the &os;
+		<acronym>FTP</acronym> server.</para>
 	    </listitem>
 	  </itemizedlist>
 	</listitem>
@@ -2570,8 +2602,8 @@ usr.bin/</programlisting>
 	  <para>Available collections:</para>
 	  <itemizedlist>
 	    <listitem>
-	      <para>&os;: The master archive of the &os; <acronym>FTP</acronym>
-		server.</para>
+	      <para>&os;: The master archive of the &os;
+		<acronym>FTP</acronym> server.</para>
 	    </listitem>
 
 	    <listitem>
@@ -2585,7 +2617,8 @@ usr.bin/</programlisting>
 
 	  <itemizedlist>
 	    <listitem>
-	      <para>&os;: A full mirror of the &os; <acronym>FTP</acronym> server.</para>
+	      <para>&os;: A full mirror of the &os;
+		<acronym>FTP</acronym> server.</para>
 	    </listitem>
 	  </itemizedlist>
 	</listitem>