From a2e3ba6e1281a7d3693173679ec7fb28898df319 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 12 Aug 2003 17:36:25 +0000 Subject: Merge over book changes into 3_0 CVS (This used to be commit d8fe4a81fb0d4972b2331b3d5fc4890244b44c33) --- docs/docbook/global.ent | 72 +++++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 29 deletions(-) (limited to 'docs/docbook/global.ent') diff --git a/docs/docbook/global.ent b/docs/docbook/global.ent index bb1e586cb8..4eb652a92a 100644 --- a/docs/docbook/global.ent +++ b/docs/docbook/global.ent @@ -12,7 +12,7 @@ JelmerVernooijR. +JelmerR.VernooijR. The Samba Team
jelmer@samba.org
@@ -57,14 +57,14 @@ '> - +JimMcDonough IBM
jmcd@us.ibm.com
- -'> + '> + +&person.jmcd;'> @@ -75,6 +75,15 @@ '> + + DavidBannon + + Samba Team +
dbannon@samba.org
+ +'> + RafalSzczesniak @@ -149,9 +158,8 @@ 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 in the -smb.conf(5) file. +override the log level parameter +in the &smb.conf; file. '> @@ -163,8 +171,7 @@ configuration details required by the server. The information in this file includes server-specific information such as what printcap file to use, as well as descriptions of all the services that the server is -to provide. See -smb.conf(5) for more information. +to provide. See &smb.conf; for more information. The default configuration file name is determined at compile time. '> @@ -241,15 +248,13 @@ being on a locally connected subnet. If this parameter is not set then the name resolve order -defined in the smb.conf -5 file parameter -(name resolve order) will be used. +defined in the &smb.conf; file parameter +(name resolve order) 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 -5 file, the name resolution methods -will be attempted in this order. +this parameter or any entry in the name resolve order parameter of the &smb.conf; file, the name +resolution methods will be attempted in this order. '> -n <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 -5 file. However, a command +to setting the netbios name parameter in the &smb.conf; file. +However, a command line setting will take precedence over settings in -smb.conf -5. +&smb.conf;. '> -O socket options TCP socket options to set on the client socket. See the socket options parameter in -the smb.conf -5 manual page for the list of valid +the &smb.conf; manual page for the list of valid options. '> @@ -317,12 +319,14 @@ this parameter is specified, the client will request a password. '> + + --U|--user=username[%password] +-U|--user=username[&pct;password] Sets the SMB username or username and password. -If %password is not specified, the user will be prompted. The +If &pct;password is not specified, the user will be prompted. The client will first check the USER environment variable, then the LOGNAME variable and if either exists, the string is uppercased. If these environmental variables are not @@ -435,13 +439,12 @@ an Active Directory environment. - + - @@ -507,7 +510,18 @@ an Active Directory environment. - + + Currently NOT implemented."> root# "> +$ "> +C:\> "> + + + + + + + + -- cgit