diff options
| author | Michael Adam <obnox@samba.org> | 2007-06-26 08:11:40 +0000 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-04-23 08:47:34 -0500 |
| commit | 028979a3ba9e74dbd347c270ce9d39978cab088c (patch) | |
| tree | ffe631e9f01a7b7ac48f04cf76bd4d8f26057ba3 /docs/smbdotconf | |
| parent | 31e61423b9f7b708dcb79b7932b9c3d582988d5f (diff) | |
| download | samba-028979a3ba9e74dbd347c270ce9d39978cab088c.tar.gz samba-028979a3ba9e74dbd347c270ce9d39978cab088c.tar.bz2 samba-028979a3ba9e74dbd347c270ce9d39978cab088c.zip | |
Fix a couple of tags.
It is a little cumbersome for me to debug my manpage-sourcecode
since I can only see useful output once It is on
http://samba.org/~samba-bugs/docs/ ... :-/
(I have not yet come across a system that can produce readable
manpage output from the source.)
Michael
(This used to be commit 727017fe04dfa35774fd02ffe0ea0b819146bfac)
Diffstat (limited to 'docs/smbdotconf')
| -rw-r--r-- | docs/smbdotconf/misc/include.xml | 5 | ||||
| -rw-r--r-- | docs/smbdotconf/misc/registryshares.xml | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/docs/smbdotconf/misc/include.xml b/docs/smbdotconf/misc/include.xml index 84e20dff89..d8179ef1b0 100644 --- a/docs/smbdotconf/misc/include.xml +++ b/docs/smbdotconf/misc/include.xml @@ -15,9 +15,10 @@ </para> <para> - The parameter <parameter>include = registry</parameter> has + Since Samba version 3.0.26, setting + <smbconfoption name="include">registry</smbconfoption> has a special meaning: It does <emphasis>not</emphasis> include - a file named <term>registry</term> from the current working + a file named <emphasis>registry</emphasis> 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 diff --git a/docs/smbdotconf/misc/registryshares.xml b/docs/smbdotconf/misc/registryshares.xml index 5557661998..0295c5c85c 100644 --- a/docs/smbdotconf/misc/registryshares.xml +++ b/docs/smbdotconf/misc/registryshares.xml @@ -6,7 +6,7 @@ <description> <para> This turns on or off support for share definitions read from - registry. Shares in defined in <term>smb.conf</term> take + registry. Shares in 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. |