diff options
| author | Björn Baumbach <bb@sernet.de> | 2012-11-02 10:25:27 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2012-12-14 10:01:36 +0100 |
| commit | ea35034eb147748a6468abe1041dba2a44cca773 (patch) | |
| tree | ba11222aff654d05fee9730ba9302ae91f663559 | |
| parent | 18d9c35ec1afe7c819578e6fb2dffa6a46ba062d (diff) | |
| download | samba-ea35034eb147748a6468abe1041dba2a44cca773.tar.gz | |
docs-xml: fix use of <smbconfoption> tag (fix bug #9345)
Signed-off-by: Björn Baumbach <bb@sernet.de>
Reviewed-by: Karolin Seeger <ks@samba.org>
Autobuild-User(master): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(master): Fri Nov 2 12:37:42 CET 2012 on sn-devel-104
(cherry picked from commit 3ecbe8c83a003825fc58f6dcb9e02a35aad2d86e)
Autobuild-User(v4-0-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-0-test): Mon Nov 5 13:09:12 CET 2012 on sn-devel-104
(cherry picked from commit 6195cb667b1c162436bfbf5d4f499bdc776f83b4)
(cherry picked from commit a6dea8e6556bd5e391cd709b86664fb7cc34433a)
(cherry picked from commit 9a8d7ab3773e1d4d1981f8b45998d689180a4cbf)
| -rw-r--r-- | docs-xml/build/DTD/samba.entities | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities index f5d8cd2d332..c7e46c206f8 100644 --- a/docs-xml/build/DTD/samba.entities +++ b/docs-xml/build/DTD/samba.entities @@ -180,7 +180,7 @@ use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic.</para> <para>Note that specifying this parameter here will -override the <smbconfoption><name>log level</name></smbconfoption> parameter +override the <smbconfoption name="log level" /> parameter in the &smb.conf; file.</para> </listitem> </varlistentry>'> @@ -207,7 +207,7 @@ use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic.</para> <para>Note that specifying this parameter here will -override the <smbconfoption><name>log level</name></smbconfoption> parameter +override the <smbconfoption name="log level" /> parameter in the &smb.conf; file.</para> </listitem> </varlistentry>'> @@ -297,11 +297,13 @@ being on a locally connected subnet. <para>If this parameter is not set then the name resolve order defined in the &smb.conf; file parameter -(<smbconfoption><name>name resolve order</name></smbconfoption>) will be used. +(<smbconfoption name="name resolve order" />) will be used. </para> <para>The default order is lmhosts, host, wins, bcast. Without -this parameter or any entry in the <smbconfoption><name>name resolve order</name></smbconfoption> parameter of the &smb.conf; file, the name +this parameter or any entry in the +<smbconfoption name="name resolve order" /> parameter of +the &smb.conf; file, the name resolution methods will be attempted in this order. </para></listitem> </varlistentry>'> @@ -310,7 +312,8 @@ resolution methods will be attempted in this order. </para></listitem> <term>-n|--netbiosname <primary NetBIOS name></term> <listitem><para>This option allows you to override the NetBIOS name that Samba uses for itself. This is identical -to setting the <smbconfoption><name>netbios name</name></smbconfoption> parameter in the &smb.conf; file. +to setting the <smbconfoption name="netbios name" /> parameter in +the &smb.conf; file. However, a command line setting will take precedence over settings in &smb.conf;.</para></listitem> |