More formatting edits.

(This used to be commit 962cb93b8c17bfc93cb6c8634d6eb47bbc271569)

7 files changed, 36 insertions, 14 deletions

diff --git a/docs/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml b/docs/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
index 0341f2ef0d..21f8ff6c30 100644
--- a/docs/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
@@ -570,7 +570,9 @@ and Windows 2003.
 </para>
 
 <para>
-The UPHClean software package can be downloaded from <ulink url="http://www.microsoft.com/downloads/details.aspx?FamilyID= 1B286E6D-8912-4E18-B570-42470E2F3582&amp;displaylang=en">User Profile Hive Cleanup Service.</ulink>
+The UPHClean software package can be downloaded from the User Profile Hive Cleanup
+Service<footnote>http://www.microsoft.com/downloads/details.aspx?FamilyID=1B286E6D-8912-4E18-B570-42470E2F3582&amp;displaylang=en</footnote>
+web site.
 </para>
 
 </sect2>
diff --git a/docs/manpages-3/net.8.xml b/docs/manpages-3/net.8.xml
index 6a9001b046..bcd6eb2ecc 100644
--- a/docs/manpages-3/net.8.xml
+++ b/docs/manpages-3/net.8.xml
@@ -618,9 +618,13 @@ Parameters take the for "parameter=value".  Common options include:</para>
 <refsect3>
 <title>GROUPMAP ADD</title>
 
-<para>Add a new group mapping entry</para>
-
-<para>net groupmap add {rid=int|sid=string} unixgroup=string [type={domain|local}] [ntgroup=string] [comment=string]</para>
+<para>
+Add a new group mapping entry:
+<screen>
+net groupmap add {rid=int|sid=string} unixgroup=string \
+      [type={domain|local}] [ntgroup=string] [comment=string]
+</screen>
+</para>
 
 </refsect3>
 
@@ -638,7 +642,12 @@ Parameters take the for "parameter=value".  Common options include:</para>
 
 <para>Update en existing group entry</para>
 
-<para>net groupmap modify {ntgroup=string|sid=SID} [unixgroup=string] [comment=string] [type={domain|local}]</para>
+<para>
+<screen>
+net groupmap modify {ntgroup=string|sid=SID} [unixgroup=string] \
+       [comment=string] [type={domain|local}]
+</screen>
+</para>
 </refsect3>
 
 <refsect3>
diff --git a/docs/manpages-3/pdbedit.8.xml b/docs/manpages-3/pdbedit.8.xml
index 84dffe67da..bb88fa891c 100644
--- a/docs/manpages-3/pdbedit.8.xml
+++ b/docs/manpages-3/pdbedit.8.xml
@@ -122,8 +122,12 @@ Profile Path:   \\BERSERKER\profile
 
 		<para>Example: <command>pdbedit -L -w</command></para>
 		<screen>
-sorce:500:508818B733CE64BEAAD3B435B51404EE:D2A2418EFC466A8A0F6B1DBB5C3DB80C:[UX         ]:LCT-00000000:
-samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:BC281CE3F53B6A5146629CD4751D3490:[UX         ]:LCT-3BFA1E8D:
+sorce:500:508818B733CE64BEAAD3B435B51404EE:
+          D2A2418EFC466A8A0F6B1DBB5C3DB80C:
+          [UX         ]:LCT-00000000:
+samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
+          BC281CE3F53B6A5146629CD4751D3490:
+          [UX         ]:LCT-3BFA1E8D:
 </screen>
 		</listitem>
 		</varlistentry>
diff --git a/docs/smbdotconf/filename/hidefiles.xml b/docs/smbdotconf/filename/hidefiles.xml
index 9246e8e119..461df419f1 100644
--- a/docs/smbdotconf/filename/hidefiles.xml
+++ b/docs/smbdotconf/filename/hidefiles.xml
@@ -21,6 +21,12 @@
 	<para>Setting this parameter will affect the performance of Samba, 
 	as it will be forced to check all files and directories for a match 
 	as they are scanned.</para>
+
+	<para>
+	The example shown above is based on files that the Macintosh 
+	SMB client (DAVE) available from <ulink url="http://www.thursby.com"> 
+	Thursby</ulink> creates for internal use, and also still hides 
+	all files beginning with a dot.</para>
 </description>
 
 <related>hide dot files</related>
@@ -28,10 +34,7 @@
 <related>case sensitive</related>
 
 <value type="default"><comment>no file are hidden</comment></value>
-<value type="example">/.*/DesktopFolderDB/TrashFor%m/resource.frk/<comment>
-The above example is based on files that the Macintosh 
-SMB client (DAVE) available from <ulink url="http://www.thursby.com"> 
-Thursby</ulink> creates for internal use, and also still hides 
-all files beginning with a dot.</comment></value>
+
+<value type="example">/.*/DesktopFolderDB/TrashFor%m/resource.frk/</value>
 
 </samba:parameter>
diff --git a/docs/smbdotconf/printing/lprmcommand.xml b/docs/smbdotconf/printing/lprmcommand.xml
index 26342d7b07..3b2c20d478 100644
--- a/docs/smbdotconf/printing/lprmcommand.xml
+++ b/docs/smbdotconf/printing/lprmcommand.xml
@@ -21,7 +21,7 @@
 </description>
 <related>printing</related>
 
-<value type="default"><comment>depends on the setting of <parameter moreinfo="none">printing</parameter></comment></value>
+<value type="default">depends on the setting of <parameter moreinfo="none">printing</parameter></value>
 <value type="example">/usr/bin/lprm -P%p %j</value>
 <value type="example">/usr/bin/cancel %p-%j</value>
 </samba:parameter>
diff --git a/docs/smbdotconf/security/passdbbackend.xml b/docs/smbdotconf/security/passdbbackend.xml
index 523d98a521..d8fc6cd488 100644
--- a/docs/smbdotconf/security/passdbbackend.xml
+++ b/docs/smbdotconf/security/passdbbackend.xml
@@ -67,8 +67,12 @@
 </description>
 
 <value type="default">smbpasswd</value>
+
 <value type="example">tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd</value>
+
 <value type="example">ldapsam:ldaps://ldap.example.com</value>
+
 <value type="example">ldapsam:"ldap://ldap-1.example.com ldap://ldap-2.example.com"</value>
+
 <value type="example">mysql:my_plugin_args tdbsam</value>
 </samba:parameter>
diff --git a/docs/smbdotconf/tuning/keepalive.xml b/docs/smbdotconf/tuning/keepalive.xml
index 8eef0d0c5b..5648253478 100644
--- a/docs/smbdotconf/tuning/keepalive.xml
+++ b/docs/smbdotconf/tuning/keepalive.xml
@@ -11,7 +11,7 @@
     a client is still present and responding.</para>
 
     <para>Keepalives should, in general, not be needed if the socket 
-    being used has the SO_KEEPALIVE attribute set on it (see <link linkend="SOCKETOPTIONS">
+    has the SO_KEEPALIVE attribute set on it by default. (see <link linkend="SOCKETOPTIONS">
     <parameter moreinfo="none">socket options</parameter></link>). 
 Basically you should only use this option if you strike difficulties.</para>
 </description>