summaryrefslogtreecommitdiff
path: root/docs-xml
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-04-24 11:24:23 +0200
committerMichael Adam <obnox@samba.org>2008-04-24 11:33:18 +0200
commite431925063239cd4b421eb235dd4ff29c3065883 (patch)
tree05ec8c3d733929b5c38bbd8f370b4b7929724773 /docs-xml
parente11106238fa997452f8e7ae9304a50fc38761322 (diff)
downloadsamba-e431925063239cd4b421eb235dd4ff29c3065883.tar.gz
samba-e431925063239cd4b421eb235dd4ff29c3065883.tar.bz2
samba-e431925063239cd4b421eb235dd4ff29c3065883.zip
manpages: describe special meaning of "include = registry" in description of "include"
Michael (This used to be commit 613b6dc6f833dd7ef93e107c0eddc211d42fff93)
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/smbdotconf/misc/include.xml11
1 files changed, 8 insertions, 3 deletions
diff --git a/docs-xml/smbdotconf/misc/include.xml b/docs-xml/smbdotconf/misc/include.xml
index 1a08b49464..8217d84782 100644
--- a/docs-xml/smbdotconf/misc/include.xml
+++ b/docs-xml/smbdotconf/misc/include.xml
@@ -13,12 +13,17 @@
It takes the standard substitutions, except <parameter moreinfo="none">%u</parameter>,
<parameter moreinfo="none">%P</parameter> and <parameter moreinfo="none">%S</parameter>.
</para>
-</description>
<para>
- Note: This option can not be set inside registry
- configurations.
+ The parameter <parameter>include = registry</parameter> has
+ a special meaning: It does <emphasis>not</emphasis> include
+ a file named <emphasis>registry</emphasis> 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>
<value type="example">/usr/local/samba/lib/admin_smb.conf</value>