diff --git a/docs/docbook/smbdotconf/domain/machinepasswordtimeout.xml b/docs/docbook/smbdotconf/domain/machinepasswordtimeout.xml
index 14e6d9c5df2..06017fce595 100644
--- a/docs/docbook/smbdotconf/domain/machinepasswordtimeout.xml
+++ b/docs/docbook/smbdotconf/domain/machinepasswordtimeout.xml
@@ -1,18 +1,21 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="MACHINEPASSWORDTIMEOUT"/>machine password timeout (G)</term>
-		<listitem><para>If a Samba server is a member of a Windows 
-		NT Domain (see the <link linkend="SECURITYEQUALSDOMAIN">security = domain</link>) 
-		parameter) then periodically a running <ulink url="smbd.8.html">
-		smbd(8)</ulink> process will try and change the MACHINE ACCOUNT 
-		PASSWORD stored in the TDB called <filename moreinfo="none">private/secrets.tdb
-		</filename>.  This parameter specifies how often this password 
-		will be changed, in seconds. The default is one week (expressed in 
-		seconds), the same as a Windows NT Domain member server.</para>
+<samba:parameter name="machine password timeout"
+                 context="G"
+                 advanced="1" developer="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>If a Samba server is a member of a Windows 
+	NT Domain (see the <link linkend="SECURITYEQUALSDOMAIN">security = domain</link>) 
+	parameter) then periodically a running <ulink url="smbd.8.html">
+	smbd(8)</ulink> process will try and change the MACHINE ACCOUNT 
+	PASSWORD stored in the TDB called <filename moreinfo="none">private/secrets.tdb
+	</filename>.  This parameter specifies how often this password 
+	will be changed, in seconds. The default is one week (expressed in 
+	seconds), the same as a Windows NT Domain member server.</para>
 
-		<para>See also <citerefentry><refentrytitle>smbpasswd</refentrytitle>
-		<manvolnum>8</manvolnum></citerefentry>, and the <link linkend="SECURITYEQUALSDOMAIN">
-		security = domain</link>) parameter.</para>
+	<para>See also <citerefentry><refentrytitle>smbpasswd</refentrytitle>
+	<manvolnum>8</manvolnum></citerefentry>, and the <link linkend="SECURITYEQUALSDOMAIN">
+	security = domain</link>) parameter.</para>
 
-		<para>Default: <command moreinfo="none">machine password timeout = 604800</command></para>
-		</listitem>
-		</samba:parameter>
+	<para>Default: <command moreinfo="none">machine password timeout = 604800</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/enumportscommand.xml b/docs/docbook/smbdotconf/printing/enumportscommand.xml
index 89e510483f6..7cdf0cc370f 100644
--- a/docs/docbook/smbdotconf/printing/enumportscommand.xml
+++ b/docs/docbook/smbdotconf/printing/enumportscommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="enumports command"
                  context="G"
-		 advanced="1" developer="1'
+		 advanced="1" developer="1"
                  xmlns:samba="http://samba.org/common">
 <listitem>
     <para>The concept of a &quot;port&quot; is fairly foreign
diff --git a/docs/docbook/smbdotconf/printing/printing.xml b/docs/docbook/smbdotconf/printing/printing.xml
index 4e9caa9b547..633666eea7a 100644
--- a/docs/docbook/smbdotconf/printing/printing.xml
+++ b/docs/docbook/smbdotconf/printing/printing.xml
@@ -5,7 +5,7 @@
 <listitem>
     <para>This parameters controls how printer status  information is
     interpreted on your system. It also affects the  default values for
-    the <parameter moreinfo="none">print command</parameter>,  parameter
+    the <parameter moreinfo="none">print command</parameter>,  <parameter
     moreinfo="none">lpq command</parameter>, <parameter
     moreinfo="none">lppause command </parameter>, <parameter
     moreinfo="none">lpresume command</parameter>, and  <parameter