summaryrefslogtreecommitdiff
path: root/docs/docbook/smbdotconf/protocol
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2003-04-06 22:14:01 +0000
committerAlexander Bokovoy <ab@samba.org>2003-04-06 22:14:01 +0000
commitc29eb90444170953721b087f8d26b4a3b98b3fe8 (patch)
tree257b1ee9b093a057b81e289fd511b992cc518642 /docs/docbook/smbdotconf/protocol
parent27aef6855f1543547b8190f06fd264d1b52a558d (diff)
downloadsamba-c29eb90444170953721b087f8d26b4a3b98b3fe8.tar.gz
samba-c29eb90444170953721b087f8d26b4a3b98b3fe8.tar.bz2
samba-c29eb90444170953721b087f8d26b4a3b98b3fe8.zip
Convert more parameters to new smb.conf(5) style. Document found occurences of non-documented parameters in doc-status
(This used to be commit 3a9784d8b2318af4d9b349edd1aba4065d25da23)
Diffstat (limited to 'docs/docbook/smbdotconf/protocol')
-rw-r--r--docs/docbook/smbdotconf/protocol/announceas.xml37
-rw-r--r--docs/docbook/smbdotconf/protocol/announceversion.xml23
-rw-r--r--docs/docbook/smbdotconf/protocol/disablenetbios.xml28
-rw-r--r--docs/docbook/smbdotconf/protocol/largereadwrite.xml31
-rw-r--r--docs/docbook/smbdotconf/protocol/maxmux.xml19
-rw-r--r--docs/docbook/smbdotconf/protocol/maxprotocol.xml67
-rw-r--r--docs/docbook/smbdotconf/protocol/maxttl.xml24
-rw-r--r--docs/docbook/smbdotconf/protocol/maxwinsttl.xml29
-rw-r--r--docs/docbook/smbdotconf/protocol/maxxmit.xml26
-rw-r--r--docs/docbook/smbdotconf/protocol/minprotocol.xml39
-rw-r--r--docs/docbook/smbdotconf/protocol/minwinsttl.xml27
-rw-r--r--docs/docbook/smbdotconf/protocol/nameresolveorder.xml105
-rw-r--r--docs/docbook/smbdotconf/protocol/ntaclsupport.xml23
-rw-r--r--docs/docbook/smbdotconf/protocol/ntpipesupport.xml25
-rw-r--r--docs/docbook/smbdotconf/protocol/ntstatussupport.xml27
-rw-r--r--docs/docbook/smbdotconf/protocol/protocol.xml14
-rw-r--r--docs/docbook/smbdotconf/protocol/readbmpx.xml23
-rw-r--r--docs/docbook/smbdotconf/protocol/readraw.xml37
-rw-r--r--docs/docbook/smbdotconf/protocol/smbports.xml18
-rw-r--r--docs/docbook/smbdotconf/protocol/timeserver.xml19
-rw-r--r--docs/docbook/smbdotconf/protocol/unicode.xml22
-rw-r--r--docs/docbook/smbdotconf/protocol/unixextensions.xml25
-rw-r--r--docs/docbook/smbdotconf/protocol/usespnego.xml26
-rw-r--r--docs/docbook/smbdotconf/protocol/writeraw.xml19
24 files changed, 412 insertions, 321 deletions
diff --git a/docs/docbook/smbdotconf/protocol/announceas.xml b/docs/docbook/smbdotconf/protocol/announceas.xml
index 1f3169609c..b063fcc1b7 100644
--- a/docs/docbook/smbdotconf/protocol/announceas.xml
+++ b/docs/docbook/smbdotconf/protocol/announceas.xml
@@ -1,18 +1,21 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="ANNOUNCEAS"/>announce as (G)</term>
- <listitem><para>This specifies what type of server <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> will announce itself as, to a network neighborhood browse
- list. By default this is set to Windows NT. The valid options
- are : &quot;NT Server&quot; (which can also be written as &quot;NT&quot;),
- &quot;NT Workstation&quot;, &quot;Win95&quot; or &quot;WfW&quot; meaning Windows NT Server,
- Windows NT Workstation, Windows 95 and Windows for Workgroups
- respectively. Do not change this parameter unless you have a
- specific need to stop Samba appearing as an NT server as this
- may prevent Samba servers from participating as browser servers
- correctly.</para>
+<samba:parameter name="announce as"
+ context="G"
+ developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This specifies what type of server <citerefentry><refentrytitle>nmbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry> will announce itself as, to a network neighborhood browse
+ list. By default this is set to Windows NT. The valid options
+ are : &quot;NT Server&quot; (which can also be written as &quot;NT&quot;),
+ &quot;NT Workstation&quot;, &quot;Win95&quot; or &quot;WfW&quot; meaning Windows NT Server,
+ Windows NT Workstation, Windows 95 and Windows for Workgroups
+ respectively. Do not change this parameter unless you have a
+ specific need to stop Samba appearing as an NT server as this
+ may prevent Samba servers from participating as browser servers
+ correctly.</para>
- <para>Default: <command moreinfo="none">announce as = NT Server</command></para>
-
- <para>Example: <command moreinfo="none">announce as = Win95</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">announce as = NT Server</command></para>
+
+ <para>Example: <command moreinfo="none">announce as = Win95</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/announceversion.xml b/docs/docbook/smbdotconf/protocol/announceversion.xml
index 03ad429dbd..217004b5fc 100644
--- a/docs/docbook/smbdotconf/protocol/announceversion.xml
+++ b/docs/docbook/smbdotconf/protocol/announceversion.xml
@@ -1,12 +1,15 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="ANNOUNCEVERSION"/>announce version (G)</term>
- <listitem><para>This specifies the major and minor version numbers
- that nmbd will use when announcing itself as a server. The default
- is 4.9. Do not change this parameter unless you have a specific
- need to set a Samba server to be a downlevel server.</para>
+<samba:parameter name="announce version"
+ context="G"
+ developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This specifies the major and minor version numbers
+ that nmbd will use when announcing itself as a server. The default
+ is 4.9. Do not change this parameter unless you have a specific
+ need to set a Samba server to be a downlevel server.</para>
- <para>Default: <command moreinfo="none">announce version = 4.9</command></para>
+ <para>Default: <command moreinfo="none">announce version = 4.9</command></para>
- <para>Example: <command moreinfo="none">announce version = 2.0</command></para>
- </listitem>
- </samba:parameter>
+ <para>Example: <command moreinfo="none">announce version = 2.0</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/disablenetbios.xml b/docs/docbook/smbdotconf/protocol/disablenetbios.xml
index ac97cdf7c3..2fe92d00b7 100644
--- a/docs/docbook/smbdotconf/protocol/disablenetbios.xml
+++ b/docs/docbook/smbdotconf/protocol/disablenetbios.xml
@@ -1,14 +1,18 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="DISABLENETBIOS"/>disable netbios (G)</term>
- <listitem><para>Enabling this parameter will disable netbios support
- in Samba. Netbios is the only available form of browsing in
- all windows versions except for 2000 and XP. </para>
+<samba:parameter name="disable netbios"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>Enabling this parameter will disable netbios support
+ in Samba. Netbios is the only available form of browsing in
+ all windows versions except for 2000 and XP. </para>
- <para>Note that clients that only support netbios won't be able to
- see your samba server when netbios support is disabled.
- </para>
+ <note><para>Note that clients that only support netbios won't be able to
+ see your samba server when netbios support is disabled.
+ </para></note>
- <para>Default: <command moreinfo="none">disable netbios = no</command></para>
- <para>Example: <command moreinfo="none">disable netbios = yes</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">disable netbios = no</command></para>
+
+ <para>Example: <command moreinfo="none">disable netbios = yes</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/largereadwrite.xml b/docs/docbook/smbdotconf/protocol/largereadwrite.xml
index 9aa28593e6..25c58899c4 100644
--- a/docs/docbook/smbdotconf/protocol/largereadwrite.xml
+++ b/docs/docbook/smbdotconf/protocol/largereadwrite.xml
@@ -1,15 +1,18 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="LARGEREADWRITE"/>large readwrite (G)</term>
- <listitem><para>This parameter determines whether or not <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> supports the new 64k streaming
- read and write varient SMB requests introduced
- with Windows 2000. Note that due to Windows 2000 client redirector bugs
- this requires Samba to be running on a 64-bit capable operating system such
- as IRIX, Solaris or a Linux 2.4 kernel. Can improve performance by 10% with
- Windows 2000 clients. Defaults to on. Not as tested as some other Samba
- code paths.
- </para>
+<samba:parameter name="large readwrite"
+ context="G"
+ developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This parameter determines whether or not
+ <citerefentry><refentrytitle>smbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry> supports the new 64k
+ streaming read and write varient SMB requests introduced with
+ Windows 2000. Note that due to Windows 2000 client redirector bugs
+ this requires Samba to be running on a 64-bit capable operating
+ system such as IRIX, Solaris or a Linux 2.4 kernel. Can improve
+ performance by 10% with Windows 2000 clients. Defaults to on. Not as
+ tested as some other Samba code paths.</para>
- <para>Default : <command moreinfo="none">large readwrite = yes</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">large readwrite = yes</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/maxmux.xml b/docs/docbook/smbdotconf/protocol/maxmux.xml
index 51296e0747..c05487fdca 100644
--- a/docs/docbook/smbdotconf/protocol/maxmux.xml
+++ b/docs/docbook/smbdotconf/protocol/maxmux.xml
@@ -1,9 +1,12 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="MAXMUX"/>max mux (G)</term>
- <listitem><para>This option controls the maximum number of
- outstanding simultaneous SMB operations that Samba tells the client
- it will allow. You should never need to set this parameter.</para>
+<samba:parameter name="max mux"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This option controls the maximum number of
+ outstanding simultaneous SMB operations that Samba tells the client
+ it will allow. You should never need to set this parameter.</para>
- <para>Default: <command moreinfo="none">max mux = 50</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">max mux = 50</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/maxprotocol.xml b/docs/docbook/smbdotconf/protocol/maxprotocol.xml
index be859f8ee3..3f4e917828 100644
--- a/docs/docbook/smbdotconf/protocol/maxprotocol.xml
+++ b/docs/docbook/smbdotconf/protocol/maxprotocol.xml
@@ -1,35 +1,48 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="MAXPROTOCOL"/>max protocol (G)</term>
- <listitem><para>The value of the parameter (a string) is the highest
- protocol level that will be supported by the server.</para>
+<samba:parameter name="max protocol"
+ context="G"
+ developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>The value of the parameter (a string) is the highest
+ protocol level that will be supported by the server.</para>
- <para>Possible values are :</para>
- <itemizedlist>
- <listitem><para><constant>CORE</constant>: Earliest version. No
- concept of user names.</para></listitem>
+ <para>Possible values are :</para>
+ <itemizedlist>
+ <listitem>
+ <para><constant>CORE</constant>: Earliest version. No
+ concept of user names.</para>
+ </listitem>
- <listitem><para><constant>COREPLUS</constant>: Slight improvements on
- CORE for efficiency.</para></listitem>
+ <listitem>
+ <para><constant>COREPLUS</constant>: Slight improvements on
+ CORE for efficiency.</para>
+ </listitem>
- <listitem><para><constant>LANMAN1</constant>: First <emphasis>
- modern</emphasis> version of the protocol. Long filename
- support.</para></listitem>
+ <listitem>
+ <para><constant>LANMAN1</constant>: First <emphasis>
+ modern</emphasis> version of the protocol. Long filename
+ support.</para>
+ </listitem>
- <listitem><para><constant>LANMAN2</constant>: Updates to Lanman1 protocol.
- </para></listitem>
+ <listitem>
+ <para><constant>LANMAN2</constant>: Updates to Lanman1 protocol.</para>
+ </listitem>
- <listitem><para><constant>NT1</constant>: Current up to date version of
- the protocol. Used by Windows NT. Known as CIFS.</para></listitem>
- </itemizedlist>
+ <listitem>
+ <para><constant>NT1</constant>: Current up to date version of the protocol.
+ Used by Windows NT. Known as CIFS.</para>
+ </listitem>
+ </itemizedlist>
- <para>Normally this option should not be set as the automatic
- negotiation phase in the SMB protocol takes care of choosing
- the appropriate protocol.</para>
+ <para>Normally this option should not be set as the automatic
+ negotiation phase in the SMB protocol takes care of choosing
+ the appropriate protocol.</para>
- <para>See also <link linkend="MINPROTOCOL"><parameter moreinfo="none">min
- protocol</parameter></link></para>
+ <para>See also <link linkend="MINPROTOCOL"><parameter moreinfo="none">min
+ protocol</parameter></link></para>
- <para>Default: <command moreinfo="none">max protocol = NT1</command></para>
- <para>Example: <command moreinfo="none">max protocol = LANMAN1</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">max protocol = NT1</command></para>
+
+ <para>Example: <command moreinfo="none">max protocol = LANMAN1</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/maxttl.xml b/docs/docbook/smbdotconf/protocol/maxttl.xml
index 04c6771308..63c2b57ad7 100644
--- a/docs/docbook/smbdotconf/protocol/maxttl.xml
+++ b/docs/docbook/smbdotconf/protocol/maxttl.xml
@@ -1,12 +1,14 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="MAXTTL"/>max ttl (G)</term>
- <listitem><para>This option tells <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>
- what the default 'time to live' of NetBIOS names should be (in seconds)
- when <command moreinfo="none">nmbd</command> is requesting a name using either a
- broadcast packet or from a WINS server. You should never need to
- change this parameter. The default is 3 days.</para>
+<samba:parameter name="max ttl"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This option tells <citerefentry><refentrytitle>nmbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry> what the default 'time to live'
+ of NetBIOS names should be (in seconds) when <command moreinfo="none">nmbd</command> is
+ requesting a name using either a broadcast packet or from a WINS server. You should
+ never need to change this parameter. The default is 3 days.</para>
- <para>Default: <command moreinfo="none">max ttl = 259200</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">max ttl = 259200</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/maxwinsttl.xml b/docs/docbook/smbdotconf/protocol/maxwinsttl.xml
index c8e2d9df8d..eafacc28fa 100644
--- a/docs/docbook/smbdotconf/protocol/maxwinsttl.xml
+++ b/docs/docbook/smbdotconf/protocol/maxwinsttl.xml
@@ -1,15 +1,18 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="MAXWINSTTL"/>max wins ttl (G)</term>
- <listitem><para>This option tells <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> when acting as a WINS server (<link linkend="WINSSUPPORT">
- <parameter moreinfo="none">wins support = yes</parameter></link>) what the maximum
- 'time to live' of NetBIOS names that <command moreinfo="none">nmbd</command>
- will grant will be (in seconds). You should never need to change this
- parameter. The default is 6 days (518400 seconds).</para>
+<samba:parameter name="max wins ttl"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This option tells <citerefentry><refentrytitle>smbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry> when acting as a WINS server (<link linkend="WINSSUPPORT">
+ <parameter moreinfo="none">wins support = yes</parameter></link>) what the maximum
+ 'time to live' of NetBIOS names that <command moreinfo="none">nmbd</command>
+ will grant will be (in seconds). You should never need to change this
+ parameter. The default is 6 days (518400 seconds).</para>
- <para>See also the <link linkend="MINWINSTTL"><parameter moreinfo="none">min
- wins ttl</parameter></link> parameter.</para>
+ <para>See also the <link linkend="MINWINSTTL"><parameter moreinfo="none">min
+ wins ttl</parameter></link> parameter.</para>
- <para>Default: <command moreinfo="none">max wins ttl = 518400</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">max wins ttl = 518400</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/maxxmit.xml b/docs/docbook/smbdotconf/protocol/maxxmit.xml
index c16cf47655..3125b8d3b9 100644
--- a/docs/docbook/smbdotconf/protocol/maxxmit.xml
+++ b/docs/docbook/smbdotconf/protocol/maxxmit.xml
@@ -1,12 +1,16 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="MAXXMIT"/>max xmit (G)</term>
- <listitem><para>This option controls the maximum packet size
- that will be negotiated by Samba. The default is 65535, which
- is the maximum. In some cases you may find you get better performance
- with a smaller value. A value below 2048 is likely to cause problems.
- </para>
+<samba:parameter name="max xmit"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This option controls the maximum packet size
+ that will be negotiated by Samba. The default is 65535, which
+ is the maximum. In some cases you may find you get better performance
+ with a smaller value. A value below 2048 is likely to cause problems.
+ </para>
- <para>Default: <command moreinfo="none">max xmit = 65535</command></para>
- <para>Example: <command moreinfo="none">max xmit = 8192</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">max xmit = 65535</command></para>
+
+ <para>Example: <command moreinfo="none">max xmit = 8192</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/minprotocol.xml b/docs/docbook/smbdotconf/protocol/minprotocol.xml
index 6b1d420a4b..f382701948 100644
--- a/docs/docbook/smbdotconf/protocol/minprotocol.xml
+++ b/docs/docbook/smbdotconf/protocol/minprotocol.xml
@@ -1,20 +1,23 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="MINPROTOCOL"/>min protocol (G)</term>
- <listitem><para>The value of the parameter (a string) is the
- lowest SMB protocol dialect than Samba will support. Please refer
- to the <link linkend="MAXPROTOCOL"><parameter moreinfo="none">max protocol</parameter></link>
- parameter for a list of valid protocol names and a brief description
- of each. You may also wish to refer to the C source code in
- <filename moreinfo="none">source/smbd/negprot.c</filename> for a listing of known protocol
- dialects supported by clients.</para>
+<samba:parameter name="min protocol"
+ context="G"
+ developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>The value of the parameter (a string) is the
+ lowest SMB protocol dialect than Samba will support. Please refer
+ to the <link linkend="MAXPROTOCOL"><parameter moreinfo="none">max protocol</parameter></link>
+ parameter for a list of valid protocol names and a brief description
+ of each. You may also wish to refer to the C source code in
+ <filename moreinfo="none">source/smbd/negprot.c</filename> for a listing of known protocol
+ dialects supported by clients.</para>
- <para>If you are viewing this parameter as a security measure, you should
- also refer to the <link linkend="LANMANAUTH"><parameter moreinfo="none">lanman
- auth</parameter></link> parameter. Otherwise, you should never need
- to change this parameter.</para>
+ <para>If you are viewing this parameter as a security measure, you should
+ also refer to the <link linkend="LANMANAUTH"><parameter moreinfo="none">lanman
+ auth</parameter></link> parameter. Otherwise, you should never need
+ to change this parameter.</para>
- <para>Default : <command moreinfo="none">min protocol = CORE</command></para>
- <para>Example : <command moreinfo="none">min protocol = NT1</command> # disable DOS
- clients</para>
- </listitem>
- </samba:parameter>
+ <para>Default : <command moreinfo="none">min protocol = CORE</command></para>
+
+ <para>Example : <command moreinfo="none">min protocol = NT1</command> # disable DOS clients</para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/minwinsttl.xml b/docs/docbook/smbdotconf/protocol/minwinsttl.xml
index e67c253f2e..8ad1a5600f 100644
--- a/docs/docbook/smbdotconf/protocol/minwinsttl.xml
+++ b/docs/docbook/smbdotconf/protocol/minwinsttl.xml
@@ -1,13 +1,16 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="MINWINSTTL"/>min wins ttl (G)</term>
- <listitem><para>This option tells <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>
- when acting as a WINS server (<link linkend="WINSSUPPORT"><parameter moreinfo="none">
- wins support = yes</parameter></link>) what the minimum 'time to live'
- of NetBIOS names that <command moreinfo="none">nmbd</command> will grant will be (in
- seconds). You should never need to change this parameter. The default
- is 6 hours (21600 seconds).</para>
+<samba:parameter name="min wins ttl"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This option tells <citerefentry><refentrytitle>nmbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>
+ when acting as a WINS server (<link linkend="WINSSUPPORT"><parameter moreinfo="none">
+ wins support = yes</parameter></link>) what the minimum 'time to live'
+ of NetBIOS names that <command moreinfo="none">nmbd</command> will grant will be (in
+ seconds). You should never need to change this parameter. The default
+ is 6 hours (21600 seconds).</para>
- <para>Default: <command moreinfo="none">min wins ttl = 21600</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">min wins ttl = 21600</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/nameresolveorder.xml b/docs/docbook/smbdotconf/protocol/nameresolveorder.xml
index a5dd893902..897d04ad1c 100644
--- a/docs/docbook/smbdotconf/protocol/nameresolveorder.xml
+++ b/docs/docbook/smbdotconf/protocol/nameresolveorder.xml
@@ -1,47 +1,58 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="NAMERESOLVEORDER"/>name resolve order (G)</term>
- <listitem><para>This option is used by the programs in the Samba
- suite to determine what naming services to use and in what order
- to resolve host names to IP addresses. The option takes a space
- separated string of name resolution options.</para>
-
- <para>The options are :&quot;lmhosts&quot;, &quot;host&quot;, &quot;wins&quot; and &quot;bcast&quot;. They
- cause names to be resolved as follows :</para>
-
- <itemizedlist>
- <listitem><para><constant>lmhosts</constant> : Lookup an IP
- address in the Samba lmhosts file. If the line in lmhosts has
- no name type attached to the NetBIOS name (see the <ulink url="lmhosts.5.html">lmhosts(5)</ulink> for details) then
- any name type matches for lookup.</para></listitem>
-
- <listitem><para><constant>host</constant> : Do a standard host
- name to IP address resolution, using the system <filename moreinfo="none">/etc/hosts
- </filename>, NIS, or DNS lookups. This method of name resolution
- is operating system depended for instance on IRIX or Solaris this
- may be controlled by the <filename moreinfo="none">/etc/nsswitch.conf</filename>
- file. Note that this method is only used if the NetBIOS name
- type being queried is the 0x20 (server) name type, otherwise
- it is ignored.</para></listitem>
-
- <listitem><para><constant>wins</constant> : Query a name with
- the IP address listed in the <link linkend="WINSSERVER"><parameter moreinfo="none">
- wins server</parameter></link> parameter. If no WINS server has
- been specified this method will be ignored.</para></listitem>
-
- <listitem><para><constant>bcast</constant> : Do a broadcast on
- each of the known local interfaces listed in the <link linkend="INTERFACES"><parameter moreinfo="none">interfaces</parameter></link>
- parameter. This is the least reliable of the name resolution
- methods as it depends on the target host being on a locally
- connected subnet.</para></listitem>
- </itemizedlist>
-
- <para>Default: <command moreinfo="none">name resolve order = lmhosts host wins bcast
- </command></para>
- <para>Example: <command moreinfo="none">name resolve order = lmhosts bcast host
- </command></para>
-
- <para>This will cause the local lmhosts file to be examined
- first, followed by a broadcast attempt, followed by a normal
- system hostname lookup.</para>
- </listitem>
- </samba:parameter>
+<samba:parameter name="name resolve order"
+ context="G"
+ advanced="1" wizard="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This option is used by the programs in the Samba
+ suite to determine what naming services to use and in what order
+ to resolve host names to IP addresses. The option takes a space
+ separated string of name resolution options.</para>
+
+ <para>The options are: &quot;lmhosts&quot;, &quot;host&quot;,
+ &quot;wins&quot; and &quot;bcast&quot;. They cause names to be
+ resolved as follows:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><constant>lmhosts</constant> : Lookup an IP
+ address in the Samba lmhosts file. If the line in lmhosts has
+ no name type attached to the NetBIOS name (see the <ulink url="lmhosts.5.html">lmhosts(5)</ulink> for details) then
+ any name type matches for lookup.</para>
+ </listitem>
+
+ <listitem>
+ <para><constant>host</constant> : Do a standard host
+ name to IP address resolution, using the system <filename moreinfo="none">/etc/hosts
+ </filename>, NIS, or DNS lookups. This method of name resolution
+ is operating system depended for instance on IRIX or Solaris this
+ may be controlled by the <filename moreinfo="none">/etc/nsswitch.conf</filename>
+ file. Note that this method is only used if the NetBIOS name
+ type being queried is the 0x20 (server) name type, otherwise
+ it is ignored.</para>
+ </listitem>
+
+ <listitem>
+ <para><constant>wins</constant> : Query a name with
+ the IP address listed in the <link linkend="WINSSERVER"><parameter moreinfo="none">
+ wins server</parameter></link> parameter. If no WINS server has
+ been specified this method will be ignored.</para>
+ </listitem>
+
+ <listitem>
+ <para><constant>bcast</constant> : Do a broadcast on
+ each of the known local interfaces listed in the <link linkend="INTERFACES"><parameter moreinfo="none">interfaces</parameter></link>
+ parameter. This is the least reliable of the name resolution
+ methods as it depends on the target host being on a locally
+ connected subnet.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Default: <command moreinfo="none">name resolve order = lmhosts host wins bcast</command></para>
+
+ <para>Example: <command moreinfo="none">name resolve order = lmhosts bcast host</command></para>
+
+ <para>This will cause the local lmhosts file to be examined
+ first, followed by a broadcast attempt, followed by a normal
+ system hostname lookup.</para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/ntaclsupport.xml b/docs/docbook/smbdotconf/protocol/ntaclsupport.xml
index df0d8dc068..64276d51c3 100644
--- a/docs/docbook/smbdotconf/protocol/ntaclsupport.xml
+++ b/docs/docbook/smbdotconf/protocol/ntaclsupport.xml
@@ -1,11 +1,14 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="NTACLSUPPORT"/>nt acl support (S)</term>
- <listitem><para>This boolean parameter controls whether
- <ulink url="smbd.8.html">smbd(8)</ulink> will attempt to map
- UNIX permissions into Windows NT access control lists.
- This parameter was formally a global parameter in releases
- prior to 2.2.2.</para>
+<samba:parameter name="nt acl support"
+ context="S"
+ advanced="1" wizard="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This boolean parameter controls whether <citerefentry><refentrytitle>smbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry> will attempt to map
+ UNIX permissions into Windows NT access control lists.
+ This parameter was formally a global parameter in releases
+ prior to 2.2.2.</para>
- <para>Default: <command moreinfo="none">nt acl support = yes</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">nt acl support = yes</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/ntpipesupport.xml b/docs/docbook/smbdotconf/protocol/ntpipesupport.xml
index cab2032847..e5c42a7696 100644
--- a/docs/docbook/smbdotconf/protocol/ntpipesupport.xml
+++ b/docs/docbook/smbdotconf/protocol/ntpipesupport.xml
@@ -1,12 +1,15 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="NTPIPESUPPORT"/>nt pipe support (G)</term>
- <listitem><para>This boolean parameter controls whether
- <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> will allow Windows NT
- clients to connect to the NT SMB specific <constant>IPC$</constant>
- pipes. This is a developer debugging option and can be left
- alone.</para>
+<samba:parameter name="nt pipe support"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This boolean parameter controls whether
+ <citerefentry><refentrytitle>smbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry> will allow Windows NT
+ clients to connect to the NT SMB specific <constant>IPC$</constant>
+ pipes. This is a developer debugging option and can be left
+ alone.</para>
- <para>Default: <command moreinfo="none">nt pipe support = yes</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">nt pipe support = yes</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/ntstatussupport.xml b/docs/docbook/smbdotconf/protocol/ntstatussupport.xml
index 17dafa47c5..ecb19128ee 100644
--- a/docs/docbook/smbdotconf/protocol/ntstatussupport.xml
+++ b/docs/docbook/smbdotconf/protocol/ntstatussupport.xml
@@ -1,14 +1,17 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="NTSTATUSSUPPORT"/>nt status support (G)</term>
- <listitem><para>This boolean parameter controls whether <ulink url="smbd.8.html">smbd(8)</ulink> will negotiate NT specific status
- support with Windows NT/2k/XP clients. This is a developer
- debugging option and should be left alone.
- If this option is set to <constant>no</constant> then Samba offers
- exactly the same DOS error codes that versions prior to Samba 2.2.3
- reported.</para>
+<samba:parameter name="nt status support"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This boolean parameter controls whether <citerefentry><refentrytitle>smbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry> will negotiate NT specific status
+ support with Windows NT/2k/XP clients. This is a developer debugging option and should be left alone.
+ If this option is set to <constant>no</constant> then Samba offers
+ exactly the same DOS error codes that versions prior to Samba 2.2.3
+ reported.</para>
- <para>You should not need to ever disable this parameter.</para>
+ <para>You should not need to ever disable this parameter.</para>
- <para>Default: <command moreinfo="none">nt status support = yes</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">nt status support = yes</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/protocol.xml b/docs/docbook/smbdotconf/protocol/protocol.xml
index 5161806cfc..19926649c0 100644
--- a/docs/docbook/smbdotconf/protocol/protocol.xml
+++ b/docs/docbook/smbdotconf/protocol/protocol.xml
@@ -1,5 +1,9 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="PROTOCOL"/>protocol (G)</term>
- <listitem><para>Synonym for <link linkend="MAXPROTOCOL">
- <parameter moreinfo="none">max protocol</parameter></link>.</para></listitem>
- </samba:parameter>
+<samba:parameter name="protocol"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>Synonym for <link linkend="MAXPROTOCOL">
+ <parameter moreinfo="none">max protocol</parameter></link>.</para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/readbmpx.xml b/docs/docbook/smbdotconf/protocol/readbmpx.xml
index 0bc8f1d10b..0298407cef 100644
--- a/docs/docbook/smbdotconf/protocol/readbmpx.xml
+++ b/docs/docbook/smbdotconf/protocol/readbmpx.xml
@@ -1,10 +1,15 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="READBMPX"/>read bmpx (G)</term>
- <listitem><para>This boolean parameter controls whether <ulink url="smbd.8.html">smbd(8)</ulink> will support the &quot;Read
- Block Multiplex&quot; SMB. This is now rarely used and defaults to
- <constant>no</constant>. You should never need to set this
- parameter.</para>
+<samba:parameter name="read bmpx"
+ context="G"
+ developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This boolean parameter controls whether
+ <citerefentry><refentrytitle>smbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry> will support the &quot;Read
+ Block Multiplex&quot; SMB. This is now rarely used and defaults to
+ <constant>no</constant>. You should never need to set this
+ parameter.</para>
- <para>Default: <command moreinfo="none">read bmpx = no</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">read bmpx = no</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/readraw.xml b/docs/docbook/smbdotconf/protocol/readraw.xml
index b867816e84..6b24f39d68 100644
--- a/docs/docbook/smbdotconf/protocol/readraw.xml
+++ b/docs/docbook/smbdotconf/protocol/readraw.xml
@@ -1,21 +1,24 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="READRAW"/>read raw (G)</term>
- <listitem><para>This parameter controls whether or not the server
- will support the raw read SMB requests when transferring data
- to clients.</para>
+<samba:parameter name="read raw"
+ context="G"
+ developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This parameter controls whether or not the server
+ will support the raw read SMB requests when transferring data
+ to clients.</para>
- <para>If enabled, raw reads allow reads of 65535 bytes in
- one packet. This typically provides a major performance benefit.
- </para>
+ <para>If enabled, raw reads allow reads of 65535 bytes in
+ one packet. This typically provides a major performance benefit.
+ </para>
- <para>However, some clients either negotiate the allowable
- block size incorrectly or are incapable of supporting larger block
- sizes, and for these clients you may need to disable raw reads.</para>
+ <para>However, some clients either negotiate the allowable
+ block size incorrectly or are incapable of supporting larger block
+ sizes, and for these clients you may need to disable raw reads.</para>
- <para>In general this parameter should be viewed as a system tuning
- tool and left severely alone. See also <link linkend="WRITERAW">
- <parameter moreinfo="none">write raw</parameter></link>.</para>
+ <para>In general this parameter should be viewed as a system tuning
+ tool and left severely alone. See also <link linkend="WRITERAW">
+ <parameter moreinfo="none">write raw</parameter></link>.</para>
- <para>Default: <command moreinfo="none">read raw = yes</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">read raw = yes</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/smbports.xml b/docs/docbook/smbdotconf/protocol/smbports.xml
index ed088ab9d2..9d06c37964 100644
--- a/docs/docbook/smbdotconf/protocol/smbports.xml
+++ b/docs/docbook/smbdotconf/protocol/smbports.xml
@@ -1,10 +1,10 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="SMBPORTS"/>smb ports (G)</term>
- <listitem><para>Specifies which ports the server should listen on
- for SMB traffic.
- </para>
+<samba:parameter name="smb ports"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>Specifies which ports the server should listen on for SMB traffic.</para>
- <para>Default: <command moreinfo="none">smb ports = 445 139</command></para>
-
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">smb ports = 445 139</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/timeserver.xml b/docs/docbook/smbdotconf/protocol/timeserver.xml
index eb1a720a8d..d78f9a456d 100644
--- a/docs/docbook/smbdotconf/protocol/timeserver.xml
+++ b/docs/docbook/smbdotconf/protocol/timeserver.xml
@@ -1,9 +1,12 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="TIMESERVER"/>time server (G)</term>
- <listitem><para>This parameter determines if <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> advertises itself as a time server to Windows
- clients.</para>
+<samba:parameter name="time server"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This parameter determines if <citerefentry><refentrytitle>nmbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry> advertises itself as a time server to Windows
+ clients.</para>
- <para>Default: <command moreinfo="none">time server = no</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">time server = no</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/unicode.xml b/docs/docbook/smbdotconf/protocol/unicode.xml
index 866dad28a0..be93cb61e2 100644
--- a/docs/docbook/smbdotconf/protocol/unicode.xml
+++ b/docs/docbook/smbdotconf/protocol/unicode.xml
@@ -1,11 +1,13 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="UNICODE"/>unicode (G)</term>
- <listitem><para>Specifies whether Samba should try
- to use unicode on the wire by default. Note: This does NOT
- mean that samba will assume that the unix machine uses unicode!
- </para>
+<samba:parameter name="unicode"
+ context="G"
+ developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>Specifies whether Samba should try
+ to use unicode on the wire by default. Note: This does NOT
+ mean that samba will assume that the unix machine uses unicode!
+ </para>
- <para>Default: <command moreinfo="none">unicode = yes</command></para>
-
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">unicode = yes</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/unixextensions.xml b/docs/docbook/smbdotconf/protocol/unixextensions.xml
index d0adde9d27..2f68b9605e 100644
--- a/docs/docbook/smbdotconf/protocol/unixextensions.xml
+++ b/docs/docbook/smbdotconf/protocol/unixextensions.xml
@@ -1,12 +1,15 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="UNIXEXTENSIONS"/>unix extensions(G)</term>
- <listitem><para>This boolean parameter controls whether Samba
- implments the CIFS UNIX extensions, as defined by HP.
- These extensions enable Samba to better serve UNIX CIFS clients
- by supporting features such as symbolic links, hard links, etc...
- These extensions require a similarly enabled client, and are of
- no current use to Windows clients.</para>
+<samba:parameter name="unix extensions"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This boolean parameter controls whether Samba
+ implments the CIFS UNIX extensions, as defined by HP.
+ These extensions enable Samba to better serve UNIX CIFS clients
+ by supporting features such as symbolic links, hard links, etc...
+ These extensions require a similarly enabled client, and are of
+ no current use to Windows clients.</para>
- <para>Default: <command moreinfo="none">unix extensions = no</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">unix extensions = no</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/usespnego.xml b/docs/docbook/smbdotconf/protocol/usespnego.xml
index 9e3c873a4b..88c9f1df7a 100644
--- a/docs/docbook/smbdotconf/protocol/usespnego.xml
+++ b/docs/docbook/smbdotconf/protocol/usespnego.xml
@@ -1,11 +1,15 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="USESPNEGO"/>use spnego (G)</term>
- <listitem><para> This variable controls controls whether samba will try
- to use Simple and Protected NEGOciation (as specified by rfc2478) with
- WindowsXP and Windows2000sp2 clients to agree upon an authentication mechanism.
- Unless further issues are discovered with our SPNEGO
- implementation, there is no reason this should ever be
- disabled.</para>
- <para>Default: <emphasis>use spnego = yes</emphasis></para>
- </listitem>
- </samba:parameter>
+<samba:parameter name="use spnego"
+ context="G"
+ developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para> This variable controls controls whether samba will try
+ to use Simple and Protected NEGOciation (as specified by rfc2478) with
+ WindowsXP and Windows2000sp2 clients to agree upon an authentication mechanism.
+ Unless further issues are discovered with our SPNEGO
+ implementation, there is no reason this should ever be
+ disabled.</para>
+
+ <para>Default: <emphasis>use spnego = yes</emphasis></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/protocol/writeraw.xml b/docs/docbook/smbdotconf/protocol/writeraw.xml
index dbaad0130e..e71c54cabd 100644
--- a/docs/docbook/smbdotconf/protocol/writeraw.xml
+++ b/docs/docbook/smbdotconf/protocol/writeraw.xml
@@ -1,9 +1,12 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="WRITERAW"/>write raw (G)</term>
- <listitem><para>This parameter controls whether or not the server
- will support raw write SMB's when transferring data from clients.
- You should never need to change this parameter.</para>
+<samba:parameter name="write raw"
+ context="G"
+ developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This parameter controls whether or not the server
+ will support raw write SMB's when transferring data from clients.
+ You should never need to change this parameter.</para>
- <para>Default: <command moreinfo="none">write raw = yes</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">write raw = yes</command></para>
+</listitem>
+</samba:parameter>