summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/docbook/projdoc/upgrading-to-3.0.xml2
-rw-r--r--docs/docbook/smbdotconf/logon/abortshutdownscript.xml4
-rw-r--r--docs/docbook/smbdotconf/logon/shutdownscript.xml2
-rw-r--r--docs/docbook/smbdotconf/security/privatedir.xml2
-rw-r--r--docs/docbook/smbdotconf/security/serversigning.xml2
5 files changed, 6 insertions, 6 deletions
diff --git a/docs/docbook/projdoc/upgrading-to-3.0.xml b/docs/docbook/projdoc/upgrading-to-3.0.xml
index 6556d847534..cb49f5d95d4 100644
--- 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 e9a7dba7925..fcabd33cebf 100644
--- 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 8935714307e..2cbf522586a 100644
--- 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 1fc7eb0b36a..3529de34ca8 100644
--- 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 5108918d84f..27277f73bfb 100644
--- 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>