summaryrefslogtreecommitdiff
path: root/docs/smbdotconf/misc
diff options
context:
space:
mode:
Diffstat (limited to 'docs/smbdotconf/misc')
-rw-r--r--docs/smbdotconf/misc/include.xml14
-rw-r--r--docs/smbdotconf/misc/lockdirectory.xml5
2 files changed, 9 insertions, 10 deletions
diff --git a/docs/smbdotconf/misc/include.xml b/docs/smbdotconf/misc/include.xml
index d8179ef1b0..1a08b49464 100644
--- a/docs/smbdotconf/misc/include.xml
+++ b/docs/smbdotconf/misc/include.xml
@@ -13,18 +13,12 @@
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>
- Since Samba version 3.0.26, setting
- <smbconfoption name="include">registry</smbconfoption> 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.
+ Note: This option can not be set inside registry
+ configurations.
</para>
-</description>
<value type="default"></value>
<value type="example">/usr/local/samba/lib/admin_smb.conf</value>
diff --git a/docs/smbdotconf/misc/lockdirectory.xml b/docs/smbdotconf/misc/lockdirectory.xml
index d96351a4fb..cbe10d5b8d 100644
--- a/docs/smbdotconf/misc/lockdirectory.xml
+++ b/docs/smbdotconf/misc/lockdirectory.xml
@@ -9,6 +9,11 @@
files will be placed. The lock files are used to implement the
<smbconfoption name="max connections"/> option.
</para>
+
+ <para>
+ Note: This option can not be set inside registry
+ configurations.
+ </para>
</description>
<value type="default">${prefix}/var/locks</value>