Minor typos. No, not merged to all branches...

(This used to be commit 47ad635d5debdfab9fc065ebfcf5c40ad5b82101)

diff --git a/docs/docbook/projdoc/upgrading-to-3.0.xml b/docs/docbook/projdoc/upgrading-to-3.0.xml
index 6556d847534bc1b7d29df962beb123f7b9c5e654..cb49f5d95d44a91eb37962ad319d1f576ccc9ac5 100644 (file)
--- a/docs/docbook/projdoc/upgrading-to-3.0.xml
+++ b/docs/docbook/projdoc/upgrading-to-3.0.xml
@@ -279,7 +279,7 @@ complete descriptions of new or modified parameters.
 
 <itemizedlist>
        <listitem><para>preload modules </para></listitem>
-       <listitem><para>privatedir </para></listitem>
+       <listitem><para>private dir </para></listitem>
 </itemizedlist>
 
 </sect2>

diff --git a/docs/docbook/smbdotconf/logon/abortshutdownscript.xml b/docs/docbook/smbdotconf/logon/abortshutdownscript.xml
index e9a7dba7925fbed924df870a6c7813964eb051fd..fcabd33cebfd7fe29ad978ece4fc7a2a055bb276 100644 (file)
--- a/docs/docbook/smbdotconf/logon/abortshutdownscript.xml
+++ b/docs/docbook/smbdotconf/logon/abortshutdownscript.xml
@@ -3,13 +3,13 @@
                  advanced="1" developer="1"
                  xmlns:samba="http://samba.org/common">
 <listitem>
-       <para><emphasis>This parameter only exists in the HEAD cvs branch</emphasis>
+       <para>
        This a full path name to a script called by <citerefentry><refentrytitle>smbd</refentrytitle>
        <manvolnum>8</manvolnum></citerefentry> that
        should stop a shutdown procedure issued by the <link linkend="SHUTDOWNSCRIPT">
        <parameter moreinfo="none">shutdown script</parameter></link>.</para>
                
-       <para>This command will be run as user.</para>
+       <para>This command will be run as the user connected to the server.</para>
 
        <para>Default: <emphasis>None</emphasis>.</para>
 

diff --git a/docs/docbook/smbdotconf/logon/shutdownscript.xml b/docs/docbook/smbdotconf/logon/shutdownscript.xml
index 8935714307eb314b399d7a16160532706185e9bf..2cbf522586a53ff9f2cc34d6a37133b2983ae5d1 100644 (file)
--- a/docs/docbook/smbdotconf/logon/shutdownscript.xml
+++ b/docs/docbook/smbdotconf/logon/shutdownscript.xml
@@ -3,7 +3,7 @@
                  advanced="1" developer="1"
                  xmlns:samba="http://samba.org/common">
 <listitem>
-       <para><emphasis>This parameter only exists in the HEAD cvs branch</emphasis>
+       <para>
        This a full path name to a script called by <citerefentry><refentrytitle>smbd</refentrytitle>                                                    
         <manvolnum>8</manvolnum></citerefentry> that should start a shutdown procedure.</para>
 

diff --git a/docs/docbook/smbdotconf/security/privatedir.xml b/docs/docbook/smbdotconf/security/privatedir.xml
index 1fc7eb0b36aed8c18bb68dac13c11b6215aec276..3529de34ca8045636452dd0333417c7574efe503 100644 (file)
--- a/docs/docbook/smbdotconf/security/privatedir.xml
+++ b/docs/docbook/smbdotconf/security/privatedir.xml
@@ -8,6 +8,6 @@
     and <filename moreinfo="none">secrets.tdb</filename>.
     </para>
                                
-    <para>Default :<command moreinfo="none">private dir = ${prefix}/private</command></para>
+    <para>Default: <command moreinfo="none">private dir = ${prefix}/private</command></para>
 </listitem>
 </samba:parameter>

diff --git a/docs/docbook/smbdotconf/security/serversigning.xml b/docs/docbook/smbdotconf/security/serversigning.xml
index 5108918d84f5eba3dfc3a15e4d5c83343c21678d..27277f73bfb56f82e7a4b272d198e1ea1b0c7423 100644 (file)
--- a/docs/docbook/smbdotconf/security/serversigning.xml
+++ b/docs/docbook/smbdotconf/security/serversigning.xml
@@ -14,6 +14,6 @@
     When set to mandatory, SMB signing is required and if set 
     to disabled, SMB signing is not offered either.</para>
 
-    <para>Default: <command>client signing = False</command></para>
+    <para>Default: <command>server signing = False</command></para>
 </listitem>
 </samba:parameter>