diff options
Diffstat (limited to 'docs/smbdotconf/misc')
| -rw-r--r-- | docs/smbdotconf/misc/include.xml | 12 | ||||
| -rw-r--r-- | docs/smbdotconf/misc/registryshares.xml | 16 |
2 files changed, 27 insertions, 1 deletions
diff --git a/docs/smbdotconf/misc/include.xml b/docs/smbdotconf/misc/include.xml index 17ccea33c0..84e20dff89 100644 --- a/docs/smbdotconf/misc/include.xml +++ b/docs/smbdotconf/misc/include.xml @@ -1,6 +1,6 @@ <samba:parameter name="include" context="G" - type="string" + type="string" hide="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> @@ -13,6 +13,16 @@ It takes the standard substitutions, except <parameter moreinfo="none">%u</parameter>, <parameter moreinfo="none">%P</parameter> and <parameter moreinfo="none">%S</parameter>. </para> + + <para> + The parameter <parameter>include = registry</parameter> has + a special meaning: It does <emphasis>not</emphasis> include + a file named <term>registry</term> from the current working + directory, but instead reads the global configuration options + from the registry. See the section on registry-based + configuration for details. Note that this option + automatically activates registry shares. + </para> </description> <value type="default"></value> diff --git a/docs/smbdotconf/misc/registryshares.xml b/docs/smbdotconf/misc/registryshares.xml new file mode 100644 index 0000000000..5557661998 --- /dev/null +++ b/docs/smbdotconf/misc/registryshares.xml @@ -0,0 +1,16 @@ +<samba:parameter name="config file" + context="G" + type="bool" + advanced="1" + xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> +<description> + <para> + This turns on or off support for share definitions read from + registry. Shares in defined in <term>smb.conf</term> take + precedence over shares with the same name defined in + registry. See the section on registry-based configuration + for details. + </para> +</description> +<value type="example">/usr/local/samba/lib/smb.conf.%m</value> +</samba:parameter> |