[SCM] Samba Website Repository - branch master updated
Karolin Seeger
kseeger at samba.org
Wed Nov 14 03:09:44 MST 2012
The branch, master has been updated
via 822aa62 DTD/samba.entities: Fix usage of <smbconfoption>.
from 5ab7e00 Announce Samba 4.0.0rc5.
http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 822aa62ea412c37f3589ec540921962f41b10890
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Nov 14 11:09:56 2012 +0100
DTD/samba.entities: Fix usage of <smbconfoption>.
See https://bugzilla.samba.org/show_bug.cgi?id=9345 for details.
Karolin
-----------------------------------------------------------------------
Summary of changes:
DTD/samba.entities | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/DTD/samba.entities b/DTD/samba.entities
index d204156..a14192a 100644
--- a/DTD/samba.entities
+++ b/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,11 @@ 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 +310,7 @@ 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>
--
Samba Website Repository
More information about the samba-cvs
mailing list