merge from HEAD

(This used to be commit c0ca286e36d49deba6c73690114b0d867cbfd63e)

1 files changed, 38 insertions, 37 deletions

diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8
index 83483c8835..7e1b35d5aa 100644
--- a/docs/manpages/smbd.8
+++ b/docs/manpages/smbd.8
@@ -1,14 +1,15 @@
-.\" 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 "SMBD" "8" "08 May 2002" "" ""
+.TH "SMBD" "8" "01 October 2002" "" ""
 .SH NAME
 smbd \- server to provide SMB/CIFS services to clients
 .SH SYNOPSIS
-.sp
-\fBsmbd\fR [ \fB-D\fR ]  [ \fB-a\fR ]  [ \fB-i\fR ]  [ \fB-o\fR ]  [ \fB-P\fR ]  [ \fB-h\fR ]  [ \fB-V\fR ]  [ \fB-b\fR ]  [ \fB-d <debug level>\fR ]  [ \fB-l <log directory>\fR ]  [ \fB-p <port number>\fR ]  [ \fB-O <socket option>\fR ]  [ \fB-s <configuration file>\fR ] 
+
+\fBsmbd\fR [ \fB-D\fR ] [ \fB-a\fR ] [ \fB-i\fR ] [ \fB-o\fR ] [ \fB-P\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-b\fR ] [ \fB-d <debug level>\fR ] [ \fB-l <log directory>\fR ] [ \fB-p <port number>\fR ] [ \fB-O <socket option>\fR ] [ \fB-s <configuration file>\fR ]
+
 .SH "DESCRIPTION"
 .PP
 This program is part of the Samba suite.
@@ -18,7 +19,7 @@ provides filesharing and printing services to Windows clients.
 The server provides filespace and printer services to
 clients using the SMB (or CIFS) protocol. This is compatible 
 with the LanManager protocol, and can service LanManager 
-clients. These include MSCLIENT 3.0 for DOS, Windows for 
+clients.  These include MSCLIENT 3.0 for DOS, Windows for 
 Workgroups, Windows 95/98/ME, Windows NT, Windows 2000, 
 OS/2, DAVE for Macintosh, and smbfs for Linux.
 .PP
@@ -26,12 +27,12 @@ An extensive description of the services that the
 server can provide is given in the man page for the 
 configuration file controlling the attributes of those 
 services (see \fIsmb.conf(5)
-\fR. This man page will not describe the 
+\fR  This man page will not describe the 
 services, but will concentrate on the administrative aspects 
 of running the server.
 .PP
 Please note that there are significant security 
-implications to running this server, and the \fIsmb.conf(5)\fR
+implications to running this server, and the \fIsmb.conf(5)\fR 
 manpage should be regarded as mandatory reading before 
 proceeding with installation.
 .PP
@@ -42,10 +43,10 @@ that session. When all connections from its client are closed,
 the copy of the server for that client terminates.
 .PP
 The configuration file, and any files that it includes, 
-are automatically reloaded every minute, if they change. You 
-can force a reload by sending a SIGHUP to the server. Reloading 
+are automatically reloaded every minute, if they change.  You 
+can force a reload by sending a SIGHUP to the server.  Reloading 
 the configuration file will not affect connections to any service 
-that is already established. Either the user will have to 
+that is already established.  Either the user will have to 
 disconnect from the service, or \fBsmbd\fR killed and restarted.
 .SH "OPTIONS"
 .TP
@@ -56,12 +57,12 @@ itself and runs in the background, fielding requests
 on the appropriate port. Operating the server as a
 daemon is the recommended way of running \fBsmbd\fR for 
 servers that provide more than casual use file and 
-print services. This switch is assumed if \fBsmbd
-\fRis executed on the command line of a shell.
+print services.  This switch is assumed if \fBsmbd
+\fR is executed on the command line of a shell.
 .TP
 \fB-a\fR
 If this parameter is specified, each new 
-connection will append log messages to the log file. 
+connection will append log messages to the log file.  
 This is the default.
 .TP
 \fB-i\fR
@@ -73,7 +74,7 @@ command line.
 .TP
 \fB-o\fR
 If this parameter is specified, the 
-log files will be overwritten when opened. By default, 
+log files will be overwritten when opened.  By default, 
 \fBsmbd\fR will append entries to the log 
 files.
 .TP
@@ -96,7 +97,7 @@ Samba was built.
 .TP
 \fB-d <debug level>\fR
 \fIdebuglevel\fR is an integer 
-from 0 to 10. The default value if this parameter is 
+from 0 to 10.  The default value if this parameter is 
 not specified is zero.
 
 The higher this value, the more detail will be 
@@ -114,7 +115,7 @@ data, most of which is extremely cryptic.
 
 Note that specifying this parameter here will 
 override the log
-levelfile.
+level file.
 .TP
 \fB-l <log directory>\fR
 If specified,
@@ -124,7 +125,7 @@ file will be created for informational and debug
 messages from the running server. The log 
 file generated is never removed by the server although 
 its size may be controlled by the max log size
-option in the \fI smb.conf(5)\fRfile. \fBBeware:\fR
+option in the \fI  smb.conf(5)\fR file. \fBBeware:\fR
 If the directory specified does not exist, \fBsmbd\fR
 will log to the default debug log location defined at compile time.
 
@@ -132,13 +133,13 @@ The default log directory is specified at
 compile time.
 .TP
 \fB-O <socket options>\fR
-See the socket options
+See the socket options 
 parameter in the \fIsmb.conf(5)
-\fRfile for details.
+\fR file for details.
 .TP
 \fB-p <port number>\fR
 \fIport number\fR is a positive integer 
-value. The default value if this parameter is not 
+value.  The default value if this parameter is not 
 specified is 139.
 
 This number is the port number that will be 
@@ -161,11 +162,11 @@ in the above situation.
 .TP
 \fB-s <configuration file>\fR
 The file specified contains the 
-configuration details required by the server. The 
+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 \fI smb.conf(5)\fRfor more information.
+to provide. See \fI  smb.conf(5)\fR for more information.
 The default configuration file name is determined at 
 compile time.
 .SH "FILES"
@@ -202,11 +203,11 @@ install this file are \fI/usr/samba/lib/smb.conf\fR
 and \fI/etc/smb.conf\fR.
 
 This file describes all the services the server 
-is to make available to clients. See  \fIsmb.conf(5)\fRfor more information.
+is to make available to clients. See   \fIsmb.conf(5)\fR for more information.
 .SH "LIMITATIONS"
 .PP
 On some systems \fBsmbd\fR cannot change uid back 
-to root after a setuid() call. Such systems are called 
+to root after a setuid() call.  Such systems are called 
 trapdoor uid systems. If you have such a system, 
 you will be unable to connect from a client (such as a PC) as 
 two different users at once. Attempts to connect the
@@ -224,21 +225,21 @@ is not specific to the server, however.
 .PP
 Samba uses PAM for authentication (when presented with a plaintext 
 password), for account checking (is this account disabled?) and for
-session management. The degree too which samba supports PAM is restricted
+session management.  The degree too which samba supports PAM is restricted
 by the limitations of the SMB protocol and the 
 obey pam restricions
-smb.conf paramater. When this is set, the following restrictions apply:
+smb.conf paramater.  When this is set, the following restrictions apply:
 .TP 0.2i
 \(bu
-\fBAccount Validation\fR: All acccesses to a 
+\fBAccount Validation\fR:  All acccesses to a 
 samba server are checked 
 against PAM to see if the account is vaild, not disabled and is permitted to 
-login at this time. This also applies to encrypted logins.
+login at this time.  This also applies to encrypted logins.
 .TP 0.2i
 \(bu
-\fBSession Management\fR: When not using share 
+\fBSession Management\fR:  When not using share 
 level secuirty, users must pass PAM's session checks before access 
-is granted. Note however, that this is bypassed in share level secuirty. 
+is granted.  Note however, that this is bypassed in share level secuirty.  
 Note also that some older pam configuration files may need a line 
 added for session support. 
 .SH "VERSION"
@@ -276,7 +277,7 @@ it to die on its own.
 .PP
 The debug log level of \fBsmbd\fR may be raised
 or lowered using \fBsmbcontrol(1)
-\fRprogram (SIGUSR[1|2] signals are no longer used in
+\fR program (SIGUSR[1|2] signals are no longer used in
 Samba 2.2). This is to allow transient problems to be diagnosed, 
 whilst still running at a normally low log level.
 .PP
@@ -289,10 +290,10 @@ them after, however this would affect performance.
 .SH "SEE ALSO"
 .PP
 hosts_access(5), \fBinetd(8)\fR, 
-\fBnmbd(8)\fR, 
+\fBnmbd(8)\fR 
 \fIsmb.conf(5)\fR
-, \fBsmbclient(1)
-\fR, and the Internet RFC's
+ \fBsmbclient(1)
+\fR and the Internet RFC's
 \fIrfc1001.txt\fR, \fIrfc1002.txt\fR. 
 In addition the CIFS (formerly SMB) specification is available 
 as a link from the Web page  
@@ -308,5 +309,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