The branch, v3-0-test has been updated via 2cbe492aac2103bacd6554a0759d76153cf27235 (commit) from 92d067497c60c5eab43bae11e6c1236e6cf760bb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log ----------------------------------------------------------------- commit 2cbe492aac2103bacd6554a0759d76153cf27235 Author: Alexander Bokovoy <[EMAIL PROTECTED]> Date: Sat May 31 11:07:44 2008 +0400 Fix use of smbconfoption in samba.entities. During documentation migration to git my fixes to samba.entities got lost. Update them now from latest working version (from samba-web). ----------------------------------------------------------------------- Summary of changes: docs-xml/build/DTD/samba.entities | 10 +++++----- 1 files changed, 5 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 2e924d4..e34fbda 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,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 <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