diff options
| -rw-r--r-- | docs/manpages-3/smb.conf.5.xml | 37 | ||||
| -rw-r--r-- | 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 87584de650..0b2df36d80 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 <para> 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: </para> <orderedlist continuation="restarts" inheritnum="ignore" numeration="arabic"> <listitem><para>Share definitions stored in registry are used. - This is triggered by setting the global parameter - <parameter>registry shares</parameter> to - <quote>yes</quote> in <emphasis>smb.conf</emphasis>. + This is triggered by setting the global + parameter <parameter>registry shares</parameter> to <quote>yes</quote> + in <emphasis>smb.conf</emphasis>. </para> <para>Note: Shares defined in <emphasis>smb.conf</emphasis> @@ -733,15 +733,14 @@ chmod 1770 /usr/local/samba/lib/usershares </para></listitem> <listitem><para>Global <emphasis>smb.conf</emphasis> options stored in - registry are used. This - is triggered by a new parameter - <smbconfoption name="config backend">registry</smbconfoption> in + registry are used. This is triggered by the + parameter <smbconfoption name="config backend">registry</smbconfoption> in the [global] section of <emphasis>smb.conf</emphasis>. - 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 </orderedlist> <para> - Caveat: To make registry-based configurations foolprof at least to a - certain extent, the use of - <parameter>lock directory</parameter>, - <parameter>config backend</parameter>, - and <parameter>include</parameter> inside the registry + Caveat: To make registry-based configurations foolproof at least to a + certain extent, the use + of <parameter>lock directory</parameter>, + <parameter>config backend</parameter>, and + <parameter>include</parameter> inside the registry configuration has been disabled. Especially, by changing the - <parameter>lock directory</parameter> inside the registry + <parameter>lock directory</parameter> inside the registry configuration, one would create a broken setup where the daemons do not see the configuration they loaded once it is active. </para> @@ -765,10 +764,10 @@ chmod 1770 /usr/local/samba/lib/usershares The registry configuration can be accessed with tools like <emphasis>regedit</emphasis> or <emphasis>net rpc registry</emphasis> in the key - <emphasis><literal>HKLM\Software\Samba\smbconf</literal></emphasis>. + <emphasis><literal>HKLM\Software\Samba\smbconf</literal></emphasis>. More conveniently, the <emphasis>conf</emphasis> subcommand of the - <citerefentry><refentrytitle>net</refentrytitle> + <citerefentry><refentrytitle>net</refentrytitle> <manvolnum>8</manvolnum></citerefentry> 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 acaadfb472..cb08cf5fc3 100644 --- a/docs/smbdotconf/misc/registryshares.xml +++ b/docs/smbdotconf/misc/registryshares.xml @@ -6,11 +6,11 @@ <description> <para> This turns on or off support for share definitions read from - registry. Shares in defined in <emphasis>smb.conf</emphasis> take + registry. Shares 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. </para> </description> -<value type="example">/usr/local/samba/lib/smb.conf.%m</value> +<value type="example">yes</value> </samba:parameter> |