diff options
Diffstat (limited to 'docs/smbdotconf/misc')
| -rw-r--r-- | docs/smbdotconf/misc/include.xml | 5 | ||||
| -rw-r--r-- | docs/smbdotconf/misc/registryshares.xml | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/docs/smbdotconf/misc/include.xml b/docs/smbdotconf/misc/include.xml index 84e20dff89..d8179ef1b0 100644 --- a/docs/smbdotconf/misc/include.xml +++ b/docs/smbdotconf/misc/include.xml @@ -15,9 +15,10 @@ </para> <para> - The parameter <parameter>include = registry</parameter> has + 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 <term>registry</term> from the current working + 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 diff --git a/docs/smbdotconf/misc/registryshares.xml b/docs/smbdotconf/misc/registryshares.xml index 5557661998..0295c5c85c 100644 --- a/docs/smbdotconf/misc/registryshares.xml +++ b/docs/smbdotconf/misc/registryshares.xml @@ -6,7 +6,7 @@ <description> <para> This turns on or off support for share definitions read from - registry. Shares in defined in <term>smb.conf</term> take + registry. Shares in defined in <emphasis>smb.conf</emphasis> take precedence over shares with the same name defined in registry. See the section on registry-based configuration for details. |