Index: smbdotconf/printing/printcapname.xml
===================================================================
--- smbdotconf/printing/printcapname.xml	(revision 840)
+++ smbdotconf/printing/printcapname.xml	(working copy)
@@ -28,17 +28,15 @@
     these systems then Samba will launch <command moreinfo="none">lpstat -v</command> and 
     attempt to parse the output to obtain a printer list.</para>
 
-    <para>A minimal printcap file would look something like this:</para>
-
-<para><programlisting format="linespecific">
+    <para>A minimal printcap file would look something like this:
+<programlisting format="linespecific">
 print1|My Printer 1
 print2|My Printer 2
 print3|My Printer 3
 print4|My Printer 4
 print5|My Printer 5
-</programlisting></para>
-	
-    <para>where the '|' separates aliases of a printer. The fact 
+</programlisting>
+    where the '|' separates aliases of a printer. The fact 
     that the second alias has a space in it gives a hint to Samba 
     that it's a comment.</para>
 
Index: smbdotconf/misc/dfreecommand.xml
===================================================================
--- smbdotconf/misc/dfreecommand.xml	(revision 840)
+++ smbdotconf/misc/dfreecommand.xml	(working copy)
@@ -33,16 +33,11 @@
 #!/bin/sh
 df $1 | tail -1 | awk '{print $2&quot; &quot;$4}'
 </programlisting>
-	</para>
-
-	<para>or perhaps (on Sys V based systems):
+	or perhaps (on Sys V based systems):
 <programlisting format="linespecific"> 
 #!/bin/sh
 /usr/bin/df -k $1 | tail -1 | awk '{print $3&quot; &quot;$5}'
 </programlisting>
-	</para>
-		
-	<para>
 	Note that you may have to replace the command names with full path names on some systems.
 	</para>
 
Index: smbdotconf/security/usernamemap.xml
===================================================================
--- smbdotconf/security/usernamemap.xml	(revision 840)
+++ smbdotconf/security/usernamemap.xml	(working copy)
@@ -69,17 +69,17 @@
     <para>The following example would map mary and fred to the
     unix user sys, and map the rest to guest. Note the use of the
     '!' to tell Samba to stop processing if it gets a match on
-    that line.</para>
-
-<para><programlisting format="linespecific">
+    that line.
+<programlisting format="linespecific">
 !sys = mary fred
 guest = *
-</programlisting></para>
+</programlisting>
+    </para>
 
     <para>
-    Note that the remapping is applied to all occurrences
-    of usernames. Thus if you connect to \\server\fred and <constant>
-    fred</constant> is remapped to <constant>mary</constant> then you
+    Note that the remapping is applied to all occurrences of usernames.
+    Thus if you connect to \\server\fred and <constant>fred</constant>
+    is remapped to <constant>mary</constant> then you
     will actually be connecting to \\server\mary and will need to
     supply a password suitable for <constant>mary</constant> not
     <constant>fred</constant>. The only exception to this is the
Index: smbdotconf/security/usekerberoskeytab.xml
===================================================================
--- smbdotconf/security/usekerberoskeytab.xml	(revision 840)
+++ smbdotconf/security/usekerberoskeytab.xml	(working copy)
@@ -9,12 +9,12 @@
 </para>
 
 <para>When you are using the heimdal Kerberos libraries, you must also 
-specify the following in <filename>/etc/krb5.conf</filename>:</para>
-
+specify the following in <filename>/etc/krb5.conf</filename>:
 <programlisting>
 [libdefaults]
   default_keytab_name = FILE:/etc/krb5.keytab
 </programlisting>
+</para>
 </description>
 
 <value type="default">False</value>