merge from HEAD

(This used to be commit c0ca286e36d49deba6c73690114b0d867cbfd63e)

1 files changed, 23 insertions, 25 deletions

diff --git a/docs/manpages/smbsh.1 b/docs/manpages/smbsh.1
index 774607c3a2..b2eec12c81 100644
--- a/docs/manpages/smbsh.1
+++ b/docs/manpages/smbsh.1
@@ -1,17 +1,18 @@
-.\" This manpage has been automatically generated by docbook2man-spec
-.\" from a DocBook document.  docbook2man-spec can be found at:
-.\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
+.\" This manpage has been automatically generated by docbook2man 
+.\" from a DocBook document.  This tool can be found at:
+.\" <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" "08 May 2002" "" ""
+.TH "SMBSH" "1" "01 October 2002" "" ""
 .SH NAME
 smbsh \- Allows access to Windows NT filesystem  using UNIX commands
 .SH SYNOPSIS
-.sp
-\fBsmbsh\fR [ \fB-W workgroup\fR ]  [ \fB-U username\fR ]  [ \fB-P prefix\fR ]  [ \fB-R <name resolve order>\fR ]  [ \fB-d <debug level>\fR ]  [ \fB-l logfile\fR ]  [ \fB-L libdir\fR ] 
+
+\fBsmbsh\fR [ \fB-W workgroup\fR ] [ \fB-U username\fR ] [ \fB-P prefix\fR ] [ \fB-R <name resolve order>\fR ] [ \fB-d <debug level>\fR ] [ \fB-l logfile\fR ] [ \fB-L libdir\fR ]
+
 .SH "DESCRIPTION"
 .PP
-This tool is part of the  Sambasuite.
+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 
@@ -28,7 +29,7 @@ servers.
 \fB-U username[%pass]\fR
 Sets the SMB username or username and password.
 If this option is not specified, the user will be prompted for 
-both the username and the password. If %pass is not specified, 
+both the username and the password.  If %pass is not specified, 
 the user will be prompted for the password.
 .TP
 \fB-P prefix\fR
@@ -62,14 +63,14 @@ 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
-\fRfile). Note that this method is only used 
+\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 
+\fIwins server\fR parameter.  If no 
 WINS server has been specified this method will be 
 ignored.
 .TP 0.2i
@@ -81,18 +82,16 @@ 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
-.PP
+
 If this parameter is not set then the name resolve order 
-defined in the \fIsmb.conf\fR file parameter 
+defined in the \fIsmb.conf\fR file parameter  
 (name resolve order) will be used. 
-.PP
-.PP
+
 The default order is lmhosts, host, wins, bcast. Without 
 this parameter or any entry in the \fIname resolve order
-\fRparameter of the \fIsmb.conf\fR 
+\fR parameter of the \fIsmb.conf\fR 
 file, the name resolution methods will be attempted in this 
 order. 
-.PP
 .TP
 \fB-d <debug level>\fR
 debug level is an integer from 0 to 10.
@@ -107,7 +106,7 @@ about the activities of \fBnmblookup\fR. At level
 \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 
+\fR. If not specified then all messages will be 
 written to\fIstderr\fR.
 .TP
 \fB-L libdir\fR
@@ -120,24 +119,23 @@ To use the \fBsmbsh\fR command, execute \fB smbsh\fR from the prompt and enter t
 that authenticates you to the machine running the Windows NT 
 operating system.
 .PP
-.sp
+
 .nf
 	system% \fBsmbsh\fR
 	Username: \fBuser\fR
 	Password: \fBXXXXXXX\fR
 	
-.sp
 .fi
 .PP
 Any dynamically linked command you execute from 
 this shell will access the \fI/smb\fR directory 
 using the smb protocol. For example, the command \fBls /smb
-\fRwill show a list of workgroups. The command 
+\fR will show a list of workgroups. The command 
 \fBls /smb/MYGROUP \fR will show all the machines in 
-the workgroup MYGROUP. The command 
+the  workgroup MYGROUP. The command 
 \fBls /smb/MYGROUP/<machine-name>\fR will show the share 
 names for that machine. You could then, for example, use the \fB cd\fR command to change directories, \fBvi\fR to 
-edit files, and \fBrcp\fR to copy files.
+edit files, and \fBrcp\fR  to copy files.
 .SH "VERSION"
 .PP
 This man page is correct for version 2.2 of 
@@ -147,7 +145,7 @@ the Samba suite.
 \fBsmbsh\fR works by intercepting the standard 
 libc calls with the dynamically loaded versions in \fI smbwrapper.o\fR. Not all calls have been "wrapped", so 
 some programs may not function correctly under \fBsmbsh
-\fR\&.
+\fR.
 .PP
 Programs which are not dynamically linked cannot make 
 use of \fBsmbsh\fR's functionality. Most versions 
@@ -155,7 +153,7 @@ of UNIX have a \fBfile\fR command that will
 describe how a program was linked.
 .SH "SEE ALSO"
 .PP
-\fBsmbd(8)\fR, 
+\fBsmbd(8)\fR 
 smb.conf(5)
 .SH "AUTHOR"
 .PP
@@ -168,5 +166,5 @@ 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 
-release by Jeremy Allison. The conversion to DocBook for 
+release by Jeremy Allison.  The conversion to DocBook for 
 Samba 2.2 was done by Gerald Carter