1 files changed, 86 insertions, 12 deletions
diff --git a/docs/manpages/smbsh.1 b/docs/manpages/smbsh.1
index 0f7ed1d290..06d27090db 100644
--- a/docs/manpages/smbsh.1
+++ b/docs/manpages/smbsh.1
@@ -3,8 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBSH" "1" "30 March 2003" "" ""
-
+.TH "SMBSH" "1" "04 March 2003" "" ""
 .SH NAME
 smbsh \- Allows access to Windows NT filesystem  using UNIX commands
 .SH SYNOPSIS
@@ -13,7 +12,7 @@ smbsh \- Allows access to Windows NT filesystem  using UNIX commands
 
 .SH "DESCRIPTION"
 .PP
-This tool is part of the \fBSamba\fR(7) suite.
+This tool is part of the  Samba suite.
 .PP
 \fBsmbsh\fR allows you to access an NT filesystem 
 using UNIX commands such as \fBls\fR, \fB egrep\fR, and \fBrcp\fR. You must use a 
@@ -23,7 +22,7 @@ to work correctly.
 .TP
 \fB-W WORKGROUP\fR
 Override the default workgroup specified in the 
-workgroup parameter of the \fBsmb.conf\fR(5) file 
+workgroup parameter of the \fIsmb.conf\fR file 
 for this session. This may be needed to connect to some 
 servers. 
 .TP
@@ -39,6 +38,77 @@ the user to set the directory prefix for SMB access. The
 default value if this option is not specified is 
 \fBsmb\fR.
 .TP
+\fB-R <name resolve order>\fR
+This option is used to determine what naming 
+services and in what order to resolve 
+host names to IP addresses. The option takes a space-separated 
+string of different name resolution options.
+
+The options are :"lmhosts", "host", "wins" and "bcast". 
+They cause names to be resolved as follows :
+.RS
+.TP 0.2i
+\(bu
+lmhosts : 
+Lookup an IP address in the Samba lmhosts file. If the 
+line in lmhosts has no name type attached to the 
+NetBIOS name 
+(see the lmhosts(5)
+for details) then any name type matches for lookup.
+.TP 0.2i
+\(bu
+host : 
+Do a standard host name to IP address resolution, using
+the system \fI/etc/hosts\fR, NIS, or DNS
+lookups. This method of name resolution is operating 
+system dependent, for instance on IRIX or Solaris this 
+may be controlled by the \fI/etc/nsswitch.conf
+\fR file).  Note that this method is only used 
+if the NetBIOS name type being queried is the 0x20 
+(server) name type, otherwise it is ignored.
+.TP 0.2i
+\(bu
+wins : 
+Query a name with the IP address listed in the 
+\fIwins server\fR parameter.  If no 
+WINS server has been specified this method will be 
+ignored.
+.TP 0.2i
+\(bu
+bcast : 
+Do a broadcast on each of the known local interfaces 
+listed in the \fIinterfaces\fR
+parameter. This is the least reliable of the name 
+resolution methods as it depends on the target host 
+being on a locally connected subnet.
+.RE
+
+If this parameter is not set then the name resolve order 
+defined in the \fIsmb.conf\fR file parameter  
+(name resolve order) will be used. 
+
+The default order is lmhosts, host, wins, bcast. Without 
+this parameter or any entry in the \fIname resolve order
+\fR parameter of the \fIsmb.conf\fR 
+file, the name resolution methods will be attempted in this 
+order. 
+.TP
+\fB-d <debug level>\fR
+debug level is an integer from 0 to 10.
+
+The default value if this parameter is not specified
+is zero.
+
+The higher this value, the more detail will be logged
+about the activities of \fBnmblookup\fR. At level
+0, only critical errors and serious warnings will be logged.
+.TP
+\fB-l logfilename\fR
+If specified causes all debug messages to be
+written to the file specified by \fIlogfilename
+\fR. If not specified then all messages will be 
+written to\fIstderr\fR.
+.TP
 \fB-L libdir\fR
 This parameter specifies the location of the 
 shared libraries used by \fBsmbsh\fR. The default
@@ -48,11 +118,13 @@ value is specified at compile time.
 To use the \fBsmbsh\fR command, execute \fB smbsh\fR from the prompt and enter the username and password 
 that authenticates you to the machine running the Windows NT 
 operating system.
+.PP
 
 .nf
-system% \fBsmbsh\fR
-Username: \fBuser\fR
-Password: \fBXXXXXXX\fR
+	system% \fBsmbsh\fR
+	Username: \fBuser\fR
+	Password: \fBXXXXXXX\fR
+	
 .fi
 .PP
 Any dynamically linked command you execute from 
@@ -66,7 +138,8 @@ names for that machine. You could then, for example, use the \fB cd\fR command t
 edit files, and \fBrcp\fR  to copy files.
 .SH "VERSION"
 .PP
-This man page is correct for version 3.0 of the Samba suite.
+This man page is correct for version 3.0 of 
+the Samba suite.
 .SH "BUGS"
 .PP
 \fBsmbsh\fR works by intercepting the standard 
@@ -80,7 +153,8 @@ of UNIX have a \fBfile\fR command that will
 describe how a program was linked.
 .SH "SEE ALSO"
 .PP
-\fBsmbd\fR(8), \fBsmb.conf\fR(5)
+\fBsmbd(8)\fR 
+smb.conf(5)
 .SH "AUTHOR"
 .PP
 The original Samba software and related utilities 
@@ -90,7 +164,7 @@ to the way the Linux kernel is developed.
 .PP
 The original Samba man pages were written by Karl Auer. 
 The man page sources were converted to YODL format (another 
-excellent piece of Open Source software, available at  ftp://ftp.icce.rug.nl/pub/unix/ <URL:ftp://ftp.icce.rug.nl/pub/unix/>) and updated for the Samba 2.0 
+excellent piece of Open Source software, available at
+ftp://ftp.icce.rug.nl/pub/unix/ <URL:ftp://ftp.icce.rug.nl/pub/unix/>) and updated for the Samba 2.0 
 release by Jeremy Allison.  The conversion to DocBook for 
-Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2
-for Samba 3.0 was done by Alexander Bokovoy.
+Samba 2.2 was done by Gerald Carter