Better compatibility with official syntax

(This used to be commit 12eea1a70b0c8331aabc09e5ae464d7863de6240)

5 files changed, 10 insertions, 25 deletions

diff --git a/docs/docbook/smbdotconf/security/allowtrusteddomains.xml b/docs/docbook/smbdotconf/security/allowtrusteddomains.xml
index 63363d2607..8354f8b8da 100644
--- a/docs/docbook/smbdotconf/security/allowtrusteddomains.xml
+++ b/docs/docbook/smbdotconf/security/allowtrusteddomains.xml
@@ -7,7 +7,7 @@
     <parameter moreinfo="none">security</parameter></link> option is set to 
     <constant>server</constant> or <constant>domain</constant>.  
     If it is set to no, then attempts to connect to a resource from 
-    a domain or workgroup other than the one which <ulink url="smbd.8.html">smbd</ulink> is running 
+    a domain or workgroup other than the one which smbd is running 
     in will fail, even if that domain is trusted by the remote server 
     doing the authentication.</para>
 		
diff --git a/docs/docbook/smbdotconf/security/guestaccount.xml b/docs/docbook/smbdotconf/security/guestaccount.xml
index f9192748f9..9db3b6362d 100644
--- a/docs/docbook/smbdotconf/security/guestaccount.xml
+++ b/docs/docbook/smbdotconf/security/guestaccount.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="guest account"
-                 context="G"
+                 context="G,S"
                  basic="1" advanced="1" developer="1"
 		 xmlns:samba="http://samba.org/common">
 <listitem>
@@ -13,7 +13,7 @@
     the specified username overrides this one.
     </para>
 
-    <para>On some systems the default guest account &quot;nobody&quot; may not 
+    <para>One some systems the default guest account &quot;nobody&quot; may not 
     be able to print. Use another account in this case. You should test 
     this by trying to log in as your guest user (perhaps by using the 
     <command moreinfo="none">su -</command> command) and trying to print using the 
diff --git a/docs/docbook/smbdotconf/security/passdbbackend.xml b/docs/docbook/smbdotconf/security/passdbbackend.xml
index 1a3a83946a..8c64299dd4 100644
--- a/docs/docbook/smbdotconf/security/passdbbackend.xml
+++ b/docs/docbook/smbdotconf/security/passdbbackend.xml
@@ -55,22 +55,15 @@
 		details.
 		</para></listitem>
 
-		<listitem>
-		<para><command moreinfo="none">guest</command> - 
-		Very simple backend that only provides one user: the guest user.
-		Only maps the NT guest user to the <parameter>guest account</parameter>.
-		Required in pretty much all situations.
-		</para></listitem>
-
 	</itemizedlist>
     </para>
 
     <para>Default: <command moreinfo="none">passdb backend = smbpasswd</command></para>
 
-    <para>Example: <command moreinfo="none">passdb backend = tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd guest</command></para>
+    <para>Example: <command moreinfo="none">passdb backend = tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd</command></para>
 
-	<para>Example: <command moreinfo="none">passdb backend = ldapsam:ldaps://ldap.example.com guest</command></para>
+	<para>Example: <command moreinfo="none">passdb backend = ldapsam:ldaps://ldap.example.com</command></para>
 
-    <para>Example: <command moreinfo="none">passdb backend = mysql:my_plugin_args tdbsam:/etc/samba/private/passdb.tdb guest</command></para>
+    <para>Example: <command moreinfo="none">passdb backend = mysql:my_plugin_args tdbsam</command></para>
 </listitem>
 </samba:parameter>
diff --git a/docs/docbook/smbdotconf/security/passwdprogram.xml b/docs/docbook/smbdotconf/security/passwdprogram.xml
index 22235322c8..db02670158 100644
--- a/docs/docbook/smbdotconf/security/passwdprogram.xml
+++ b/docs/docbook/smbdotconf/security/passwdprogram.xml
@@ -17,9 +17,8 @@
     <para><emphasis>Note</emphasis> that if the <parameter moreinfo="none">unix 
     password sync</parameter> parameter is set to <constant>yes
     </constant> then this program is called <emphasis>AS ROOT</emphasis> 
-    before the SMB password in the <ulink url="smbpasswd.5.html"><citerefentry>
-    <refentrytitle>smbpasswd</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-    </ulink> file is changed. If this UNIX password change fails, then 
+    before the SMB password in the smbpasswd
+    file is changed. If this UNIX password change fails, then 
     <command moreinfo="none">smbd</command> will fail to change the SMB password also 
     (this is by design).</para>
 
@@ -29,13 +28,6 @@
     for security implications. Note that by default <parameter moreinfo="none">unix 
     password sync</parameter> is set to <constant>no</constant>.</para>
 
-    <para>Not that this program is only invoked when a password change is
-    done via the smbd program, not when smbpasswd is used locally as root to
-    change a password. This means that you cannot run "smbpasswd USERNAME" as
-    root on the SMB server in order to test this parameter, but should run the
-    command "smbpasswd -r SMBMACHINE" as a non-root user instead if you want
-    to test the invocation of this program.</para>
-
     <para>See also <link linkend="UNIXPASSWORDSYNC"><parameter moreinfo="none">unix 
     password sync</parameter></link>.</para>
 
diff --git a/docs/docbook/smbdotconf/security/security.xml b/docs/docbook/smbdotconf/security/security.xml
index 389e8dd009..030abc1de1 100644
--- a/docs/docbook/smbdotconf/security/security.xml
+++ b/docs/docbook/smbdotconf/security/security.xml
@@ -19,8 +19,8 @@
     Windows NT.</para>
 
     <para>The alternatives are <command moreinfo="none">security = share</command>,
-	    <command moreinfo="none">security = server</command>, <command moreinfo="none">security = domain
-    </command>, or <command moreinfo="none">security = ads</command>.</para>
+    <command moreinfo="none">security = server</command> or <command moreinfo="none">security = domain
+    </command>.</para>
 
     <para>In versions of Samba prior to 2.0.0, the default was 
     <command moreinfo="none">security = share</command> mainly because that was