The branch, master has been updated via 3ecbe8c docs-xml: fix use of <smbconfoption> tag (fix bug #9345) from 73fa347 s3:smbd:smb2: fix a comment typo in the crediting code.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 3ecbe8c83a003825fc58f6dcb9e02a35aad2d86e Author: Björn Baumbach <b...@sernet.de> Date: Fri Nov 2 10:25:27 2012 +0100 docs-xml: fix use of <smbconfoption> tag (fix bug #9345) Signed-off-by: Björn Baumbach <b...@sernet.de> Reviewed-by: Karolin Seeger <k...@samba.org> Autobuild-User(master): Karolin Seeger <ksee...@samba.org> Autobuild-Date(master): Fri Nov 2 12:37:42 CET 2012 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: docs-xml/build/DTD/samba.entities | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities index f5d8cd2..c7e46c2 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> -- Samba Shared Repository