diff options
| author | Michael Adam <obnox@samba.org> | 2008-01-16 17:26:57 +0000 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-04-23 08:47:42 -0500 |
| commit | 9a18c2ae733772c9b76798107732bd17d92081e8 (patch) | |
| tree | 3bf03faa22eb3cd849308d1699f6b246aa0c2490 /docs/smbdotconf | |
| parent | 108574a59027a3f09490380639a26d578b2703a1 (diff) | |
| download | samba-9a18c2ae733772c9b76798107732bd17d92081e8.tar.gz samba-9a18c2ae733772c9b76798107732bd17d92081e8.tar.bz2 samba-9a18c2ae733772c9b76798107732bd17d92081e8.zip | |
Add documentation for new parameter "config backend".
Adapt documentation of registry based configuration.
Michael
(This used to be commit 5a9f8f45a7a5191cf6f44f6995fdd01fdd124dc1)
Diffstat (limited to 'docs/smbdotconf')
| -rw-r--r-- | docs/smbdotconf/misc/include.xml | 14 | ||||
| -rw-r--r-- | docs/smbdotconf/misc/lockdirectory.xml | 5 |
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> |