From 9a18c2ae733772c9b76798107732bd17d92081e8 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 16 Jan 2008 17:26:57 +0000 Subject: Add documentation for new parameter "config backend". Adapt documentation of registry based configuration. Michael (This used to be commit 5a9f8f45a7a5191cf6f44f6995fdd01fdd124dc1) --- docs/smbdotconf/misc/include.xml | 14 ++++---------- docs/smbdotconf/misc/lockdirectory.xml | 5 +++++ 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'docs/smbdotconf') 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 %u, %P and %S. - + + - Since Samba version 3.0.26, setting - registry has - a special meaning: It does not include - a file named registry 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. - /usr/local/samba/lib/admin_smb.conf 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 option. + + + Note: This option can not be set inside registry + configurations. + ${prefix}/var/locks -- cgit