Fixup erroneous or extraneous <para>...</para> elements.

2 files changed, 82 insertions, 85 deletions

diff --git a/en/handbook/README b/en/handbook/README
index cb06c8c910..0349e7cd97 100644
--- a/en/handbook/README
+++ b/en/handbook/README
@@ -547,3 +547,5 @@ for example,
       Replace with: </email>
 
  50. <abbrev> -> <acronym> in some cases.
+
+ 51. Fixup erroneous or extraneous <para>...</para> elements.
diff --git a/en/handbook/handbook.sgml b/en/handbook/handbook.sgml
index 3f68fb1d6b..53876209e0 100644
--- a/en/handbook/handbook.sgml
+++ b/en/handbook/handbook.sgml
@@ -64,7 +64,7 @@
 	  provides you with many advanced features previously available only
 	  on much more expensive computers. These features include:</para>
 	
-	<para>
+	
 	  <itemizedlist>
 	    
 	    <listitem>
@@ -168,7 +168,7 @@
 	    </listitem>
 	    
 	  </itemizedlist>
-	</para>
+	
 	
 	<para>FreeBSD is based on the 4.4BSD-Lite release from Computer
 	  Systems Research Group (CSRG) at the University of California at
@@ -198,7 +198,7 @@
 	  vendors. Here is just a sampling of some of the applications in
 	  which people are currently using FreeBSD:</para>
 	
-	<para>
+	
 	  <itemizedlist>
 	    
 	    <listitem>
@@ -291,7 +291,7 @@
 	    </listitem>
 	    
 	  </itemizedlist>
-	</para>
+	
 	
 	<para>FreeBSD is available in both source and binary form on CDROM and
 	  via anonymous ftp. See <xref linkend="mirrors" remap="Obtaining
@@ -446,7 +446,7 @@
 	  development process, whether working independently or in close
 	  cooperation:</para>
 	
-	<para>
+	
 	  <variablelist>
 	    <varlistentry><term>The CVS
 		  repository<anchor
@@ -538,7 +538,7 @@
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
-	</para>
+	
 	
 	<para>In summary, our development model is organized as a loose set of
 	  concentric circles. The centralized model is designed for the
@@ -2595,7 +2595,7 @@ do-install:
       <sect1>
 	<title>Some Questions and Answers</title>
 	
-	<para>
+	
 	  <itemizedlist>
 	    
 	    <listitem>
@@ -3057,9 +3057,7 @@ grizzle-6.5 - the combined piano tutorial, LOGO interpreter and shoot 'em up arc
 	    
 	  </itemizedlist>
 	  
-	</para>
 	
-	<para></para>
 	
       </sect1>
     </chapter>
@@ -3094,7 +3092,7 @@ grizzle-6.5 - the combined piano tutorial, LOGO interpreter and shoot 'em up arc
 	  <emphasis>your</emphasis> PC's hardware. This has a number of
 	  benefits:</para>
 	
-	<para>
+	
 	  <itemizedlist>
 	    
 	    <listitem>
@@ -3119,7 +3117,7 @@ grizzle-6.5 - the combined piano tutorial, LOGO interpreter and shoot 'em up arc
 	    </listitem>
 	    
 	  </itemizedlist>
-	</para>
+	
 	
       </sect1>
       
@@ -3417,7 +3415,7 @@ grizzle-6.5 - the combined piano tutorial, LOGO interpreter and shoot 'em up arc
 	  <para>These lines provide kernel support for various filesystems and
 	    other options.</para>
 	  
-	  <para>
+	  
 	    <variablelist>
 	      <varlistentry><term>options MATH_EMULATE</term>
 		<listitem>
@@ -3505,7 +3503,7 @@ grizzle-6.5 - the combined piano tutorial, LOGO interpreter and shoot 'em up arc
 		</listitem>
 	      </varlistentry>
 	    </variablelist>
-	  </para>
+	  
 	  
 	</sect2>
 	
@@ -3745,7 +3743,7 @@ grizzle-6.5 - the combined piano tutorial, LOGO interpreter and shoot 'em up arc
 		      linkend="kernelconfig-atapi" remap="IDE"> or <xref
 		      linkend="kernelconfig-scsi" remap="SCSI">.</para>
 		  
-		  <para>
+		  
 		    <variablelist>
 		      <varlistentry><term>device mcd0 at isa? port 0x300 bio
 			  irq 10 vector mcdintr</term>
@@ -3771,7 +3769,7 @@ grizzle-6.5 - the combined piano tutorial, LOGO interpreter and shoot 'em up arc
 			</listitem>
 		      </varlistentry>
 		    </variablelist>
-		  </para>
+		  
 		</listitem>
 	      </varlistentry>
 	    </variablelist>
@@ -3794,7 +3792,7 @@ grizzle-6.5 - the combined piano tutorial, LOGO interpreter and shoot 'em up arc
 		    kinds of SCSI controllers. Comment out all except for the
 		    one(s) you have:</para>
 		  
-		  <para>
+		  
 		    <variablelist>
 		      <varlistentry><term>controller bt0 at isa? port
 			  "IO_BT0" bio irq ? vector btintr</term>
@@ -3877,7 +3875,7 @@ grizzle-6.5 - the combined piano tutorial, LOGO interpreter and shoot 'em up arc
 			</listitem>
 		      </varlistentry>
 		    </variablelist>
-		  </para>
+		  
 		</listitem>
 	      </varlistentry>
 	      
@@ -6359,11 +6357,11 @@ FreeBSD BUILT-19950429 (GR386) #0: Sat Apr 29 17:50:09 SAT 1995</screen>
 	    <informalexample>
 	      <screen>&prompt.root; <userinput>ipfw -a l</userinput></screen>
 	    </informalexample> You can also see the last time a chain entry
-	    was matched with
+	    was matched with:</para>
 	    
 	    <informalexample>
 	      <screen>&prompt.root; <userinput>ipfw -at l</userinput></screen>
-	    </informalexample></para>
+	    </informalexample>
 	  
 	</sect2>
 	
@@ -6643,7 +6641,7 @@ FreeBSD BUILT-19950429 (GR386) #0: Sat Apr 29 17:50:09 SAT 1995</screen>
 	<para>This section tells how to configure printer hardware and the
 	  LPD software to use the printer. It teaches the basics:</para>
 	
-	<para>
+	
 	  <itemizedlist>
 	    
 	    <listitem>
@@ -6659,7 +6657,7 @@ FreeBSD BUILT-19950429 (GR386) #0: Sat Apr 29 17:50:09 SAT 1995</screen>
 	    </listitem>
 	    
 	  </itemizedlist>
-	</para>
+	
 	
 	<para>If you are setting up a printer that uses a network protocol to
 	  accept data to print instead of a serial or parallel interface, see
@@ -7707,13 +7705,13 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 		port. We will set the bps rate to 38400. For the flag bits,
 		we will set the TANDEM, ANYP, LITOUT, FLUSHO, and PASS8 flags.
 		For the local mode bits, we will set the LITOUT and PASS8
-		flags:
+		flags:</para>
 
 		<programlisting>
 bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
         :sh:sd=/var/spool/lpd/bamboo:\
         :lp=/dev/ttyd5:fs#0x82000c1:xs#0x820:
-		</programlisting></para>
+		</programlisting>
 	      
 	    </sect4>
 	    
@@ -7761,11 +7759,11 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 /bin/cat &amp;&amp; exit 0
 exit 2
 		</programlisting>
-		Make the file executable:
+		Make the file executable:</para>
 		
 		<informalexample>
 		  <screen>&prompt.root; <userinput>chmod 555 /usr/local/libexec/if-simple</userinput></screen>
-		</informalexample></para>
+		</informalexample>
 	      
 	      <para>And then tell LPD to use it by specifying it with the
 		<literal>if</literal> capability in
@@ -7811,12 +7809,13 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	      <para><emphasis>To test the simple LPD
 		  setup:</emphasis></para>
 	      
-	      <para>Type:
+	      <para>Type:</para>
 		
 		<informalexample>
 		  <screen>&prompt.root; <userinput>lptest 20 5 | lpr -P<replaceable>printer-name</replaceable></userinput></screen>
-		</informalexample> where <emphasis
-		  remap=it>printer-name</emphasis> is a the name of a printer
+		</informalexample>
+
+	      <para>Where <replaceable>printer-name</replaceable> is a the name of a printer
 		(or an alias) specified in <filename>/etc/printcap</filename>.
 		To test the default printer, type  <citerefentry>
 		  <refentrytitle>lpr</refentrytitle></citerefentry>
@@ -7931,12 +7930,14 @@ exit 2
 			paper.</para>
 
 		      <!-- This para needs to be rewritten - Nik -->
-		      <para>Here is what FreeBSD wants your printer to do:
+		      <para>Here is what FreeBSD wants your printer to
+		      do:</para>
+		    
 			<informalexample>
 			  <screen>Printer received CR		Printer prints
 			    CR Printer received LF		Printer prints
 			    CR + LF</screen>
-			</informalexample></para>
+			</informalexample>
 		      
 		      <para>Here are some ways to achieve this:
 			<itemizedlist>
@@ -8623,7 +8624,7 @@ cfA013rose dequeued
 		<refentrytitle>lpr</refentrytitle></citerefentry> tell
 	      LPD to handle the job specially:</para>
 	    
-	    <para>
+	    
 	      <variablelist>
 		<varlistentry><term>-# <replaceable>copies</replaceable></term>
 		  <listitem>
@@ -8695,7 +8696,7 @@ cfA013rose dequeued
 		  </listitem>
 		</varlistentry>
 	      </variablelist>
-	    </para>
+	    
 	    
 	  </sect3>
 	  
@@ -8765,7 +8766,7 @@ cfA013rose dequeued
 	      <refentrytitle>lpc</refentrytitle></citerefentry>, you
 	    can</para>
 	  
-	  <para>
+	  
 	    <itemizedlist>
 	      
 	      <listitem>
@@ -8781,7 +8782,7 @@ cfA013rose dequeued
 	      </listitem>
 	      
 	    </itemizedlist>
-	  </para>
+	  
 	  
 	  <para>First, a note about terminology: if a printer is
 	    <emphasis>stopped</emphasis>, it will not print anything in its
@@ -11781,7 +11782,7 @@ Disk quotas for user test (uid 1002):
 	  make sure that your chosen configuration is supported before making
 	  any purchases.</para>
 	
-	<para>
+	
 	  <itemizedlist>
 	    
 	    <listitem>
@@ -11790,7 +11791,7 @@ Disk quotas for user test (uid 1002):
 	    </listitem>
 	    
 	  </itemizedlist>
-	</para>
+	
 	
       </sect1>
       
@@ -18723,7 +18724,7 @@ XkbKeymap   "xfree86(ru)"
 	    <para>There are a couple of kinds of serial cables. Which one
 	      you'll use depends on the terminal you want to connect:</para>
 	    
-	    <para>
+	    
 	      <itemizedlist>
 		
 		<listitem>
@@ -18744,7 +18745,7 @@ XkbKeymap   "xfree86(ru)"
 		</listitem>
 		
 	      </itemizedlist>
-	    </para>
+	    
 	    
 	    <para>Also, the serial port on <emphasis>both</emphasis> the
 	      terminal and your FreeBSD system must have connectors that will
@@ -22489,6 +22490,7 @@ hostname=myname.my.domain
 		    <listitem>
 		      <para>Add sl0 to the list of network interfaces by
 			changing the line that says:
+		      
 			<programlisting>
 network_interfaces="lo0"
 			</programlisting>
@@ -22501,11 +22503,11 @@ network_interfaces="lo0 sl0"
 		    </listitem>
 		    
 		    <listitem>
-		      <para>Set the startup flags of sl0 by adding a line:
+		      <para>Set the startup flags of sl0 by adding a line:</para>
 
 			<programlisting>
 ifconfig_sl0="inet ${hostname} slip-gateway netmask 0xffffff00 up"
-			</programlisting></para>
+			</programlisting>
 		    </listitem>
 		    
 		    <listitem>
@@ -24167,7 +24169,7 @@ subscribe freebsd-isdn
 	  
 	  <para>The following TA's are know to work with FreeBSD.</para>
 	  
-	  <para>
+	  
 	    <itemizedlist>
 	      
 	      <listitem>
@@ -24179,7 +24181,7 @@ subscribe freebsd-isdn
 	      </listitem>
 	      
 	    </itemizedlist>
-	  </para>
+	  
 	  
 	  <para>Most other TA's will probably work as well, TA vendors try to
 	    make sure their product can accept most of the standard modem AT
@@ -25188,7 +25190,7 @@ subscribe cvs-all
 	<sect2>
 	  <title>Using FreeBSD-stable</title>
 	  
-	  <para>
+	  
 	    <orderedlist>
 	      
 	      <listitem>
@@ -25277,7 +25279,7 @@ subscribe freebsd-stable
 	      
 	    </orderedlist>
 	    
-	  </para>
+	  
 	  
 	</sect2>
       </sect1>
@@ -26005,7 +26007,7 @@ cvs-crypto
 		  <para>Here are the revision tags that users might be
 		    interested in:</para>
 		  
-		  <para>
+		  
 		    <variablelist>
 		      <varlistentry><term>tag=RELENG_2_2_6_RELEASE</term>
 			<listitem>
@@ -26096,7 +26098,7 @@ cvs-crypto
 			</listitem>
 		      </varlistentry>
 		    </variablelist>
-		  </para>
+		  
 
 		<warning>
 		  <para>Be very
@@ -26344,7 +26346,7 @@ cvs-crypto
 		    <para>The main FreeBSD CVS repository, excluding the
 		      export-restricted cryptography code.</para>
 		    
-		    <para>
+		    
 		      <variablelist>
 			<varlistentry><term><literal>distrib
 			      release=cvs</literal></term>
@@ -26371,7 +26373,7 @@ cvs-crypto
 			  <listitem>
 			    <para>The FreeBSD ports collection.</para>
 			    
-			    <para>
+			    
 			      <variablelist>
 				<varlistentry><term><literal>ports-archivers
 				      release=cvs</literal></term>
@@ -26701,7 +26703,7 @@ cvs-crypto
 				  </listitem>
 				</varlistentry>
 			      </variablelist>
-			    </para>
+			    
 			    
 			  </listitem>
 			</varlistentry>
@@ -26713,7 +26715,7 @@ cvs-crypto
 			    <para>The main FreeBSD sources, excluding the
 			      export-restricted cryptography code.</para>
 			    
-			    <para>
+			    
 			      <variablelist>
 				<varlistentry><term><literal>src-base
 				      release=cvs</literal></term>
@@ -26893,7 +26895,7 @@ cvs-crypto
 				  </listitem>
 				</varlistentry>
 			      </variablelist>
-			    </para>
+			    
 			    
 			  </listitem>
 			</varlistentry>
@@ -26908,7 +26910,7 @@ cvs-crypto
 			  </listitem>
 			</varlistentry>
 		      </variablelist>
-		    </para>
+		    
 		    
 		  </listitem>
 		</varlistentry>
@@ -26919,7 +26921,7 @@ cvs-crypto
 		  <listitem>
 		    <para>The export-restricted cryptography code.</para>
 		    
-		    <para>
+		    
 		      <variablelist>
 			<varlistentry><term><literal>src-crypto
 			      release=cvs</literal></term>
@@ -26952,7 +26954,7 @@ cvs-crypto
 			  </listitem>
 			</varlistentry>
 		      </variablelist>
-		    </para>
+		    
 		    
 		  </listitem>
 		</varlistentry>
@@ -27100,7 +27102,7 @@ cvs-crypto
 		<para>3-stage boot issues. Overall coordination:
 		  &a.hackers;</para>
 		
-		<para>
+		
 		  <itemizedlist>
 		    
 		    <listitem>
@@ -27118,7 +27120,7 @@ cvs-crypto
 		    </listitem>
 		    
 		  </itemizedlist>
-		</para>
+		
 	      </listitem>
 	      
 	      <listitem>
@@ -27157,7 +27159,7 @@ cvs-crypto
 		<para>SCSI driver issues. Overall coordination:
 		  &a.hackers;</para>
 		
-		<para>
+		
 		  <itemizedlist>
 		    
 		    <listitem>
@@ -27177,13 +27179,13 @@ cvs-crypto
 		    </listitem>
 		    
 		  </itemizedlist>
-		</para>
+		
 	      </listitem>
 	      
 	      <listitem>
 		<para>Kernel issues. Overall coordination: &a.hackers;</para>
 		
-		<para>
+		
 		  <itemizedlist>
 		    
 		    <listitem>
@@ -27231,7 +27233,7 @@ cvs-crypto
 		    </listitem>
 		    
 		  </itemizedlist>
-		</para>
+		
 	      </listitem>
 	      
 	    </orderedlist>
@@ -27259,7 +27261,7 @@ cvs-crypto
 	      <listitem>
 		<para>Full LKM based driver support/Configuration Manager.</para>
 		
-		<para>
+		
 		  <itemizedlist>
 		    
 		    <listitem>
@@ -27276,7 +27278,7 @@ cvs-crypto
 		    </listitem>
 		    
 		  </itemizedlist>
-		</para>
+		
 	      </listitem>
 	      
 	      <listitem>
@@ -28154,7 +28156,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # Date created:        5 December 1994
 # Whom:                asami
 #
-# $Id: handbook.sgml,v 1.50 1998-10-26 23:52:03 nik Exp $
+# $Id: handbook.sgml,v 1.51 1998-10-26 23:52:47 nik Exp $
 #
        
 DISTNAME=      oneko-1.1b
@@ -32060,28 +32062,24 @@ MAINTAINER= email-addresses
 	<para>The <application>Tcl</application> embedded programming
 	  language will be used as example of how this model works:</para>
 	
-	<para>
-	  <filename>src/contrib/tcl</filename> contains the source as
+	<para><filename>src/contrib/tcl</filename> contains the source as
 	  distributed by the maintainers of this package. Parts that are
 	  entirely not applicable for FreeBSD can be removed. In the case of
 	  Tcl, the <filename>mac</filename>, <filename>win</filename> and
 	  <filename>compat</filename> subdirectories were eliminated before
 	  the import</para>
 	
-	<para>
-	  <filename>src/lib/libtcl</filename> contains only a "bmake style"
+	<para><filename>src/lib/libtcl</filename> contains only a "bmake style"
 	  <filename>Makefile</filename> that uses the standard
 	  <filename>bsd.lib.mk</filename> makefile rules to produce the
 	  library and install the documentation.</para>
 	
-	<para>
-	  <filename>src/usr.bin/tclsh</filename> contains only a bmake style
+	<para><filename>src/usr.bin/tclsh</filename> contains only a bmake style
 	  <filename>Makefile</filename> which will produce and install the
 	  <command>tclsh</command> program and its associated man-pages using the standard
 	  <filename>bsd.prog.mk</filename> rules.</para>
 	
-	<para>
-	  <filename>src/tools/tools/tcl_bmake</filename> contains a couple of
+	<para><filename>src/tools/tools/tcl_bmake</filename> contains a couple of
 	  shell-scripts that can be of help when the tcl software needs
 	  updating. These are not part of the built or installed
 	  software.</para>
@@ -32919,10 +32917,11 @@ options DDB
 	  usually must be followed by another <command>continue</command> statement. There is now an alias for
 	  this: <command>panic</command>.</para>
 	
-	<para>
 	  <informalexample>
 	    <screen><userinput>call boot(0)</userinput></screen>
-	  </informalexample> might be a good way to cleanly shut down the
+	  </informalexample>
+
+	<para>Which might be a good way to cleanly shut down the
 	  running system, <function>sync()</function> all disks, and finally
 	  reboot. As long as the disk and file system interfaces of the
 	  kernel are not damaged, this might be a good way for an almost clean
@@ -36047,7 +36046,7 @@ richc.isdn.bcm.tmc.edu   9845-03452-90255</screen>
 		<para>In case of problems, please contact the hostmaster <email>hostmaster@pl.FreeBSD.ORG</email>
 		  for this domain.</para>
 		
-		<para>
+		
 		  <itemizedlist>
 		    
 		    <listitem>
@@ -36056,7 +36055,7 @@ richc.isdn.bcm.tmc.edu   9845-03452-90255</screen>
 		    </listitem>
 		    
 		  </itemizedlist>
-		</para>
+		
 	      </listitem>
 	    </varlistentry>
 	    
@@ -36512,7 +36511,7 @@ richc.isdn.bcm.tmc.edu   9845-03452-90255</screen>
 	    <varlistentry><term>Australia</term>
 	      
 	      <listitem>
-		<para>
+		
 		  <itemizedlist>
 		    
 		    <listitem>
@@ -36520,7 +36519,7 @@ richc.isdn.bcm.tmc.edu   9845-03452-90255</screen>
 		    </listitem>
 		    
 		  </itemizedlist>
-		</para>
+		
 	      </listitem>
 	    </varlistentry>
 	    
@@ -37917,8 +37916,7 @@ help
 		<listitem>
 		  <para><emphasis>FreeBSD core team</emphasis></para>
 
-		  <para>
-		    This is an internal mailing list for use by the core
+		  <para>This is an internal mailing list for use by the core
 		    members. Messages can be sent to it when a serious
 		    FreeBSD-related matter requires arbitration or high-level
 		    scrutiny.</para>
@@ -37989,8 +37987,7 @@ help
 		<listitem>
 		  <para><emphasis>Filesystems</emphasis></para>
 
-		  <para>
-		    Discussions concerning FreeBSD filesystems. This is a
+		  <para>Discussions concerning FreeBSD filesystems. This is a
 		    technical mailing list for which strictly technical
 		    content is expected.</para>
 		</listitem>
@@ -38001,8 +37998,7 @@ help
 		<listitem>
 		  <para><emphasis>ISDN Communications</emphasis></para>
 
-		  <para>
-		    This is the mailing list for people discussing the
+		  <para>This is the mailing list for people discussing the
 		    development of ISDN support for FreeBSD.</para>
 		</listitem>
 	      </varlistentry>
@@ -38170,8 +38166,7 @@ help
 		<listitem>
 		  <para><emphasis>Security issues</emphasis></para>
 
-		  <para>
-		    FreeBSD computer security issues (DES, Kerberos, known
+		  <para>FreeBSD computer security issues (DES, Kerberos, known
 		    security holes and fixes, etc). This is a technical
 		    mailing list for which strictly technical content is
 		    expected.</para>