summaryrefslogtreecommitdiff
path: root/docs/docbook/smbdotconf/misc
diff options
context:
space:
mode:
Diffstat (limited to 'docs/docbook/smbdotconf/misc')
-rw-r--r--docs/docbook/smbdotconf/misc/copy.xml31
-rw-r--r--docs/docbook/smbdotconf/misc/default.xml14
-rw-r--r--docs/docbook/smbdotconf/misc/dfreecommand.xml66
-rw-r--r--docs/docbook/smbdotconf/misc/exec.xml14
-rw-r--r--docs/docbook/smbdotconf/misc/homedirmap.xml50
-rw-r--r--docs/docbook/smbdotconf/misc/include.xml28
-rw-r--r--docs/docbook/smbdotconf/misc/messagecommand.xml118
-rw-r--r--docs/docbook/smbdotconf/misc/nishomedir.xml55
-rw-r--r--docs/docbook/smbdotconf/misc/preexec.xml38
-rw-r--r--docs/docbook/smbdotconf/misc/remoteannounce.xml53
-rw-r--r--docs/docbook/smbdotconf/misc/remotebrowsesync.xml56
-rw-r--r--docs/docbook/smbdotconf/misc/socketaddress.xml26
-rw-r--r--docs/docbook/smbdotconf/misc/timeoffset.xml24
13 files changed, 310 insertions, 263 deletions
diff --git a/docs/docbook/smbdotconf/misc/copy.xml b/docs/docbook/smbdotconf/misc/copy.xml
index a7945af8ae..c3152956b0 100644
--- a/docs/docbook/smbdotconf/misc/copy.xml
+++ b/docs/docbook/smbdotconf/misc/copy.xml
@@ -1,15 +1,20 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="COPY"/>copy (S)</term>
- <listitem><para>This parameter allows you to &quot;clone&quot; service
- entries. The specified service is simply duplicated under the
- current service's name. Any parameters specified in the current
- section will override those in the section being copied.</para>
+<samba:parameter name="copy"
+ context="S"
+ hide="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This parameter allows you to &quot;clone&quot; service
+ entries. The specified service is simply duplicated under the
+ current service's name. Any parameters specified in the current
+ section will override those in the section being copied.</para>
- <para>This feature lets you set up a 'template' service and
- create similar services easily. Note that the service being
- copied must occur earlier in the configuration file than the
- service doing the copying.</para>
+ <para>This feature lets you set up a 'template' service and
+ create similar services easily. Note that the service being
+ copied must occur earlier in the configuration file than the
+ service doing the copying.</para>
- <para>Default: <emphasis>no value</emphasis></para>
- <para>Example: <command moreinfo="none">copy = otherservice</command></para></listitem>
- </samba:parameter>
+ <para>Default: <emphasis>no value</emphasis></para>
+
+ <para>Example: <command moreinfo="none">copy = otherservice</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/misc/default.xml b/docs/docbook/smbdotconf/misc/default.xml
index c396d1947b..7afaba640b 100644
--- a/docs/docbook/smbdotconf/misc/default.xml
+++ b/docs/docbook/smbdotconf/misc/default.xml
@@ -1,5 +1,9 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="DEFAULT"/>default (G)</term>
- <listitem><para>A synonym for <link linkend="DEFAULTSERVICE"><parameter moreinfo="none">
- default service</parameter></link>.</para></listitem>
- </samba:parameter>
+<samba:parameter name="default service"
+ context="G"
+ developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>A synonym for <link linkend="DEFAULTSERVICE"><parameter moreinfo="none">
+ default service</parameter></link>.</para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/misc/dfreecommand.xml b/docs/docbook/smbdotconf/misc/dfreecommand.xml
index c71ec8e00b..1e839a5242 100644
--- a/docs/docbook/smbdotconf/misc/dfreecommand.xml
+++ b/docs/docbook/smbdotconf/misc/dfreecommand.xml
@@ -1,50 +1,52 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="DFREECOMMAND"/>dfree command (G)</term>
- <listitem><para>The <parameter moreinfo="none">dfree command</parameter> setting should
- only be used on systems where a problem occurs with the internal
- disk space calculations. This has been known to happen with Ultrix,
- but may occur with other operating systems. The symptom that was
- seen was an error of &quot;Abort Retry Ignore&quot; at the end of each
- directory listing.</para>
+<samba:parameter name="dfree command"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+
+ <para>The <parameter moreinfo="none">dfree command</parameter> setting
+ should only be used on systems where a problem occurs with the
+ internal disk space calculations. This has been known to happen
+ with Ultrix, but may occur with other operating systems. The
+ symptom that was seen was an error of &quot;Abort Retry
+ Ignore&quot; at the end of each directory listing.</para>
- <para>This setting allows the replacement of the internal routines to
- calculate the total disk space and amount available with an external
- routine. The example below gives a possible script that might fulfill
- this function.</para>
+ <para>This setting allows the replacement of the internal routines to
+ calculate the total disk space and amount available with an external
+ routine. The example below gives a possible script that might fulfill
+ this function.</para>
- <para>The external program will be passed a single parameter indicating
- a directory in the filesystem being queried. This will typically consist
- of the string <filename moreinfo="none">./</filename>. The script should return two
- integers in ASCII. The first should be the total disk space in blocks,
- and the second should be the number of available blocks. An optional
- third return value can give the block size in bytes. The default
- blocksize is 1024 bytes.</para>
+ <para>The external program will be passed a single parameter indicating
+ a directory in the filesystem being queried. This will typically consist
+ of the string <filename moreinfo="none">./</filename>. The script should return two
+ integers in ASCII. The first should be the total disk space in blocks,
+ and the second should be the number of available blocks. An optional
+ third return value can give the block size in bytes. The default
+ blocksize is 1024 bytes.</para>
- <para>Note: Your script should <emphasis>NOT</emphasis> be setuid or
- setgid and should be owned by (and writeable only by) root!</para>
+ <para>Note: Your script should <emphasis>NOT</emphasis> be setuid or
+ setgid and should be owned by (and writeable only by) root!</para>
- <para>Default: <emphasis>By default internal routines for
- determining the disk capacity and remaining space will be used.
- </emphasis></para>
+ <para>Default: <emphasis>By default internal routines for
+ determining the disk capacity and remaining space will be used.
+ </emphasis></para>
- <para>Example: <command moreinfo="none">dfree command = /usr/local/samba/bin/dfree
- </command></para>
+ <para>Example: <command moreinfo="none">dfree command = /usr/local/samba/bin/dfree</command></para>
- <para>Where the script dfree (which must be made executable) could be:</para>
+ <para>Where the script dfree (which must be made executable) could be:</para>
<para><programlisting format="linespecific">
#!/bin/sh
df $1 | tail -1 | awk '{print $2&quot; &quot;$4}'
</programlisting></para>
- <para>or perhaps (on Sys V based systems):</para>
+ <para>or perhaps (on Sys V based systems):</para>
<para><programlisting format="linespecific">
#!/bin/sh
/usr/bin/df -k $1 | tail -1 | awk '{print $3&quot; &quot;$5}'
</programlisting></para>
- <para>Note that you may have to replace the command names
- with full path names on some systems.</para>
- </listitem>
- </samba:parameter>
+ <para>Note that you may have to replace the command names with full path names on some systems.</para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/misc/exec.xml b/docs/docbook/smbdotconf/misc/exec.xml
index 34963c90b2..0d44d81bff 100644
--- a/docs/docbook/smbdotconf/misc/exec.xml
+++ b/docs/docbook/smbdotconf/misc/exec.xml
@@ -1,5 +1,9 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="EXEC"/>exec (S)</term>
- <listitem><para>This is a synonym for <link linkend="PREEXEC">
- <parameter moreinfo="none">preexec</parameter></link>.</para></listitem>
- </samba:parameter>
+<samba:parameter name="exec"
+ context="S"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This is a synonym for <link linkend="PREEXEC">
+ <parameter moreinfo="none">preexec</parameter></link>.</para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/misc/homedirmap.xml b/docs/docbook/smbdotconf/misc/homedirmap.xml
index 41e6ca5ea1..d4f09c7f50 100644
--- a/docs/docbook/smbdotconf/misc/homedirmap.xml
+++ b/docs/docbook/smbdotconf/misc/homedirmap.xml
@@ -1,28 +1,32 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="HOMEDIRMAP"/>homedir map (G)</term>
- <listitem><para>If<link linkend="NISHOMEDIR"><parameter moreinfo="none">nis homedir
- </parameter></link> is <constant>yes</constant>, and <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> is also acting
- as a Win95/98 <parameter moreinfo="none">logon server</parameter> then this parameter
- specifies the NIS (or YP) map from which the server for the user's
- home directory should be extracted. At present, only the Sun
- auto.home map format is understood. The form of the map is:</para>
+<samba:parameter name="homedir map"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>If<link linkend="NISHOMEDIR"><parameter moreinfo="none">nis homedir
+ </parameter></link> is <constant>yes</constant>, and <citerefentry><refentrytitle>smbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry> is also acting
+ as a Win95/98 <parameter moreinfo="none">logon server</parameter> then this parameter
+ specifies the NIS (or YP) map from which the server for the user's
+ home directory should be extracted. At present, only the Sun
+ auto.home map format is understood. The form of the map is:</para>
- <para><command moreinfo="none">username server:/some/file/system</command></para>
+ <para><command moreinfo="none">username server:/some/file/system</command></para>
- <para>and the program will extract the servername from before
- the first ':'. There should probably be a better parsing system
- that copes with different map formats and also Amd (another
- automounter) maps.</para>
+ <para>and the program will extract the servername from before
+ the first ':'. There should probably be a better parsing system
+ that copes with different map formats and also Amd (another
+ automounter) maps.</para>
- <note><para>A working NIS client is required on
- the system for this option to work.</para></note>
+ <note><para>A working NIS client is required on
+ the system for this option to work.</para></note>
- <para>See also <link linkend="NISHOMEDIR"><parameter moreinfo="none">nis homedir</parameter>
- </link>, <link linkend="DOMAINLOGONS"><parameter moreinfo="none">domain logons</parameter>
- </link>.</para>
+ <para>See also <link linkend="NISHOMEDIR"><parameter moreinfo="none">nis homedir</parameter>
+ </link>, <link linkend="DOMAINLOGONS"><parameter moreinfo="none">domain logons</parameter>
+ </link>.</para>
- <para>Default: <command moreinfo="none">homedir map = &lt;empty string&gt;</command></para>
- <para>Example: <command moreinfo="none">homedir map = amd.homedir</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">homedir map = &lt;empty string&gt;</command></para>
+
+ <para>Example: <command moreinfo="none">homedir map = amd.homedir</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/misc/include.xml b/docs/docbook/smbdotconf/misc/include.xml
index 81230d4357..dcc32968e7 100644
--- a/docs/docbook/smbdotconf/misc/include.xml
+++ b/docs/docbook/smbdotconf/misc/include.xml
@@ -1,14 +1,18 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="INCLUDE"/>include (G)</term>
- <listitem><para>This allows you to include one config file
- inside another. The file is included literally, as though typed
- in place.</para>
+<samba:parameter name="include"
+ context="G"
+ hide="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This allows you to include one config file
+ inside another. The file is included literally, as though typed
+ in place.</para>
- <para>It takes the standard substitutions, except <parameter moreinfo="none">%u
- </parameter>, <parameter moreinfo="none">%P</parameter> and <parameter moreinfo="none">%S</parameter>.
- </para>
+ <para>It takes the standard substitutions, except <parameter moreinfo="none">%u
+ </parameter>, <parameter moreinfo="none">%P</parameter> and <parameter moreinfo="none">%S</parameter>.
+ </para>
- <para>Default: <emphasis>no file included</emphasis></para>
- <para>Example: <command moreinfo="none">include = /usr/local/samba/lib/admin_smb.conf
- </command></para></listitem>
- </samba:parameter>
+ <para>Default: <emphasis>no file included</emphasis></para>
+
+ <para>Example: <command moreinfo="none">include = /usr/local/samba/lib/admin_smb.conf</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/misc/messagecommand.xml b/docs/docbook/smbdotconf/misc/messagecommand.xml
index 199fab5610..6df2a02bb7 100644
--- a/docs/docbook/smbdotconf/misc/messagecommand.xml
+++ b/docs/docbook/smbdotconf/misc/messagecommand.xml
@@ -1,65 +1,73 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="MESSAGECOMMAND"/>message command (G)</term>
- <listitem><para>This specifies what command to run when the
- server receives a WinPopup style message.</para>
-
- <para>This would normally be a command that would
- deliver the message somehow. How this is to be done is
- up to your imagination.</para>
-
- <para>An example is:</para>
-
- <para><command moreinfo="none">message command = csh -c 'xedit %s;rm %s' &amp;</command>
- </para>
-
- <para>This delivers the message using <command moreinfo="none">xedit</command>, then
- removes it afterwards. <emphasis>NOTE THAT IT IS VERY IMPORTANT
- THAT THIS COMMAND RETURN IMMEDIATELY</emphasis>. That's why I
- have the '&amp;' on the end. If it doesn't return immediately then
- your PCs may freeze when sending messages (they should recover
- after 30 seconds, hopefully).</para>
-
- <para>All messages are delivered as the global guest user.
- The command takes the standard substitutions, although <parameter moreinfo="none">
- %u</parameter> won't work (<parameter moreinfo="none">%U</parameter> may be better
- in this case).</para>
-
- <para>Apart from the standard substitutions, some additional
- ones apply. In particular:</para>
-
- <itemizedlist>
- <listitem><para><parameter moreinfo="none">%s</parameter> = the filename containing
- the message.</para></listitem>
+<samba:parameter name="message command"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This specifies what command to run when the
+ server receives a WinPopup style message.</para>
+
+ <para>This would normally be a command that would
+ deliver the message somehow. How this is to be done is
+ up to your imagination.</para>
+
+ <para>An example is:</para>
+
+ <para><command moreinfo="none">message command = csh -c 'xedit %s;rm %s' &amp;</command>
+ </para>
+
+ <para>This delivers the message using <command moreinfo="none">xedit</command>, then
+ removes it afterwards. <emphasis>NOTE THAT IT IS VERY IMPORTANT
+ THAT THIS COMMAND RETURN IMMEDIATELY</emphasis>. That's why I
+ have the '&amp;' on the end. If it doesn't return immediately then
+ your PCs may freeze when sending messages (they should recover
+ after 30 seconds, hopefully).</para>
+
+ <para>All messages are delivered as the global guest user.
+ The command takes the standard substitutions, although <parameter moreinfo="none">
+ %u</parameter> won't work (<parameter moreinfo="none">%U</parameter> may be better
+ in this case).</para>
+
+ <para>Apart from the standard substitutions, some additional
+ ones apply. In particular:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><parameter moreinfo="none">%s</parameter> = the filename containing
+ the message.</para>
+ </listitem>
- <listitem><para><parameter moreinfo="none">%t</parameter> = the destination that
- the message was sent to (probably the server name).</para></listitem>
+ <listitem>
+ <para><parameter moreinfo="none">%t</parameter> = the destination that
+ the message was sent to (probably the server name).</para>
+ </listitem>
- <listitem><para><parameter moreinfo="none">%f</parameter> = who the message
- is from.</para></listitem>
- </itemizedlist>
+ <listitem>
+ <para><parameter moreinfo="none">%f</parameter> = who the message
+ is from.</para>
+ </listitem>
+ </itemizedlist>
- <para>You could make this command send mail, or whatever else
- takes your fancy. Please let us know of any really interesting
- ideas you have.</para>
+ <para>You could make this command send mail, or whatever else
+ takes your fancy. Please let us know of any really interesting
+ ideas you have.</para>
+ <para>Here's a way of sending the messages as mail to root:</para>
- <para>Here's a way of sending the messages as mail to root:</para>
+ <para><command moreinfo="none">message command = /bin/mail -s 'message from %f on
+ %m' root &lt; %s; rm %s</command></para>
- <para><command moreinfo="none">message command = /bin/mail -s 'message from %f on
- %m' root &lt; %s; rm %s</command></para>
+ <para>If you don't have a message command then the message
+ won't be delivered and Samba will tell the sender there was
+ an error. Unfortunately WfWg totally ignores the error code
+ and carries on regardless, saying that the message was delivered.
+ </para>
- <para>If you don't have a message command then the message
- won't be delivered and Samba will tell the sender there was
- an error. Unfortunately WfWg totally ignores the error code
- and carries on regardless, saying that the message was delivered.
- </para>
+ <para>If you want to silently delete it then try:</para>
- <para>If you want to silently delete it then try:</para>
+ <para><command moreinfo="none">message command = rm %s</command></para>
- <para><command moreinfo="none">message command = rm %s</command></para>
+ <para>Default: <emphasis>no message command</emphasis></para>
- <para>Default: <emphasis>no message command</emphasis></para>
- <para>Example: <command moreinfo="none">message command = csh -c 'xedit %s;
- rm %s' &amp;</command></para>
- </listitem>
- </samba:parameter>
+ <para>Example: <command moreinfo="none">message command = csh -c 'xedit %s; rm %s' &amp;</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/misc/nishomedir.xml b/docs/docbook/smbdotconf/misc/nishomedir.xml
index 5a2980d4fd..734dcf8de5 100644
--- a/docs/docbook/smbdotconf/misc/nishomedir.xml
+++ b/docs/docbook/smbdotconf/misc/nishomedir.xml
@@ -1,30 +1,33 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="NISHOMEDIR"/>nis homedir (G)</term>
- <listitem><para>Get the home share server from a NIS map. For
- UNIX systems that use an automounter, the user's home directory
- will often be mounted on a workstation on demand from a remote
- server. </para>
+<samba:parameter name="nis homedir"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>Get the home share server from a NIS map. For
+ UNIX systems that use an automounter, the user's home directory
+ will often be mounted on a workstation on demand from a remote
+ server. </para>
- <para>When the Samba logon server is not the actual home directory
- server, but is mounting the home directories via NFS then two
- network hops would be required to access the users home directory
- if the logon server told the client to use itself as the SMB server
- for home directories (one over SMB and one over NFS). This can
- be very slow.</para>
+ <para>When the Samba logon server is not the actual home directory
+ server, but is mounting the home directories via NFS then two
+ network hops would be required to access the users home directory
+ if the logon server told the client to use itself as the SMB server
+ for home directories (one over SMB and one over NFS). This can
+ be very slow.</para>
- <para>This option allows Samba to return the home share as
- being on a different server to the logon server and as
- long as a Samba daemon is running on the home directory server,
- it will be mounted on the Samba client directly from the directory
- server. When Samba is returning the home share to the client, it
- will consult the NIS map specified in <link linkend="HOMEDIRMAP">
- <parameter moreinfo="none">homedir map</parameter></link> and return the server
- listed there.</para>
+ <para>This option allows Samba to return the home share as
+ being on a different server to the logon server and as
+ long as a Samba daemon is running on the home directory server,
+ it will be mounted on the Samba client directly from the directory
+ server. When Samba is returning the home share to the client, it
+ will consult the NIS map specified in <link linkend="HOMEDIRMAP">
+ <parameter moreinfo="none">homedir map</parameter></link> and return the server
+ listed there.</para>
- <para>Note that for this option to work there must be a working
- NIS system and the Samba server with this option must also
- be a logon server.</para>
+ <para>Note that for this option to work there must be a working
+ NIS system and the Samba server with this option must also
+ be a logon server.</para>
- <para>Default: <command moreinfo="none">nis homedir = no</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">nis homedir = no</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/misc/preexec.xml b/docs/docbook/smbdotconf/misc/preexec.xml
index fc047e008d..18c3345c6c 100644
--- a/docs/docbook/smbdotconf/misc/preexec.xml
+++ b/docs/docbook/smbdotconf/misc/preexec.xml
@@ -1,23 +1,25 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="PREEXEC"/>preexec (S)</term>
- <listitem><para>This option specifies a command to be run whenever
- the service is connected to. It takes the usual substitutions.</para>
+<samba:parameter name="prexec"
+ context="S"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This option specifies a command to be run whenever
+ the service is connected to. It takes the usual substitutions.</para>
- <para>An interesting example is to send the users a welcome
- message every time they log in. Maybe a message of the day? Here
- is an example:</para>
+ <para>An interesting example is to send the users a welcome
+ message every time they log in. Maybe a message of the day? Here
+ is an example:</para>
- <para><command moreinfo="none">preexec = csh -c 'echo \&quot;Welcome to %S!\&quot; |
- /usr/local/samba/bin/smbclient -M %m -I %I' &amp; </command></para>
+ <para><command moreinfo="none">preexec = csh -c 'echo \&quot;Welcome to %S!\&quot; | /usr/local/samba/bin/smbclient -M %m -I %I' &amp; </command></para>
- <para>Of course, this could get annoying after a while :-)</para>
+ <para>Of course, this could get annoying after a while :-)</para>
- <para>See also <link linkend="PREEXECCLOSE"><parameter moreinfo="none">preexec close
- </parameter></link> and <link linkend="POSTEXEC"><parameter moreinfo="none">postexec
- </parameter></link>.</para>
+ <para>See also <link linkend="PREEXECCLOSE"><parameter moreinfo="none">preexec close</parameter></link> and <link
+ linkend="POSTEXEC"><parameter moreinfo="none">postexec
+ </parameter></link>.</para>
- <para>Default: <emphasis>none (no command executed)</emphasis></para>
- <para>Example: <command moreinfo="none">preexec = echo \&quot;%u connected to %S from %m
- (%I)\&quot; &gt;&gt; /tmp/log</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <emphasis>none (no command executed)</emphasis></para>
+
+ <para>Example: <command moreinfo="none">preexec = echo \&quot;%u connected to %S from %m (%I)\&quot; &gt;&gt; /tmp/log</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/misc/remoteannounce.xml b/docs/docbook/smbdotconf/misc/remoteannounce.xml
index e6de4bdcaf..019cc306a7 100644
--- a/docs/docbook/smbdotconf/misc/remoteannounce.xml
+++ b/docs/docbook/smbdotconf/misc/remoteannounce.xml
@@ -1,32 +1,35 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="REMOTEANNOUNCE"/>remote announce (G)</term>
- <listitem><para>This option allows you to setup <ulink url="nmbd.8.html">nmbd(8)</ulink> to periodically announce itself
- to arbitrary IP addresses with an arbitrary workgroup name.</para>
+<samba:parameter name="remote announce"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This option allows you to setup <citerefentry><refentrytitle>nmbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>to periodically announce itself
+ to arbitrary IP addresses with an arbitrary workgroup name.</para>
- <para>This is useful if you want your Samba server to appear
- in a remote workgroup for which the normal browse propagation
- rules don't work. The remote workgroup can be anywhere that you
- can send IP packets to.</para>
+ <para>This is useful if you want your Samba server to appear
+ in a remote workgroup for which the normal browse propagation
+ rules don't work. The remote workgroup can be anywhere that you
+ can send IP packets to.</para>
- <para>For example:</para>
+ <para>For example:</para>
- <para><command moreinfo="none">remote announce = 192.168.2.255/SERVERS
- 192.168.4.255/STAFF</command></para>
+ <para><command moreinfo="none">remote announce = 192.168.2.255/SERVERS
+ 192.168.4.255/STAFF</command></para>
- <para>the above line would cause <command moreinfo="none">nmbd</command> to announce itself
- to the two given IP addresses using the given workgroup names.
- If you leave out the workgroup name then the one given in
- the <link linkend="WORKGROUP"><parameter moreinfo="none">workgroup</parameter></link>
- parameter is used instead.</para>
+ <para>the above line would cause <command moreinfo="none">nmbd</command> to announce itself
+ to the two given IP addresses using the given workgroup names.
+ If you leave out the workgroup name then the one given in
+ the <link linkend="WORKGROUP"><parameter moreinfo="none">workgroup</parameter></link>
+ parameter is used instead.</para>
- <para>The IP addresses you choose would normally be the broadcast
- addresses of the remote networks, but can also be the IP addresses
- of known browse masters if your network config is that stable.</para>
+ <para>The IP addresses you choose would normally be the broadcast
+ addresses of the remote networks, but can also be the IP addresses
+ of known browse masters if your network config is that stable.</para>
- <para>See the documentation file <ulink url="improved-browsing.html">BROWSING</ulink>
- in the <filename moreinfo="none">docs/</filename> directory.</para>
+ <para>See the documentation file <ulink url="improved-browsing.html">BROWSING</ulink>
+ in the <filename moreinfo="none">docs/</filename> directory.</para>
- <para>Default: <command moreinfo="none">remote announce = &lt;empty string&gt;
- </command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">remote announce = &lt;empty string&gt;</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/misc/remotebrowsesync.xml b/docs/docbook/smbdotconf/misc/remotebrowsesync.xml
index 8b0d863ed7..06069581e6 100644
--- a/docs/docbook/smbdotconf/misc/remotebrowsesync.xml
+++ b/docs/docbook/smbdotconf/misc/remotebrowsesync.xml
@@ -1,33 +1,35 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="REMOTEBROWSESYNC"/>remote browse sync (G)</term>
- <listitem><para>This option allows you to setup <ulink url="nmbd.8.html">nmbd(8)</ulink> to periodically request
- synchronization of browse lists with the master browser of a Samba
- server that is on a remote segment. This option will allow you to
- gain browse lists for multiple workgroups across routed networks. This
- is done in a manner that does not work with any non-Samba servers.</para>
+<samba:parameter name="remote browse sync"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This option allows you to setup <citerefentry><refentrytitle>nmbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry> to periodically request
+ synchronization of browse lists with the master browser of a Samba
+ server that is on a remote segment. This option will allow you to
+ gain browse lists for multiple workgroups across routed networks. This
+ is done in a manner that does not work with any non-Samba servers.</para>
- <para>This is useful if you want your Samba server and all local
- clients to appear in a remote workgroup for which the normal browse
- propagation rules don't work. The remote workgroup can be anywhere
- that you can send IP packets to.</para>
+ <para>This is useful if you want your Samba server and all local
+ clients to appear in a remote workgroup for which the normal browse
+ propagation rules don't work. The remote workgroup can be anywhere
+ that you can send IP packets to.</para>
- <para>For example:</para>
+ <para>For example:</para>
- <para><command moreinfo="none">remote browse sync = 192.168.2.255 192.168.4.255
- </command></para>
+ <para><command moreinfo="none">remote browse sync = 192.168.2.255 192.168.4.255</command></para>
- <para>the above line would cause <command moreinfo="none">nmbd</command> to request
- the master browser on the specified subnets or addresses to
- synchronize their browse lists with the local server.</para>
+ <para>the above line would cause <command moreinfo="none">nmbd</command> to request
+ the master browser on the specified subnets or addresses to
+ synchronize their browse lists with the local server.</para>
- <para>The IP addresses you choose would normally be the broadcast
- addresses of the remote networks, but can also be the IP addresses
- of known browse masters if your network config is that stable. If
- a machine IP address is given Samba makes NO attempt to validate
- that the remote machine is available, is listening, nor that it
- is in fact the browse master on its segment.</para>
+ <para>The IP addresses you choose would normally be the broadcast
+ addresses of the remote networks, but can also be the IP addresses
+ of known browse masters if your network config is that stable. If
+ a machine IP address is given Samba makes NO attempt to validate
+ that the remote machine is available, is listening, nor that it
+ is in fact the browse master on its segment.</para>
- <para>Default: <command moreinfo="none">remote browse sync = &lt;empty string&gt;
- </command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">remote browse sync = &lt;empty string&gt;</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/misc/socketaddress.xml b/docs/docbook/smbdotconf/misc/socketaddress.xml
index e77737f18b..4d2299acda 100644
--- a/docs/docbook/smbdotconf/misc/socketaddress.xml
+++ b/docs/docbook/smbdotconf/misc/socketaddress.xml
@@ -1,14 +1,16 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="SOCKETADDRESS"/>socket address (G)</term>
- <listitem><para>This option allows you to control what
- address Samba will listen for connections on. This is used to
- support multiple virtual interfaces on the one server, each
- with a different configuration.</para>
+<samba:parameter name="socket address"
+ context="G"
+ developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This option allows you to control what
+ address Samba will listen for connections on. This is used to
+ support multiple virtual interfaces on the one server, each
+ with a different configuration.</para>
- <para>By default Samba will accept connections on any
- address.</para>
+ <para>By default Samba will accept connections on any
+ address.</para>
- <para>Example: <command moreinfo="none">socket address = 192.168.2.20</command>
- </para>
- </listitem>
- </samba:parameter>
+ <para>Example: <command moreinfo="none">socket address = 192.168.2.20</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/misc/timeoffset.xml b/docs/docbook/smbdotconf/misc/timeoffset.xml
index 0c973234c3..4cd12b6d36 100644
--- a/docs/docbook/smbdotconf/misc/timeoffset.xml
+++ b/docs/docbook/smbdotconf/misc/timeoffset.xml
@@ -1,11 +1,15 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
- <term><anchor id="TIMEOFFSET"/>time offset (G)</term>
- <listitem><para>This parameter is a setting in minutes to add
- to the normal GMT to local time conversion. This is useful if
- you are serving a lot of PCs that have incorrect daylight
- saving time handling.</para>
+<samba:parameter name="time offset"
+ context="G"
+ advanced="1" developer="1"
+ xmlns:samba="http://samba.org/common">
+<listitem>
+ <para>This parameter is a setting in minutes to add
+ to the normal GMT to local time conversion. This is useful if
+ you are serving a lot of PCs that have incorrect daylight
+ saving time handling.</para>
- <para>Default: <command moreinfo="none">time offset = 0</command></para>
- <para>Example: <command moreinfo="none">time offset = 60</command></para>
- </listitem>
- </samba:parameter>
+ <para>Default: <command moreinfo="none">time offset = 0</command></para>
+
+ <para>Example: <command moreinfo="none">time offset = 60</command></para>
+</listitem>
+</samba:parameter>