[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3168-gc2e9d82

[Michael Adam]

The branch, v3-3-test has been updated
       via  c2e9d82d9497f0d245a46c5c82ff15306788109e (commit)
       via  93887f2e42bf4e632dab716deda6d2951dbd1f2a (commit)
       via  671988c7b5891deeca23e2305fe101a3be1a44d2 (commit)
      from  5ba418d8bd7bd9a678853b23b0928da4f8693bcf (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit c2e9d82d9497f0d245a46c5c82ff15306788109e
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jul 10 14:05:33 2008 +0200

    docs: fix the net conf section of net(8) to mention "config backend = registry".
    
    Michael

commit 93887f2e42bf4e632dab716deda6d2951dbd1f2a
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jul 10 13:50:04 2008 +0200

    docs: fix VERSION section in the net(8) manpage.
    
    It still said for version 3.0 ..
    
    Michael

commit 671988c7b5891deeca23e2305fe101a3be1a44d2
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jul 10 13:46:25 2008 +0200

    docs: update the section about net conf in the net(8) manpage.
    
    The description of the "net conf {get,set,del}includes" commands was missing.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages-3/net.8.xml |   48 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 45 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index 9e2558e..cdf0fbb 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -1389,7 +1389,9 @@ The deployment of this configuration data can be activated in two levels from th
 activated by setting <parameter>registry shares</parameter> to
 <quote>yes</quote> in the [global] section and global configuration options are
 activated by setting <smbconfoption name="include">registry</smbconfoption> in
-the [global] section.
+the [global] section for a mixed configuration or by setting
+<smbconfoption name="config backend">registry</smbconfoption> in the [global]
+section for a registry-only configuration.
 See the <citerefentry><refentrytitle>smb.conf</refentrytitle>
 <manvolnum>5</manvolnum></citerefentry> manpage for details.
 </para>
@@ -1409,6 +1411,9 @@ registry.</member>
 <member>net conf setparm - Store a parameter.</member>
 <member>net conf getparm - Retrieve the value of a parameter.</member>
 <member>net conf delparm - Delete a parameter.</member>
+<member>net conf getincludes - Show the includes of a share definition.</member>
+<member>net conf setincludes - Set includes for a share.</member>
+<member>net conf delincludes - Delete includes from a share definition.</member>
 </simplelist>
 </para>
 
@@ -1509,9 +1514,46 @@ Delete a parameter stored in registry.
 </refsect3>
 
 <refsect3>
-<title></title>
+<title>CONF GETINCLUDES <replaceable>section</replaceable></title>
 
 <para>
+Get the list of includes for the provided section (global or share).
+</para>
+
+<para>
+Note that due to the nature of the registry database and the nature of include directives,
+the includes need special treatment: Parameters are stored in registry by the parameter
+name as valuename, so there is only ever one instance of a parameter per share.
+Also, a specific order like in a text file is not guaranteed. For all real
+parameters, this is perfectly ok, but the include directive is rather a meta
+parameter, for which, in the smb.conf text file, the place where it is specified
+between the other parameters is very important. This can not be achieved by the
+simple registry smbconf data model, so there is one ordered list of includes
+per share, and this list is evaluated after all the parameters of the share.
+</para>
+
+<para>
+Further note that currently, only files can be included from registry
+configuration. In the future, there will be the ability to include configuration
+data from other registry keys.
+</para>
+</refsect3>
+
+<refsect3>
+<title>CONF SETINCLUDES <replaceable>section</replaceable> [<replaceable>filename</replaceable>]+</title>
+
+<para>
+Set the list of includes for the provided section (global or share) to the given
+list of one or more filenames. The filenames may contain the usual smb.conf
+macros like %I.
+</para>
+</refsect3>
+
+<refsect3>
+<title>CONF DELINCLUDES <replaceable>section</replaceable></title>
+
+<para>
+Delete the list of includes from the provided section (global or share).
 </para>
 </refsect3>
 
@@ -1529,7 +1571,7 @@ Delete a parameter stored in registry.
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is complete for version 3.0 of the Samba 
+	<para>This man page is complete for version 3 of the Samba 
 	suite.</para>
 </refsect1>
 


-- 
Samba Shared Repository