From 119ed5711429078235b7fa915ea657661f2abea5 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Fri, 18 Jan 2008 10:19:31 +0000 Subject: [PATCH] -fix some typos -add missing whitespaces -fix example for 'registry shares' still missing: Description of 'config backend' Karolin (This used to be commit 7d0986b90e089a9d340eb796dc151981eed97aef) --- docs/manpages-3/smb.conf.5.xml | 37 ++++++++++++++++----------------- docs/smbdotconf/misc/registryshares.xml | 4 ++-- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/docs/manpages-3/smb.conf.5.xml b/docs/manpages-3/smb.conf.5.xml index 87584de6500..0b2df36d803 100644 --- a/docs/manpages-3/smb.conf.5.xml +++ b/docs/manpages-3/smb.conf.5.xml @@ -717,14 +717,14 @@ chmod 1770 /usr/local/samba/lib/usershares Starting with Samba version 3.2.0, the capability to store Samba configuration in the registry is available. - There are two levels of registry configuration. + There are two levels of registry configuration: Share definitions stored in registry are used. - This is triggered by setting the global parameter - registry shares to - yes in smb.conf. + This is triggered by setting the global + parameter registry shares to yes + in smb.conf. Note: Shares defined in smb.conf @@ -733,15 +733,14 @@ chmod 1770 /usr/local/samba/lib/usershares Global smb.conf options stored in - registry are used. This - is triggered by a new parameter - registry in + registry are used. This is triggered by the + parameter registry in the [global] section of smb.conf. - This this removes everything that has been red from config files - to this poing and reads the content of the global configuration - section from the regsitry + This removes everything that has been read from config files + to this point and reads the content of the global configuration + section from the registry. Activation of global registry options automatically - activates registry shares. In this case, no share definition + activates registry shares. In this case, no share definitions from smb.conf are read: This is a registry only configuration with the advantage that share definitions are not read in a bulk at startup time but on demand when a share is @@ -750,13 +749,13 @@ chmod 1770 /usr/local/samba/lib/usershares - Caveat: To make registry-based configurations foolprof at least to a - certain extent, the use of - lock directory, - config backend, - and include inside the registry + Caveat: To make registry-based configurations foolproof at least to a + certain extent, the use + of lock directory, + config backend, and + include inside the registry configuration has been disabled. Especially, by changing the - lock directory inside the registry + lock directory inside the registry configuration, one would create a broken setup where the daemons do not see the configuration they loaded once it is active. @@ -765,10 +764,10 @@ chmod 1770 /usr/local/samba/lib/usershares The registry configuration can be accessed with tools like regedit or net rpc registry in the key - HKLM\Software\Samba\smbconf. + HKLM\Software\Samba\smbconf. More conveniently, the conf subcommand of the - net + net 8 utility offers a dedicated interface to read and write the registry based configuration locally, i.e. directly diff --git a/docs/smbdotconf/misc/registryshares.xml b/docs/smbdotconf/misc/registryshares.xml index acaadfb4728..cb08cf5fc37 100644 --- a/docs/smbdotconf/misc/registryshares.xml +++ b/docs/smbdotconf/misc/registryshares.xml @@ -6,11 +6,11 @@ This turns on or off support for share definitions read from - registry. Shares in defined in smb.conf take + registry. Shares defined in smb.conf take precedence over shares with the same name defined in registry. See the section on registry-based configuration for details. -/usr/local/samba/lib/smb.conf.%m +yes -- 2.11.4.GIT