From cbd160ae1c5acad52d1baf7badfa60721a9b3bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= Date: Fri, 2 Nov 2012 10:25:27 +0100 Subject: [PATCH] docs-xml: fix use of tag (fix bug #9345) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Baumbach --- 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 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. Note that specifying this parameter here will -override the log level parameter +override the parameter in the &smb.conf; file. '> @@ -207,7 +207,7 @@ use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic. Note that specifying this parameter here will -override the log level parameter +override the parameter in the &smb.conf; file. '> @@ -297,11 +297,13 @@ being on a locally connected subnet. If this parameter is not set then the name resolve order defined in the &smb.conf; file parameter -(name resolve order) will be used. +() will be used. The default order is lmhosts, host, wins, bcast. Without -this parameter or any entry in the name resolve order parameter of the &smb.conf; file, the name +this parameter or any entry in the + parameter of +the &smb.conf; file, the name resolution methods will be attempted in this order. '> @@ -310,7 +312,8 @@ resolution methods will be attempted in this order. -n|--netbiosname <primary NetBIOS name> This option allows you to override the NetBIOS name that Samba uses for itself. This is identical -to setting the netbios name parameter in the &smb.conf; file. +to setting the parameter in +the &smb.conf; file. However, a command line setting will take precedence over settings in &smb.conf;. -- 1.7.8.6