summaryrefslogtreecommitdiff
path: root/docs-xml
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2012-11-02 10:25:27 +0100
committerKarolin Seeger <kseeger@samba.org>2012-11-02 12:37:42 +0100
commit3ecbe8c83a003825fc58f6dcb9e02a35aad2d86e (patch)
treea688ccd13c0603a8b91ae9140e9507913aa1717c /docs-xml
parent73fa347507e6b551205725abd276b03b7e1f934c (diff)
downloadsamba-3ecbe8c83a003825fc58f6dcb9e02a35aad2d86e.tar.gz
samba-3ecbe8c83a003825fc58f6dcb9e02a35aad2d86e.tar.bz2
samba-3ecbe8c83a003825fc58f6dcb9e02a35aad2d86e.zip
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
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/build/DTD/samba.entities13
1 files changed, 8 insertions, 5 deletions
diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities
index f5d8cd2d33..c7e46c206f 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 &lt;primary NetBIOS name&gt;</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>