Formatting and other fixes to man pages.

(This used to be commit 411025ed0d6ba37ff00f4afc8ccdc9dae94b62e0)

6 files changed, 40 insertions, 36 deletions

diff --git a/docs/smbdotconf/ldap/ldapdeletedn.xml b/docs/smbdotconf/ldap/ldapdeletedn.xml
index 46f199cb52..48f5c9b65a 100644
--- a/docs/smbdotconf/ldap/ldapdeletedn.xml
+++ b/docs/smbdotconf/ldap/ldapdeletedn.xml
@@ -7,7 +7,7 @@
 	<para> This parameter specifies whether a delete
 	operation in the ldapsam deletes the complete entry or only the attributes
 	specific to Samba.
-</para>
+	</para>
 </description>
 
 <value type="default">no</value>
diff --git a/docs/smbdotconf/ldap/ldapidmapsuffix.xml b/docs/smbdotconf/ldap/ldapidmapsuffix.xml
index f3bbc10ade..e397138741 100644
--- a/docs/smbdotconf/ldap/ldapidmapsuffix.xml
+++ b/docs/smbdotconf/ldap/ldapidmapsuffix.xml
@@ -4,11 +4,11 @@
 		 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-	<para>This parameters specifies the suffix that is 
-	used when storing idmap mappings. If this parameter 
-	is unset, the value of <smbconfoption name="ldap suffix"/>
-	will be used instead.  The suffix string is pre-pended to the
-	<smbconfoption name="ldap suffix"/> string so use a partial DN.</para>
+	<para>
+	This parameters specifies the suffix that is used when storing idmap mappings. If this parameter 
+	is unset, the value of <smbconfoption name="ldap suffix"/> will be used instead.  The suffix 
+	string is pre-pended to the <smbconfoption name="ldap suffix"/> string so use a partial DN.
+	</para>
 </description>
 <value type="default"></value>
 <value type="example">ou=Idmap</value>
diff --git a/docs/smbdotconf/ldap/ldapport.xml b/docs/smbdotconf/ldap/ldapport.xml
index 8895c15c7f..ad77b78857 100644
--- a/docs/smbdotconf/ldap/ldapport.xml
+++ b/docs/smbdotconf/ldap/ldapport.xml
@@ -3,13 +3,15 @@
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-	<para>This parameter is only available if Samba has been
-	configure to include the <command moreinfo="none">--with-ldapsam</command> option
-	at compile time.</para>
+	<para>
+	This parameter is only available if Samba has been configure to include the 
+	<command moreinfo="none">--with-ldapsam</command> option at compile time.
+	</para>
 
-	<para>This option is used to control the tcp port number used to contact
-		the <smbconfoption name="ldap server"/>.
-	The default is to use the stand LDAPS port 636.</para>
+	<para>
+	This option is used to control the tcp port number used to contact the 
+	<smbconfoption name="ldap server"/>. The default is to use the stand LDAPS port 636.
+	</para>
 </description>
 <related>ldap ssl</related>
 <value type="default">636<comment>if ldap ssl = on</comment></value>
diff --git a/docs/smbdotconf/ldap/ldapreplicationsleep.xml b/docs/smbdotconf/ldap/ldapreplicationsleep.xml
index b1a24d2af8..4710e2b3b3 100644
--- a/docs/smbdotconf/ldap/ldapreplicationsleep.xml
+++ b/docs/smbdotconf/ldap/ldapreplicationsleep.xml
@@ -4,20 +4,22 @@
 				 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-	<para>When Samba is asked to write to a read-only LDAP
-replica, we are redirected to talk to the read-write master server.
-This server then replicates our changes back to the 'local' server,
-however the replication might take some seconds, especially over slow
-links.  Certain client activities, particularly domain joins, can become
-confused by the 'success' that does not immediately change the LDAP
-back-end's data.  </para>
-        <para>This option simply causes Samba to wait a short time, to
-allow the LDAP server to catch up.  If you have a particularly
-high-latency network, you may wish to time the LDAP replication with a
-network sniffer, and increase this value accordingly.  Be aware that no
-checking is performed that the data has actually replicated.</para>
-        <para>The value is specified in milliseconds, the maximum
-value is 5000 (5 seconds).</para>
+	<para>
+	When Samba is asked to write to a read-only LDAP replica, we are redirected to talk to the read-write master server.
+	This server then replicates our changes back to the 'local' server, however the replication might take some seconds, 
+	especially over slow links.  Certain client activities, particularly domain joins, can become confused by the 'success' 
+	that does not immediately change the LDAP back-end's data.
+	</para>
+        
+	<para>
+	This option simply causes Samba to wait a short time, to allow the LDAP server to catch up.  If you have a particularly
+	high-latency network, you may wish to time the LDAP replication with a network sniffer, and increase this value accordingly.  
+	Be aware that no checking is performed that the data has actually replicated.
+	</para>
+	
+        <para>
+	The value is specified in milliseconds, the maximum value is 5000 (5 seconds).
+	</para>
 </description>
 <value type="default">1000</value>
 </samba:parameter>
diff --git a/docs/smbdotconf/ldap/ldaptimeout.xml b/docs/smbdotconf/ldap/ldaptimeout.xml
index 73ec5f7212..cd88494903 100644
--- a/docs/smbdotconf/ldap/ldaptimeout.xml
+++ b/docs/smbdotconf/ldap/ldaptimeout.xml
@@ -4,12 +4,11 @@
 				 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-	<para>When Samba connects to an ldap server that server
-may be down or unreachable. To prevent Samba from hanging whilst
-waiting for the connection this parameter specifies in seconds how
-long Samba should wait before failing the connect. The default is
-to only wait fifteen seconds for the ldap server to respond to the
-connect request.</para>
+	<para>
+	When Samba connects to an ldap server that servermay be down or unreachable. To prevent Samba from hanging whilst
+	waiting for the connection this parameter specifies in seconds how long Samba should wait before failing the 
+	connect. The default is to only wait fifteen seconds for the ldap server to respond to the connect request.
+	</para>
 </description>
 <value type="default">15</value>
 </samba:parameter>
diff --git a/docs/smbdotconf/ldap/ldapusersuffix.xml b/docs/smbdotconf/ldap/ldapusersuffix.xml
index b97cd07094..6b4eec378d 100644
--- a/docs/smbdotconf/ldap/ldapusersuffix.xml
+++ b/docs/smbdotconf/ldap/ldapusersuffix.xml
@@ -4,10 +4,11 @@
 	advanced="1" developer="1"
         xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-	<para>This parameter specifies where users are added to the tree. 
-        If this parameter is unset, the value of <smbconfoption
-        name="ldap suffix"/> will be used instead.  The suffix string is pre-pended to the
-        <smbconfoption name="ldap suffix"/> string so use a partial DN.</para>
+	<para>
+	This parameter specifies where users are added to the tree. If this parameter is unset, 
+	the value of <smbconfoption name="ldap suffix"/> will be used instead.  The suffix 
+	string is pre-pended to the  <smbconfoption name="ldap suffix"/> string so use a partial DN.
+	</para>
 
 </description>
 <value type="default"/>