Fix some stupid mistakes I made when adding des' CVS primer:

* $FreeBSD$ shouldn't be expanded when used in the explanation of
   conflicts.
 * Add some markup bits I missed, fix typoes, fix broken hyphenation
   caused by joining lines together which had hyphenated words split over
   them.

en_US.ISO8859-1/articles/committers-guide/article.sgml

@@ -16,7 +16,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$Date: 2000-07-26 01:17:18 $</pubdate>
+    <pubdate>$Date: 2000-07-26 17:53:17 $</pubdate>
 
     <copyright>
       <year>1999</year>
@@ -166,13 +166,14 @@
 
     <orderedlist>
       <listitem>
-        <para>Check out a module with the "co" or "checkout" command.</para>
+        <para>Check out a module with the <literal>co</literal> or
+	  <literal>checkout</literal> command.</para>
 
         <screen>&prompt.user; <userinput>cvs checkout shazam</userinput></screen>
 
-        <para>This checks out a copy of the "shazam" module. If
-          there is no "shazam" module in the modules file, looks for a
-          top-level directory named "shazam" instead.</para>
+        <para>This checks out a copy of the <filename>shazam</filename> module. If
+          there is no <filename>shazam</filename> module in the modules file, looks for a
+          top-level directory named <filename>shazam</filename> instead.</para>
 
         <para>Useful options:</para>
 
@@ -239,7 +240,7 @@
             <screen>&prompt.user; <userinput>cvs co -P miscfs</userinput></screen>
 
             <para>You now have a directory named
-              <filename>miscfs</filename> with sub- directories
+              <filename>miscfs</filename> with subdirectories
               <filename>CVS</filename>, <filename>deadfs</filename>,
               <filename>devfs</filename>... but note that there is no
               <filename>linprocfs</filename> subdirectory, because there
@@ -306,7 +307,7 @@
 
       <listitem>
         <para>Check the status of checked-out files with the
-          <literal>command</literal> command.</para>
+          <literal>status</literal> command.</para>
 
         <screen>&prompt.user; <userinput>cvs status shazam</userinput></screen>
 
@@ -519,11 +520,11 @@
         </itemizedlist>
 
         <para>You'll almost certainly get a conflict because
-          of the <literal>$Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $</literal> (or in FreeBSD's case,
-          <literal>$FreeBSD$</literal>) lines, so you'll have to edit
+          of the <literal>$Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $</literal> (or in FreeBSD's case,
+          <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
           the file to resolve the conflict (remove the marker lines and
-          the second <literal>$Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $</literal> line, leaving the original
-          <literal>$Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $</literal> line intact).</para>
+          the second <literal>$Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $</literal> line, leaving the original
+          <literal>$Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -744,7 +745,7 @@ checkout -P</programlisting>
         <para>CVS is old, arcane, crufty and buggy, and sometimes
           exhibits non-deterministic behavior which some claim as proof
           that it's actually merely the newtonian manifestation of a
-          sentient trans- dimensional entity.  It's not humanly possible
+          sentient transdimensional entity.  It's not humanly possible
           to know its every quirk inside out, so don't be afraid to ask
           the resident AI (<email>cvs@FreeBSD.org</email>) for help when
           you screw up.</para>

en_US.ISO_8859-1/articles/committers-guide/article.sgml

@@ -16,7 +16,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$Date: 2000-07-26 01:17:18 $</pubdate>
+    <pubdate>$Date: 2000-07-26 17:53:17 $</pubdate>
 
     <copyright>
       <year>1999</year>
@@ -166,13 +166,14 @@
 
     <orderedlist>
       <listitem>
-        <para>Check out a module with the "co" or "checkout" command.</para>
+        <para>Check out a module with the <literal>co</literal> or
+	  <literal>checkout</literal> command.</para>
 
         <screen>&prompt.user; <userinput>cvs checkout shazam</userinput></screen>
 
-        <para>This checks out a copy of the "shazam" module. If
-          there is no "shazam" module in the modules file, looks for a
-          top-level directory named "shazam" instead.</para>
+        <para>This checks out a copy of the <filename>shazam</filename> module. If
+          there is no <filename>shazam</filename> module in the modules file, looks for a
+          top-level directory named <filename>shazam</filename> instead.</para>
 
         <para>Useful options:</para>
 
@@ -239,7 +240,7 @@
             <screen>&prompt.user; <userinput>cvs co -P miscfs</userinput></screen>
 
             <para>You now have a directory named
-              <filename>miscfs</filename> with sub- directories
+              <filename>miscfs</filename> with subdirectories
               <filename>CVS</filename>, <filename>deadfs</filename>,
               <filename>devfs</filename>... but note that there is no
               <filename>linprocfs</filename> subdirectory, because there
@@ -306,7 +307,7 @@
 
       <listitem>
         <para>Check the status of checked-out files with the
-          <literal>command</literal> command.</para>
+          <literal>status</literal> command.</para>
 
         <screen>&prompt.user; <userinput>cvs status shazam</userinput></screen>
 
@@ -519,11 +520,11 @@
         </itemizedlist>
 
         <para>You'll almost certainly get a conflict because
-          of the <literal>$Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $</literal> (or in FreeBSD's case,
-          <literal>$FreeBSD$</literal>) lines, so you'll have to edit
+          of the <literal>$Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $</literal> (or in FreeBSD's case,
+          <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
           the file to resolve the conflict (remove the marker lines and
-          the second <literal>$Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $</literal> line, leaving the original
-          <literal>$Id: article.sgml,v 1.29 2000-07-26 01:17:18 ben Exp $</literal> line intact).</para>
+          the second <literal>$Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $</literal> line, leaving the original
+          <literal>$Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -744,7 +745,7 @@ checkout -P</programlisting>
         <para>CVS is old, arcane, crufty and buggy, and sometimes
           exhibits non-deterministic behavior which some claim as proof
           that it's actually merely the newtonian manifestation of a
-          sentient trans- dimensional entity.  It's not humanly possible
+          sentient transdimensional entity.  It's not humanly possible
           to know its every quirk inside out, so don't be afraid to ask
           the resident AI (<email>cvs@FreeBSD.org</email>) for help when
           you screw up.</para>