From: Michael Adam <obnox@samba.org>
Date: Thu, 24 Apr 2008 09:24:23 +0000 (+0200)
Subject: manpages: describe special meaning of "include = registry" in description of "include"
X-Git-Tag: samba-3.3.0pre1~1476
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=613b6dc6f833dd7ef93e107c0eddc211d42fff93;p=thirdparty%2Fsamba.git

manpages: describe special meaning of "include = registry" in description of "include"

Michael
---

diff --git a/docs-xml/smbdotconf/misc/include.xml b/docs-xml/smbdotconf/misc/include.xml
index 1a08b49464d..8217d847823 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>