Load samba-3.2.1 into branches/samba/upstream.upstream/3.2.1

git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@2104 fc4039ab-9d04-0410-8cac-899223bdd6b0

1 files changed, 38 insertions, 15 deletions

diff --git a/docs/htmldocs/manpages/net.8.html b/docs/htmldocs/manpages/net.8.html
index e2f0cf8e1b..b8c3d0172f 100644
--- a/docs/htmldocs/manpages/net.8.html
+++ b/docs/htmldocs/manpages/net.8.html
@@ -365,17 +365,19 @@ The deployment of this configuration data can be activated in two levels from th
 activated by setting <em class="parameter"><code>registry shares</code></em> to
 &#8220;<span class="quote">yes</span>&#8221; in the [global] section and global configuration options are
 activated by setting <a class="link" href="smb.conf.5.html#INCLUDE">include = registry</a> in
-the [global] section.
+the [global] section for a mixed configuration or by setting
+<a class="link" href="smb.conf.5.html#CONFIGBACKEND">config backend = registry</a> in the [global]
+section for a registry-only configuration.
 See the <a class="citerefentry" href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a> manpage for details.
 </p><p>The conf commands are:
 </p><table class="simplelist" border="0" summary="Simple list"><tr><td>net conf list - Dump the complete configuration in smb.conf like
 format.</td></tr><tr><td>net conf import - Import configuration from file in smb.conf
 format.</td></tr><tr><td>net conf listshares - List the registry shares.</td></tr><tr><td>net conf drop - Delete the complete configuration from
-registry.</td></tr><tr><td>net conf showshare - Show the definition of a registry share.</td></tr><tr><td>net conf addshare - Create a new registry share.</td></tr><tr><td>net conf delshare - Delete a registry share.</td></tr><tr><td>net conf setparm - Store a parameter.</td></tr><tr><td>net conf getparm - Retrieve the value of a parameter.</td></tr><tr><td>net conf delparm - Delete a parameter.</td></tr></table><p>
-</p><div class="refsect3" lang="en"><a name="id2527195"></a><h4>CONF LIST</h4><p>
+registry.</td></tr><tr><td>net conf showshare - Show the definition of a registry share.</td></tr><tr><td>net conf addshare - Create a new registry share.</td></tr><tr><td>net conf delshare - Delete a registry share.</td></tr><tr><td>net conf setparm - Store a parameter.</td></tr><tr><td>net conf getparm - Retrieve the value of a parameter.</td></tr><tr><td>net conf delparm - Delete a parameter.</td></tr><tr><td>net conf getincludes - Show the includes of a share definition.</td></tr><tr><td>net conf setincludes - Set includes for a share.</td></tr><tr><td>net conf delincludes - Delete includes from a share definition.</td></tr></table><p>
+</p><div class="refsect3" lang="en"><a name="id2527222"></a><h4>CONF LIST</h4><p>
 Print the configuration data stored in the registry in a smb.conf-like format to
 standard output.
-</p></div><div class="refsect3" lang="en"><a name="id2527207"></a><h4>CONF IMPORT <em class="replaceable"><code>[--test|-T]</code></em> <em class="replaceable"><code>filename</code></em> <em class="replaceable"><code>[section]</code></em></h4><p>
+</p></div><div class="refsect3" lang="en"><a name="id2527234"></a><h4>CONF IMPORT <em class="replaceable"><code>[--test|-T]</code></em> <em class="replaceable"><code>filename</code></em> <em class="replaceable"><code>[section]</code></em></h4><p>
 This command imports configuration from a file in smb.conf format.
 If a section encountered in the input file is present in registry,
 its contents is replaced. Sections of registry configuration that have
@@ -385,32 +387,53 @@ Optionally, a section may be specified to restrict the effect of the
 import command to that specific section. A test mode is enabled by specifying
 the parameter "-T" on the commandline. In test mode, no changes are made to the
 registry, and the resulting configuration is printed to standard output instead.
-</p></div><div class="refsect3" lang="en"><a name="id2527237"></a><h4>CONF LISTSHARES</h4><p>
+</p></div><div class="refsect3" lang="en"><a name="id2527264"></a><h4>CONF LISTSHARES</h4><p>
 List the names of the shares defined in registry.
-</p></div><div class="refsect3" lang="en"><a name="id2527248"></a><h4>CONF DROP</h4><p>
+</p></div><div class="refsect3" lang="en"><a name="id2527275"></a><h4>CONF DROP</h4><p>
 Delete the complete configuration data from registry.
-</p></div><div class="refsect3" lang="en"><a name="id2527259"></a><h4>CONF SHOWSHARE <em class="replaceable"><code>sharename</code></em></h4><p>
+</p></div><div class="refsect3" lang="en"><a name="id2527286"></a><h4>CONF SHOWSHARE <em class="replaceable"><code>sharename</code></em></h4><p>
 Show the definition of the share or section specified. It is valid to specify
 "global" as sharename to retrieve the global configuration options from
 registry.
-</p></div><div class="refsect3" lang="en"><a name="id2527274"></a><h4>CONF ADDSHARE <em class="replaceable"><code>sharename</code></em> <em class="replaceable"><code>path</code></em> [<em class="replaceable"><code>writeable={y|N}</code></em> [<em class="replaceable"><code>guest_ok={y|N}</code></em> [<em class="replaceable"><code>comment</code></em>]]] </h4><p>Create a new share definition in registry.
+</p></div><div class="refsect3" lang="en"><a name="id2527301"></a><h4>CONF ADDSHARE <em class="replaceable"><code>sharename</code></em> <em class="replaceable"><code>path</code></em> [<em class="replaceable"><code>writeable={y|N}</code></em> [<em class="replaceable"><code>guest_ok={y|N}</code></em> [<em class="replaceable"><code>comment</code></em>]]] </h4><p>Create a new share definition in registry.
 The sharename and path have to be given. The share name may
 <span class="emphasis"><em>not</em></span> be "global". Optionally, values for the very
 common options "writeable", "guest ok" and a "comment" may be specified.
 The same result may be obtained by a sequence of "net conf setparm"
 commands.
-</p></div><div class="refsect3" lang="en"><a name="id2527311"></a><h4>CONF DELSHARE <em class="replaceable"><code>sharename</code></em></h4><p>
+</p></div><div class="refsect3" lang="en"><a name="id2527337"></a><h4>CONF DELSHARE <em class="replaceable"><code>sharename</code></em></h4><p>
 Delete a share definition from registry.
-</p></div><div class="refsect3" lang="en"><a name="id2527324"></a><h4>CONF SETPARM <em class="replaceable"><code>section</code></em> <em class="replaceable"><code>parameter</code></em> <em class="replaceable"><code>value</code></em></h4><p>
+</p></div><div class="refsect3" lang="en"><a name="id2527351"></a><h4>CONF SETPARM <em class="replaceable"><code>section</code></em> <em class="replaceable"><code>parameter</code></em> <em class="replaceable"><code>value</code></em></h4><p>
 Store a parameter in registry. The section may be global or a sharename.
 The section is created if it does not exist yet.
-</p></div><div class="refsect3" lang="en"><a name="id2527345"></a><h4>CONF GETPARM <em class="replaceable"><code>section</code></em> <em class="replaceable"><code>parameter</code></em></h4><p>
+</p></div><div class="refsect3" lang="en"><a name="id2527372"></a><h4>CONF GETPARM <em class="replaceable"><code>section</code></em> <em class="replaceable"><code>parameter</code></em></h4><p>
 Show a parameter stored in registry.
-</p></div><div class="refsect3" lang="en"><a name="id2527362"></a><h4>CONF DELPARM <em class="replaceable"><code>section</code></em> <em class="replaceable"><code>parameter</code></em></h4><p>
+</p></div><div class="refsect3" lang="en"><a name="id2527389"></a><h4>CONF DELPARM <em class="replaceable"><code>section</code></em> <em class="replaceable"><code>parameter</code></em></h4><p>
 Delete a parameter stored in registry.
-</p></div><div class="refsect3" lang="en"><a name="id2527379"></a><h4></h4><p>
-</p></div></div><div class="refsect2" lang="en"><a name="id2527388"></a><h3>HELP [COMMAND]</h3><p>Gives usage information for the specified command.</p></div></div><div class="refsect1" lang="en"><a name="id2527400"></a><h2>VERSION</h2><p>This man page is complete for version 3.0 of the Samba 
-	suite.</p></div><div class="refsect1" lang="en"><a name="id2527411"></a><h2>AUTHOR</h2><p>The original Samba software and related utilities 
+</p></div><div class="refsect3" lang="en"><a name="id2527405"></a><h4>CONF GETINCLUDES <em class="replaceable"><code>section</code></em></h4><p>
+Get the list of includes for the provided section (global or share).
+</p><p>
+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.
+</p><p>
+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.
+</p></div><div class="refsect3" lang="en"><a name="id2527441"></a><h4>CONF SETINCLUDES <em class="replaceable"><code>section</code></em> [<em class="replaceable"><code>filename</code></em>]+</h4><p>
+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.
+</p></div><div class="refsect3" lang="en"><a name="id2527461"></a><h4>CONF DELINCLUDES <em class="replaceable"><code>section</code></em></h4><p>
+Delete the list of includes from the provided section (global or share).
+</p></div></div><div class="refsect2" lang="en"><a name="id2527476"></a><h3>HELP [COMMAND]</h3><p>Gives usage information for the specified command.</p></div></div><div class="refsect1" lang="en"><a name="id2527488"></a><h2>VERSION</h2><p>This man page is complete for version 3 of the Samba 
+	suite.</p></div><div class="refsect1" lang="en"><a name="id2527499"></a><h2>AUTHOR</h2><p>The original Samba software and related utilities 
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar 
 	to the way the Linux kernel is developed.</p><p>The net manpage was written by Jelmer Vernooij.</p></div></div></body></html>