Whitespace-only fixups from the e-mail to SGML entities conversion.

8 files changed, 39 insertions, 59 deletions

diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 3304715c64..457d3f530b 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -71,8 +71,7 @@
 	  
 	  <row>	  
 	    <entry><emphasis>Mailing List</emphasis></entry>
-	    <entry>&a.developers;,
-	      &a.committers;</entry>
+	    <entry>&a.developers;, &a.committers;</entry>
 	  </row>
 	  
 	  <row>	  
@@ -525,11 +524,11 @@
         </itemizedlist>
 
         <para>You will almost certainly get a conflict because
-          of the <literal>$Id: article.sgml,v 1.99 2002-03-15 08:10:46 roam Exp $</literal> (or in FreeBSD's case,
+          of the <literal>$Id: article.sgml,v 1.100 2002-03-15 08:28:12 roam Exp $</literal> (or in FreeBSD's case,
           <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) lines, so you will have to edit
           the file to resolve the conflict (remove the marker lines and
-          the second <literal>$Id: article.sgml,v 1.99 2002-03-15 08:10:46 roam Exp $</literal> line, leaving the original
-          <literal>$Id: article.sgml,v 1.99 2002-03-15 08:10:46 roam Exp $</literal> line intact).</para>
+          the second <literal>$Id: article.sgml,v 1.100 2002-03-15 08:28:12 roam Exp $</literal> line, leaving the original
+          <literal>$Id: article.sgml,v 1.100 2002-03-15 08:28:12 roam Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -795,8 +794,7 @@ checkout -P</programlisting>
           that it is actually merely the Newtonian manifestation of a
           sentient transdimensional entity.  It is not humanly possible
           to know its every quirk inside out, so do not be afraid to ask
-          the resident AI (&a.cvs;) for help when
-          you screw up.</para>
+          the resident AI (&a.cvs;) for help when you screw up.</para>
       </listitem>
 
       <listitem>
@@ -862,9 +860,8 @@ checkout -P</programlisting>
 	  will have any idea who you are or what you are working on.  You do
 	  not have to write a comprehensive biography, just write a paragraph
 	  or two about who you are and what you plan to be working on as a
-	  committer in FreeBSD.  Email this to
-	  the &a.developers; and you will be on your
-	  way!</para>
+	  committer in FreeBSD.  Email this to the &a.developers; and you will
+	  be on your way!</para>
       </listitem>
 
       <listitem>
@@ -874,8 +871,7 @@ checkout -P</programlisting>
 	  containing the e-mail address where you want mail addressed to
 	  <replaceable>yourusername</replaceable>@FreeBSD.org to be forwarded.
 	  This includes all of the commit messages as well as any other mail
-	  addressed to the &a.committers; and
-	  &a.developers;.  Really
+	  addressed to the &a.committers; and &a.developers;.  Really
 	  large mailboxes which have taken up permanent residence on
 	  <hostid>hub</hostid> often get <quote>accidently</quote> truncated
 	  without warning, so forward it or read it and you will not lose
@@ -1094,10 +1090,9 @@ docs:Documentation Bug:nik:</programlisting>
 	    infrastructure under <filename>doc/share/mk</filename> and the
 	    stylesheets and related code under
 	    <filename>doc/share/sgml</filename>.  If you have got questions
-	    about these you are encouraged to send them via the
-	    &a.doc;.  Committers
-	    interested in contributing to the documentation should familiarise
-	    themselves with the
+	    about these you are encouraged to send them via the &a.doc;.
+	    Committers interested in contributing to the documentation should
+	    familiarise themselves with the
 	    <ulink url="../../books/fdp-primer/index.html">Documentation Project Primer</ulink>.</para>
 	</listitem>
       </varlistentry>
@@ -2038,8 +2033,7 @@ docs:Documentation Bug:nik:</programlisting>
 
 	  <answer>
 	    <para>The ports manager will send out warning messages to
-	      the &a.ports; and
-	      &a.committers;
+	      the &a.ports; and &a.committers;
 	      announcing the start of the impending release, usually
 	      two or three weeks in advance.  The exact starting time
 	      will not be determined until a few days before the
@@ -2049,9 +2043,7 @@ docs:Documentation Bug:nik:</programlisting>
 	      rolled.</para>
 
 	    <para>When the freeze starts, there will be another
-	      announcement to the
-	      &a.committers;, of
-	      course.</para>
+	      announcement to the &a.committers;, of course.</para>
 	  </answer>
 	</qandaentry>
 
@@ -2062,9 +2054,7 @@ docs:Documentation Bug:nik:</programlisting>
 
 	  <answer>
 	    <para>A few hours after the release, the ports manager
-	      will send out a mail to the
-	      &a.ports; and
-	      &a.committers;
+	      will send out a mail to the &a.ports; and &a.committers;
 	      announcing the end of the ports freeze.  Note that the
 	      release being cut does not automatically end the freeze.
 	      We have to make sure there will not be any last minute
diff --git a/en_US.ISO8859-1/articles/contributing/article.sgml b/en_US.ISO8859-1/articles/contributing/article.sgml
index 14bbc56df4..140c9bdc9e 100644
--- a/en_US.ISO8859-1/articles/contributing/article.sgml
+++ b/en_US.ISO8859-1/articles/contributing/article.sgml
@@ -482,8 +482,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 	<para>We can always use new mirror sites for FTP, WWW or
 	  <command>cvsup</command>.  If you would like to be such a mirror,
-	  please contact the
-	  &a.hubs; for more information.</para>
+	  please contact the &a.hubs; for more information.</para>
       </sect3>
     </sect2>
   </sect1>
diff --git a/en_US.ISO8859-1/articles/formatting-media/article.sgml b/en_US.ISO8859-1/articles/formatting-media/article.sgml
index 89b62f552a..fae503f463 100644
--- a/en_US.ISO8859-1/articles/formatting-media/article.sgml
+++ b/en_US.ISO8859-1/articles/formatting-media/article.sgml
@@ -602,8 +602,8 @@ swapon:  added /dev/da0b as swap space</screen>
       </listitem>
 
       <listitem>
-	<para>&a.jkh; for
-	  making sysinstall useful for this type of task.</para>
+	<para>&a.jkh; for making sysinstall useful for this type of task.
+	  </para>
       </listitem>
 
       <listitem>
@@ -613,9 +613,8 @@ swapon:  added /dev/da0b as swap space</screen>
       </listitem>
 
       <listitem>
-	<para>&a.grog; for
-	  checking my work and pointing out inaccuracies, as well as
-	  miscellaneous support.</para>
+	<para>&a.grog; for checking my work and pointing out inaccuracies,
+	  as well as miscellaneous support.</para>
       </listitem>
     </itemizedlist>
   </sect1>
diff --git a/en_US.ISO8859-1/articles/freebsd-questions/article.sgml b/en_US.ISO8859-1/articles/freebsd-questions/article.sgml
index 35ce57b745..031cf34d36 100644
--- a/en_US.ISO8859-1/articles/freebsd-questions/article.sgml
+++ b/en_US.ISO8859-1/articles/freebsd-questions/article.sgml
@@ -74,8 +74,7 @@
     <title id="subscribe">How to subscribe to FreeBSD-questions</title>
 
     <para>FreeBSD-questions is a mailing list, so you need mail access.  Send
-      a mail message to &a.majordomo; with the single
-      line:</para>
+      a mail message to &a.majordomo; with the single line:</para>
 
     <literallayout class="monospaced">subscribe FreeBSD-questions</literallayout>
     
diff --git a/en_US.ISO8859-1/articles/hubs/article.sgml b/en_US.ISO8859-1/articles/hubs/article.sgml
index cf497fd385..be4dd7b038 100644
--- a/en_US.ISO8859-1/articles/hubs/article.sgml
+++ b/en_US.ISO8859-1/articles/hubs/article.sgml
@@ -760,8 +760,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
             See <xref linkend="mirror-cvs-cvsup"> for details.
           </para>
           <para>
-            To get access, you need to contact
-            &a.jdp;.
+            To get access, you need to contact &a.jdp;.
             Make sure you read
             <ulink url="http://people.freebsd.org/~jdp/cvsup-access/">FreeBSD CVSup Access Policy</ulink>
             first!
@@ -830,8 +829,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
             <application>RSYNC</application> access</para></listitem>
         </itemizedlist>
 
-        Furthermore, admins should be subscribed to
-        the &a.hubs;.
+        Furthermore, admins should be subscribed to the &a.hubs;.
         See <ulink url="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/eresources.html#ERESOURCES-MAIL">this link</ulink> for details, how to subscribe.
       </para>
       <important>
@@ -862,8 +860,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
       <para>
         Before applying, please consider (again) if
         another official mirror is really needed for
-        your region. Ask on the &a.hubs;,
-        if in doubt.
+        your region. Ask on the &a.hubs;, if in doubt.
       </para>
       <para>Ok, here is how to do it:</para>
       <procedure>
@@ -892,15 +889,14 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
             If there is no subdomain delegated, yet, for your
             country, you probably need to contact
             <email>hostmaster@freebsd.org</email>,
-            however, you can try the &a.hubs;
-            first.
+            however, you can try the &a.hubs; first.
           </para>
         </step>
         <step>
           <para>
-            Then you can ask the &a.doc;, or 
-            the &a.hubs; to add your mirror site to
-            the mirror list in the <ulink url="http://www.freebsd.org/handbook">FreeBSD
+            Then you can ask the &a.doc;, or the &a.hubs; to add your
+            mirror site to the mirror list in the
+            <ulink url="http://www.freebsd.org/handbook">FreeBSD
             Handbook</ulink>. Make sure you tell them the email address,
             to list as the maintainer of the site.
           </para>
diff --git a/en_US.ISO8859-1/articles/new-users/article.sgml b/en_US.ISO8859-1/articles/new-users/article.sgml
index bd2d10317a..53d59d290c 100644
--- a/en_US.ISO8859-1/articles/new-users/article.sgml
+++ b/en_US.ISO8859-1/articles/new-users/article.sgml
@@ -656,8 +656,7 @@
     <para>and copying <filename>dmesg.txt</filename> to the floppy.
       <command>/sbin/dmesg</command> is the boot log record, and it is
       useful to understand it because it shows what FreeBSD found when
-      it booted up.  If you ask questions on
-      the &a.questions; or on a USENET
+      it booted up.  If you ask questions on the &a.questions; or on a USENET
       group&mdash;like <quote>FreeBSD is not finding my tape drive,
       what do I do?</quote>&mdash;people will want to know what
       <command>dmesg</command> has to say.</para>
diff --git a/en_US.ISO8859-1/articles/releng-packages/article.sgml b/en_US.ISO8859-1/articles/releng-packages/article.sgml
index ea695bf167..9cd9a307fc 100644
--- a/en_US.ISO8859-1/articles/releng-packages/article.sgml
+++ b/en_US.ISO8859-1/articles/releng-packages/article.sgml
@@ -59,9 +59,9 @@
     <para>The <ulink url="http://www.FreeBSD.org/ports">FreeBSD Ports
       collection</ulink> is a collection of over &os.numports;
       third-party software packages available for FreeBSD. The &a.portmgr;
-      is responsible for maintaining a
-      consistent ports tree that can be used to create the binary
-      packages that accompany a given FreeBSD release.</para>
+      is responsible for maintaining a consistent ports tree that can be used
+      to create the binary packages that accompany a given FreeBSD
+      release.</para>
     
     <sect2>
       <title>The Ports Cluster</title>
diff --git a/en_US.ISO8859-1/articles/releng/article.sgml b/en_US.ISO8859-1/articles/releng/article.sgml
index d1d1cb6586..5613610be2 100644
--- a/en_US.ISO8859-1/articles/releng/article.sgml
+++ b/en_US.ISO8859-1/articles/releng/article.sgml
@@ -122,8 +122,7 @@
     interface provided at <ulink
     url="http://www.FreeBSD.org/send-pr.html"></ulink>
     In addition to the multitude of different technical mailing lists
-    about FreeBSD, the &a.qa;
-    provides a forum for discussing the finer
+    about FreeBSD, the &a.qa; provides a forum for discussing the finer
     points of <quote>release-polishing</quote>.</para>
   
   <para>To service our most conservative users, individual release
@@ -169,8 +168,8 @@
     <para>Thirty days before the anticipated release, the source
       repository enters a <quote>code slush</quote>.  During this
       time, all commits to the -STABLE branch must be approved by the
-      &a.re;.  The kinds of changes that
-      are allowed during this 15 day period include:</para>
+      &a.re;.  The kinds of changes that are allowed during this 15 day
+      period include:</para>
     
     <itemizedlist>
       <listitem>
@@ -580,9 +579,9 @@
     <para>The <ulink url="http://www.FreeBSD.org/ports">FreeBSD Ports
       collection</ulink> is a collection of over &os.numports;
       third-party software packages available for FreeBSD. The &a.portmgr;
-      is responsible for maintaining a
-      consistent ports tree that can be used to create the binary
-      packages that accompany official FreeBSD releases.</para>
+      is responsible for maintaining a consistent ports tree that can be used
+      to create the binary packages that accompany official FreeBSD
+      releases.</para>
 
     <para>The release engineering activities for our collection of
       third-party packages is beyond the scope of this document.  A
@@ -828,9 +827,8 @@
     throughout the years making FreeBSD what it is today.  Of course
     the release wouldn't have been possible without all of the
     release-related work done by &a.asami;, &a.steve;, &a.bmah;, &a.nik;,
-    &a.obrien;, &a.kris;, &a.jhb; and the rest of
-    the FreeBSD development community.  I would also like to thank
-    &a.rgrimes;, &a.phk;, and others
+    &a.obrien;, &a.kris;, &a.jhb; and the rest of the FreeBSD development
+    community.  I would also like to thank &a.rgrimes;, &a.phk;, and others
     who worked on the release engineering tools in the very early days
     of FreeBSD.  This article was influenced by release engineering
     documents from the CSRG[14], the NetBSD Project[11], and John