- Patch from John to update PDC-HOWTO, add ServerType and CUPS (not finished yet)

- Regenerate docs
- Update docs-status
(This used to be commit adbb714ade8ab6f4e9b5d80f0f85041746c0edf1)

29 files changed, 658 insertions, 356 deletions

diff --git a/docs/manpages/findsmb.1 b/docs/manpages/findsmb.1
index c6abcaca5a..d45c3ab8fe 100644
--- a/docs/manpages/findsmb.1
+++ b/docs/manpages/findsmb.1
@@ -3,7 +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 "FINDSMB" "1" "18 March 2003" "" ""
+.TH "FINDSMB" "1" "24 March 2003" "" ""
 
 .SH NAME
 findsmb \- list info about machines that respond to SMB  name queries on a subnet
diff --git a/docs/manpages/lmhosts.5 b/docs/manpages/lmhosts.5
index f00c2e3547..76d48f8e1e 100644
--- a/docs/manpages/lmhosts.5
+++ b/docs/manpages/lmhosts.5
@@ -3,7 +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 "LMHOSTS" "5" "18 March 2003" "" ""
+.TH "LMHOSTS" "5" "24 March 2003" "" ""
 
 .SH NAME
 lmhosts \- The Samba NetBIOS hosts file
diff --git a/docs/manpages/net.8 b/docs/manpages/net.8
index 5720337de4..8ade7f5c4a 100644
--- a/docs/manpages/net.8
+++ b/docs/manpages/net.8
@@ -3,7 +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 "NET" "8" "18 March 2003" "" ""
+.TH "NET" "8" "24 March 2003" "" ""
 
 .SH NAME
 net \- Tool for administration of Samba and remote CIFS servers.
diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index d2d8635316..f5dfe5e5de 100644
--- a/docs/manpages/nmbd.8
+++ b/docs/manpages/nmbd.8
@@ -3,7 +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 "NMBD" "8" "18 March 2003" "" ""
+.TH "NMBD" "8" "24 March 2003" "" ""
 
 .SH NAME
 nmbd \- NetBIOS name server to provide NetBIOS  over IP naming services to clients
@@ -75,11 +75,6 @@ If specified, this parameter causes
 \fBnmbd\fR to log to standard output rather
 than a file.
 .TP
-\fB-a\fR
-If this parameter is specified, each new 
-connection will append log messages to the log file.  
-This is the default.
-.TP
 \fB-i\fR
 If this parameter is specified it causes the
 server to run "interactively", not as a daemon, even if the
@@ -89,15 +84,8 @@ command line. \fBnmbd\fR also logs to standard
 output, as if the -S parameter had been
 given. 
 .TP
-\fB-o\fR
-If this parameter is specified, the 
-log files will be overwritten when opened.  By default, 
-\fBsmbd\fR will append entries to the log 
-files.
-.TP
-\fB-h\fR
-Prints the help information (usage) 
-for \fBnmbd\fR.
+\fB-h|--help\fR
+Print a summary of command line options.
 .TP
 \fB-H <filename>\fR
 NetBIOS lmhosts file.  The lmhosts 
@@ -119,62 +107,81 @@ are \fI/usr/local/samba/lib/lmhosts\fR,
 .TP
 \fB-V\fR
 Prints the version number for 
-\fBnmbd\fR.
+\fBsmbd\fR.
 .TP
-\fB-d <debug level>\fR
-debuglevel is an integer 
+\fB-s <configuration file>\fR
+The file specified contains 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 \fIsmb.conf(5)\fR for more information.
+The default configuration file name is determined at 
+compile time.
+.TP
+\fB-d|--debug=debuglevel\fR
+\fIdebuglevel\fR 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 to the log files about the activities of the 
+The higher this value, the more detail will be 
+logged to the log files about the activities of the 
 server. At level 0, only critical errors and serious 
 warnings will be logged. Level 1 is a reasonable level for
 day to day running - it generates a small amount of 
 information about operations carried out.
 
-Levels above 1 will generate considerable amounts 
-of log data, and should only be used when investigating 
-a problem. Levels above 3 are designed for use only by developers 
-and generate HUGE amounts of log data, most of which is extremely 
-cryptic.
+Levels above 1 will generate considerable 
+amounts of log data, and should only be used when 
+investigating a problem. Levels above 3 are designed for 
+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 \fIlog level\fR 
-parameter in the \fBsmb.conf\fR(5) file.
+Note that specifying this parameter here will 
+override the log
+level file.
 .TP
-\fB-l <log directory>\fR
-The -l parameter specifies a directory 
-into which the "log.nmbd" log file will be created
-for operational data from the running \fBnmbd\fR
-server. The default log directory is compiled into Samba
-as part of the build process. Common defaults are \fI  /usr/local/samba/var/log.nmb\fR, \fI  /usr/samba/var/log.nmb\fR or
-\fI/var/log/log.nmb\fR.  \fBBeware:\fR
-If the directory specified does not exist, \fBnmbd\fR
-will log to the default debug log location defined at compile time.
+\fB-l|--logfile=logbasename\fR
+File name for log/debug files. The extension
+".client" will be appended. The log file is
+never removed by the client.
 .TP
 \fB-n <primary NetBIOS name>\fR
 This option allows you to override
-the NetBIOS name that Samba uses for itself. This is identical 
+the NetBIOS name that Samba uses for itself. This is identical
 to setting the \fINetBIOS
 name\fR parameter in the \fBsmb.conf\fR(5) file.  However, a command
-line setting will take precedence over settings in 
+line setting will take precedence over settings in
 \fBsmb.conf\fR(5).
 .TP
+\fB-i <scope>\fR
+This specifies a NetBIOS scope that
+\fBnmblookup\fR will use to communicate with when
+generating NetBIOS names. For details on the use of NetBIOS
+scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes are
+\fBvery\fR rarely used, only set this parameter
+if you are the system administrator in charge of all the
+NetBIOS systems you communicate with.
+.TP
+\fB-W|--workgroup=domain\fR
+Set the SMB domain of the username.   This
+overrides the default domain which is the domain defined in
+smb.conf.  If the domain specified is the same as the servers 
+NetBIOS name, it causes the client to log on using the servers local 
+SAM (as opposed to the Domain SAM). 
+.TP
+\fB-O socket options\fR
+TCP socket options to set on the client
+socket. See the socket options parameter in
+the \fBsmb.conf\fR(5) manual page for the list of valid
+options. 
+.TP
 \fB-p <UDP port number>\fR
 UDP port number is a positive integer value.
 This option changes the default UDP port number (normally 137)
 that \fBnmbd\fR responds to name queries on. Don't
 use this option unless you are an expert, in which case you
 won't need help!
-.TP
-\fB-s <configuration file>\fR
-The default configuration file name
-is set at build time, typically as \fI  /usr/local/samba/lib/smb.conf\fR, but
-this may be changed when Samba is autoconfigured.
-
-The file specified contains the configuration details
-required by the server. See \fBsmb.conf\fR(5) for more information.
 .SH "FILES"
 .TP
 \fB\fI/etc/inetd.conf\fB\fR
diff --git a/docs/manpages/nmblookup.1 b/docs/manpages/nmblookup.1
index 9ed1de8ade..653aa6f663 100644
--- a/docs/manpages/nmblookup.1
+++ b/docs/manpages/nmblookup.1
@@ -3,7 +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 "NMBLOOKUP" "1" "18 March 2003" "" ""
+.TH "NMBLOOKUP" "1" "24 March 2003" "" ""
 
 .SH NAME
 nmblookup \- NetBIOS over TCP/IP client used to lookup NetBIOS  names
@@ -53,8 +53,38 @@ in addition, if the \fBnmbd\fR(8) daemon is running on this machine it also bind
 Interpret \fIname\fR as 
 an IP Address and do a node status query on this address.
 .TP
-\fB-h\fR
-Print a help (usage) message.
+\fB-n <primary NetBIOS name>\fR
+This option allows you to override
+the NetBIOS name that Samba uses for itself. This is identical
+to setting the \fINetBIOS
+name\fR parameter in the \fBsmb.conf\fR(5) file.  However, a command
+line setting will take precedence over settings in
+\fBsmb.conf\fR(5).
+.TP
+\fB-i <scope>\fR
+This specifies a NetBIOS scope that
+\fBnmblookup\fR will use to communicate with when
+generating NetBIOS names. For details on the use of NetBIOS
+scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes are
+\fBvery\fR rarely used, only set this parameter
+if you are the system administrator in charge of all the
+NetBIOS systems you communicate with.
+.TP
+\fB-W|--workgroup=domain\fR
+Set the SMB domain of the username.   This
+overrides the default domain which is the domain defined in
+smb.conf.  If the domain specified is the same as the servers 
+NetBIOS name, it causes the client to log on using the servers local 
+SAM (as opposed to the Domain SAM). 
+.TP
+\fB-O socket options\fR
+TCP socket options to set on the client
+socket. See the socket options parameter in
+the \fBsmb.conf\fR(5) manual page for the list of valid
+options. 
+.TP
+\fB-h|--help\fR
+Print a summary of command line options.
 .TP
 \fB-B <broadcast address>\fR
 Send the query to the given broadcast address. Without 
@@ -69,37 +99,46 @@ host \fIunicast address\fR. This option
 (along with the \fI-R\fR option) is needed to 
 query a WINS server.
 .TP
-\fB-d <debuglevel>\fR
-debuglevel is an integer from 0 to 10.
-
-The default value if this parameter is not specified 
-is zero.
+\fB-V\fR
+Prints the version number for 
+\fBsmbd\fR.
+.TP
+\fB-s <configuration file>\fR
+The file specified contains 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 \fIsmb.conf(5)\fR for more information.
+The default configuration file name is determined at 
+compile time.
+.TP
+\fB-d|--debug=debuglevel\fR
+\fIdebuglevel\fR 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.
+The higher this value, the more detail will be 
+logged to the log files about the activities of the 
+server. At level 0, only critical errors and serious 
+warnings will be logged. Level 1 is a reasonable level for
+day to day running - it generates a small amount of 
+information about operations carried out.
 
-Levels above 1 will generate considerable amounts of 
-log data, and should only be used when investigating a problem. 
-Levels above 3 are designed for use only by developers and 
-generate HUGE amounts of data, most of which is extremely cryptic.
+Levels above 1 will generate considerable 
+amounts of log data, and should only be used when 
+investigating a problem. Levels above 3 are designed for 
+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 \fI  log level\fR parameter in the \fI  smb.conf(5)\fR file.
-.TP
-\fB-s <smb.conf>\fR
-This parameter specifies the pathname to 
-the Samba configuration file,   smb.conf(5)  This file controls all aspects of
-the Samba setup on the machine.
+Note that specifying this parameter here will 
+override the log
+level file.
 .TP
-\fB-i <scope>\fR
-This specifies a NetBIOS scope that
-\fBnmblookup\fR will use to communicate with when 
-generating NetBIOS names. For details on the use of NetBIOS 
-scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes are 
-\fBvery\fR rarely used, only set this parameter 
-if you are the system administrator in charge of all the 
-NetBIOS systems you communicate with.
+\fB-l|--logfile=logbasename\fR
+File name for log/debug files. The extension
+".client" will be appended. The log file is
+never removed by the client.
 .TP
 \fB-T\fR
 This causes any IP addresses found in the 
diff --git a/docs/manpages/pdbedit.8 b/docs/manpages/pdbedit.8
index dc236decf2..c5c8ba4aea 100644
--- a/docs/manpages/pdbedit.8
+++ b/docs/manpages/pdbedit.8
@@ -3,13 +3,13 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "PDBEDIT" "8" "18 March 2003" "" ""
+.TH "PDBEDIT" "8" "24 March 2003" "" ""
 
 .SH NAME
 pdbedit \- manage the SAM database
 .SH SYNOPSIS
 
-\fBpdbedit\fR [ \fB-l\fR ] [ \fB-v\fR ] [ \fB-w\fR ] [ \fB-u username\fR ] [ \fB-f fullname\fR ] [ \fB-h homedir\fR ] [ \fB-D drive\fR ] [ \fB-S script\fR ] [ \fB-p profile\fR ] [ \fB-a\fR ] [ \fB-m\fR ] [ \fB-x\fR ] [ \fB-i passdb-backend\fR ] [ \fB-e passdb-backend\fR ] [ \fB-b passdb-backend\fR ] [ \fB-d debuglevel\fR ] [ \fB-s configfile\fR ] [ \fB-P account-policy\fR ] [ \fB-V value\fR ]
+\fBpdbedit\fR [ \fB-l\fR ] [ \fB-v\fR ] [ \fB-w\fR ] [ \fB-u username\fR ] [ \fB-f fullname\fR ] [ \fB-h homedir\fR ] [ \fB-D drive\fR ] [ \fB-S script\fR ] [ \fB-p profile\fR ] [ \fB-a\fR ] [ \fB-m\fR ] [ \fB-x\fR ] [ \fB-i passdb-backend\fR ] [ \fB-e passdb-backend\fR ] [ \fB-b passdb-backend\fR ] [ \fB-d debuglevel\fR ] [ \fB-s configfile\fR ] [ \fB-P account-policy\fR ] [ \fB-C value\fR ]
 
 .SH "DESCRIPTION"
 .PP
@@ -194,12 +194,12 @@ Example: \fBpdbedit -P "bad lockout attempt"\fR
 account policy value for bad lockout attempt is 0
 .fi
 .TP
-\fB-V account-policy-value\fR
+\fB-C account-policy-value\fR
 Sets an account policy to a specified value. 
 This option may only be used in conjunction
 with the \fI-P\fR option.
 
-Example: \fBpdbedit -P "bad lockout attempt" -V 3\fR
+Example: \fBpdbedit -P "bad lockout attempt" -C 3\fR
 
 
 .nf
@@ -207,6 +207,23 @@ account policy value for bad lockout attempt was 0
 account policy value for bad lockout attempt is now 3
 .fi
 .TP
+\fB-h|--help\fR
+Print a summary of command line options.
+.TP
+\fB-V\fR
+Prints the version number for 
+\fBsmbd\fR.
+.TP
+\fB-s <configuration file>\fR
+The file specified contains 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 \fIsmb.conf(5)\fR for more information.
+The default configuration file name is determined at 
+compile time.
+.TP
 \fB-d|--debug=debuglevel\fR
 \fIdebuglevel\fR is an integer 
 from 0 to 10.  The default value if this parameter is 
@@ -229,18 +246,10 @@ Note that specifying this parameter here will
 override the log
 level file.
 .TP
-\fB-h|--help\fR
-Print a summary of command line options.
-.TP
-\fB-s <configuration file>\fR
-The file specified contains 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 \fIsmb.conf(5)\fR for more information.
-The default configuration file name is determined at 
-compile time.
+\fB-l|--logfile=logbasename\fR
+File name for log/debug files. The extension
+".client" will be appended. The log file is
+never removed by the client.
 .SH "NOTES"
 .PP
 This command may be used only by root.
diff --git a/docs/manpages/rpcclient.1 b/docs/manpages/rpcclient.1
index afd75a6838..a359d6772f 100644
--- a/docs/manpages/rpcclient.1
+++ b/docs/manpages/rpcclient.1
@@ -3,7 +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 "RPCCLIENT" "1" "18 March 2003" "" ""
+.TH "RPCCLIENT" "1" "24 March 2003" "" ""
 
 .SH NAME
 rpcclient \- tool for executing client side  MS-RPC functions
@@ -27,27 +27,39 @@ NetBIOS name of Server to which to connect.
 The server can be  any SMB/CIFS server.  The name is 
 resolved using the   \fIname resolve order\fR line from \fBsmb.conf\fR(5).
 .TP
-\fB-A|--authfile=filename\fR
-This option allows 
-you to specify a file from which to read the username and 
-password used in the connection.  The format of the file is 
-
-
-.nf
-username = <value> 
-password = <value>
-domain   = <value>
-.fi
-
-Make certain that the permissions on the file restrict 
-access from unwanted users. 
-.TP
 \fB-c|--command='command string'\fR
 execute semicolon separated commands (listed 
 below)) 
 .TP
-\fB-h|--help\fR
-Print a summary of command line options.
+\fB-I IP-address\fR
+\fIIP address\fR is the address of the server to connect to. 
+It should be specified in standard "a.b.c.d" notation. 
+
+Normally the client would attempt to locate a named 
+SMB/CIFS server by looking it up via the NetBIOS name resolution 
+mechanism described above in the \fIname resolve order\fR 
+parameter above. Using this parameter will force the client
+to assume that the server is on the machine with the specified IP 
+address and the NetBIOS name component of the resource being 
+connected to will be ignored. 
+
+There is no default for this parameter. If not supplied, 
+it will be determined automatically by the client as described 
+above. 
+.TP
+\fB-V\fR
+Prints the version number for 
+\fBsmbd\fR.
+.TP
+\fB-s <configuration file>\fR
+The file specified contains 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 \fIsmb.conf(5)\fR for more information.
+The default configuration file name is determined at 
+compile time.
 .TP
 \fB-d|--debug=debuglevel\fR
 \fIdebuglevel\fR is an integer 
@@ -71,66 +83,94 @@ Note that specifying this parameter here will
 override the log
 level file.
 .TP
-\fB-I IP-address\fR
-\fIIP address\fR is the address of the server to connect to. 
-It should be specified in standard "a.b.c.d" notation. 
-
-Normally the client would attempt to locate a named 
-SMB/CIFS server by looking it up via the NetBIOS name resolution 
-mechanism described above in the \fIname resolve order\fR 
-parameter above. Using this parameter will force the client
-to assume that the server is on the machine with the specified IP 
-address and the NetBIOS name component of the resource being 
-connected to will be ignored. 
-
-There is no default for this parameter. If not supplied, 
-it will be determined automatically by the client as described 
-above. 
-.TP
 \fB-l|--logfile=logbasename\fR
-File name for log/debug files. The extension 
-\&'.client' will be appended. The log file is
+File name for log/debug files. The extension
+".client" will be appended. The log file is
 never removed by the client.
 .TP
-\fB-N|--nopass\fR
-instruct \fBrpcclient\fR not to ask 
-for a password.   By default, \fBrpcclient\fR will
-prompt for a password.  See also the \fI-U\fR
-option.
+\fB-N\fR
+If specified, this parameter suppresses the normal
+password prompt from the client to the user. This is useful when
+accessing a service that does not require a password. 
+
+Unless a password is specified on the command line or
+this parameter is specified, the client will request a
+password.
+.TP
+\fB-k\fR
+Try to authenticate with kerberos. Only useful in
+an Active Directory environment.
 .TP
-\fB-s|--conf=smb.conf\fR
-Specifies the location of the all-important 
-\fIsmb.conf\fR file. 
+\fB-A|--authfile=filename\fR
+This option allows
+you to specify a file from which to read the username and
+password used in the connection.  The format of the file is
+
+
+.nf
+username = <value>
+password = <value>
+domain   = <value>
+.fi
+
+Make certain that the permissions on the file restrict 
+access from unwanted users. 
 .TP
-\fB-U|--user=username[%password]\fR
+\fB-U|--user=username[&%;password]\fR
 Sets the SMB username or username and password. 
 
-If %password is not specified, the user will be prompted. The 
-client will first check the \fBUSER\fR environment variable, then the 
-\fBLOGNAME\fR variable and if either exists, the 
-string is uppercased. If these environmental variables are not 
+If &%;password is not specified, the user will be prompted. The
+client will first check the \fBUSER\fR environment variable, then the
+\fBLOGNAME\fR variable and if either exists, the
+string is uppercased. If these environmental variables are not
 found, the username GUEST is used. 
 
-A third option is to use a credentials file which 
-contains the plaintext of the username and password.  This 
-option is mainly provided for scripts where the admin does not 
-wish to pass the credentials on the command line or via environment 
-variables. If this method is used, make certain that the permissions 
-on the file restrict access from unwanted users.  See the 
+A third option is to use a credentials file which
+contains the plaintext of the username and password.  This
+option is mainly provided for scripts where the admin does not
+wish to pass the credentials on the command line or via environment
+variables. If this method is used, make certain that the permissions
+on the file restrict access from unwanted users.  See the
 \fI-A\fR for more details. 
 
-Be cautious about including passwords in scripts. Also, on 
-many systems the command line of a running process may be seen 
-via the \fBps\fR command.  To be safe always allow 
-\fBrpcclient\fR to prompt for a password and type 
+Be cautious about including passwords in scripts. Also, on
+many systems the command line of a running process may be seen
+via the \fBps\fR command.  To be safe always allow
+\fBrpcclient\fR to prompt for a password and type
 it in directly. 
 .TP
+\fB-n <primary NetBIOS name>\fR
+This option allows you to override
+the NetBIOS name that Samba uses for itself. This is identical
+to setting the \fINetBIOS
+name\fR parameter in the \fBsmb.conf\fR(5) file.  However, a command
+line setting will take precedence over settings in
+\fBsmb.conf\fR(5).
+.TP
+\fB-i <scope>\fR
+This specifies a NetBIOS scope that
+\fBnmblookup\fR will use to communicate with when
+generating NetBIOS names. For details on the use of NetBIOS
+scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes are
+\fBvery\fR rarely used, only set this parameter
+if you are the system administrator in charge of all the
+NetBIOS systems you communicate with.
+.TP
 \fB-W|--workgroup=domain\fR
-Set the SMB domain of the username.   This 
-overrides the default domain which is the domain defined in 
-smb.conf.  If the domain specified is the same as the server's NetBIOS name, 
-it causes the client to log on using the  server's local SAM (as 
-opposed to the Domain SAM). 
+Set the SMB domain of the username.   This
+overrides the default domain which is the domain defined in
+smb.conf.  If the domain specified is the same as the servers 
+NetBIOS name, it causes the client to log on using the servers local 
+SAM (as opposed to the Domain SAM). 
+.TP
+\fB-O socket options\fR
+TCP socket options to set on the client
+socket. See the socket options parameter in
+the \fBsmb.conf\fR(5) manual page for the list of valid
+options. 
+.TP
+\fB-h|--help\fR
+Print a summary of command line options.
 .SH "COMMANDS"
 .PP
 \fBLSARPC\fR
diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7
index a1abcbfba3..6703cb95ce 100644
--- a/docs/manpages/samba.7
+++ b/docs/manpages/samba.7
@@ -3,7 +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 "SAMBA" "7" "18 March 2003" "" ""
+.TH "SAMBA" "7" "24 March 2003" "" ""
 
 .SH NAME
 Samba \- A Windows SMB/CIFS fileserver for UNIX
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 23dfcbd50f..ced5057fcd 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -3,7 +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 "SMB.CONF" "5" "18 March 2003" "" ""
+.TH "SMB.CONF" "5" "24 March 2003" "" ""
 
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
@@ -661,6 +661,9 @@ each parameter for details.  Note that some are synonyms.
 \fIldap admin dn\fR
 .TP 0.2i
 \(bu
+\fIldap del only sam attr\fR
+.TP 0.2i
+\(bu
 \fIldap filter\fR
 .TP 0.2i
 \(bu
@@ -3344,8 +3347,13 @@ admin dn\fR is used in conjunction with the admin dn password
 stored in the \fIprivate/secrets.tdb\fR file.  See the
 \fBsmbpasswd\fR(8) man page for more information on how 
 to accmplish this.
+.TP
+\fB>ldap del only sam attr (G)\fR
+This parameter specifies whether a delete
+operation in the ldapsam deletes only the Samba-specific
+attributes or the complete LDAP entry.
 
-Default : \fBnone\fR
+Default : \fBldap del only sam attr = yes\fR
 .TP
 \fB>ldap filter (G)\fR
 This parameter specifies the RFC 2254 compliant LDAP search filter.
@@ -5119,7 +5127,7 @@ parameter \fIname
 resolve order\fR and so may resolved
 by any method and order described in that parameter.
 
-The password server much be a machine capable of using 
+The password server must be a machine capable of using 
 the "LM1.2X002" or the "NT LM 0.12" protocol, and it must be in 
 user level security mode.
 
diff --git a/docs/manpages/smbcacls.1 b/docs/manpages/smbcacls.1
index 2539822d75..b38c2adf8a 100644
--- a/docs/manpages/smbcacls.1
+++ b/docs/manpages/smbcacls.1
@@ -3,13 +3,13 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBCACLS" "1" "18 March 2003" "" ""
+.TH "SMBCACLS" "1" "24 March 2003" "" ""
 
 .SH NAME
 smbcacls \- Set or get ACLs on an NT file or directory names
 .SH SYNOPSIS
 
-\fBsmbcacls\fR \fB//server/share\fR \fBfilename\fR [ \fB-U username\fR ] [ \fB-A acls\fR ] [ \fB-M acls\fR ] [ \fB-D acls\fR ] [ \fB-S acls\fR ] [ \fB-C name\fR ] [ \fB-G name\fR ] [ \fB-n\fR ] [ \fB-h\fR ]
+\fBsmbcacls\fR \fB//server/share\fR \fBfilename\fR [ \fB-D acls\fR ] [ \fB-M acls\fR ] [ \fB-A acls\fR ] [ \fB-S acls\fR ] [ \fB-C name\fR ] [ \fB-G name\fR ] [ \fB-n\fR ] [ \fB-t\fR ] [ \fB-U username\fR ] [ \fB-h\fR ] [ \fB-d\fR ]
 
 .SH "DESCRIPTION"
 .PP
@@ -71,9 +71,9 @@ This option displays all ACL information in numeric
 format.  The default is to convert SIDs to names and ACE types 
 and masks to a readable string format.  
 .TP
-\fB-h\fR
-Print usage information on the \fBsmbcacls
-\fR program.
+\fB-t\fR
+Don't actually do anything, only validate the correctness of 
+the arguments.
 .SH "ACL FORMAT"
 .PP
 The format of an ACL is one or more ACL entries separated by 
@@ -172,7 +172,7 @@ of 1 is returned.  If there was an error parsing any command line
 arguments, an exit status of 2 is returned. 
 .SH "VERSION"
 .PP
-This man page is correct for version 2.2 of the Samba suite.
+This man page is correct for version 3.0 of the Samba suite.
 .SH "AUTHOR"
 .PP
 The original Samba software and related utilities 
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index 3d193b0c62..6ba48185a3 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -3,7 +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 "SMBCLIENT" "1" "18 March 2003" "" ""
+.TH "SMBCLIENT" "1" "24 March 2003" "" ""
 
 .SH NAME
 smbclient \- ftp-like client to access SMB/CIFS resources  on servers
@@ -67,16 +67,6 @@ or mixed case passwords may be rejected by these servers.
 
 Be cautious about including passwords in scripts.
 .TP
-\fB-s smb.conf\fR
-Specifies the location of the all 
-important \fBsmb.conf\fR(5) file. 
-.TP
-\fB-O socket options\fR
-TCP socket options to set on the client 
-socket. See the socket options parameter in 
-the \fBsmb.conf\fR(5) manual page for the list of valid 
-options. 
-.TP
 \fB-R <name resolve order>\fR
 This option is used by the programs in the Samba 
 suite to determine what naming services and in what order to resolve 
@@ -158,57 +148,6 @@ WinPopup messages in Samba.
 on your WfWg PCs if you want them to always be able to receive 
 messages. 
 .TP
-\fB-i scope\fR
-This specifies a NetBIOS scope that smbclient will 
-use to communicate with when generating NetBIOS names. For details 
-on the use of NetBIOS scopes, see \fIrfc1001.txt\fR 
-and \fIrfc1002.txt\fR.
-NetBIOS scopes are \fBvery\fR rarely used, only set 
-this parameter if you are the system administrator in charge of all 
-the NetBIOS systems you communicate with. 
-.TP
-\fB-N\fR
-If specified, this parameter suppresses the normal 
-password prompt from the client to the user. This is useful when 
-accessing a service that does not require a password. 
-
-Unless a password is specified on the command line or 
-this parameter is specified, the client will request a 
-password.
-.TP
-\fB-n NetBIOS name\fR
-By default, the client will use the local 
-machine's hostname (in uppercase) as its NetBIOS name. This parameter 
-allows you to override the host name and use whatever NetBIOS 
-name you wish. 
-.TP
-\fB-d debuglevel\fR
-\fIdebuglevel\fR is an integer from 0 to 10, or 
-the letter 'A'. 
-
-The default value if this parameter is not specified 
-is zero. 
-
-The higher this value, the more detail will be logged to 
-the log files about the activities of the 
-client. At level 0, only critical errors and serious warnings will 
-be logged. Level 1 is a reasonable level for day to day running - 
-it generates a small amount of information about operations 
-carried out. 
-
-Levels above 1 will generate considerable amounts of log 
-data, and should only be used when investigating a problem.
-Levels above 3 are designed for use only by developers and 
-generate HUGE amounts of log data, most of which is extremely 
-cryptic. If \fIdebuglevel\fR is set to the letter 'A', then \fBall
-\fR  debug messages will be printed. This setting
-is for developers only (and people who \fBreally\fR want 
-to know how the code works internally). 
-
-Note that specifying this parameter here will override
-the log level parameter in the \fIsmb.conf (5)\fR 
-file. 
-.TP
 \fB-p port\fR
 This number is the TCP port number that will be used 
 when making connections to the server. The standard (well-known)
@@ -228,8 +167,8 @@ would be \fIlog.client\fR.
 
 The log file generated is never removed by the client.   
 .TP
-\fB-h\fR
-Print the usage message for the client. 
+\fB-h|--help\fR
+Print a summary of command line options.
 .TP
 \fB-I IP-address\fR
 \fIIP address\fR is the address of the server to connect to. 
@@ -255,52 +194,6 @@ output stream.
 By default, the client writes messages to standard output 
 - typically the user's tty. 
 .TP
-\fB-U username[%pass]\fR
-Sets the SMB username or username and password. 
-If %pass is not specified, The user will be prompted. The client 
-will first check the \fBUSER\fR environment variable, then the 
-\fBLOGNAME\fR variable and if either exists, the 
-string is uppercased. Anything in these variables following a '%' 
-sign will be treated as the password. If these environment 
-variables are not found, the username GUEST 
-is used. 
-
-If the password is not included in these environment
-variables (using the %pass syntax), \fBsmbclient\fR will look for 
-a \fBPASSWD\fR environment variable from which 
-to read the password. 
-
-A third option is to use a credentials file which 
-contains the plaintext of the domain name, username and password.  This 
-option is mainly provided for scripts where the admin doesn't 
-wish to pass the credentials on the command line or via environment 
-variables. If this method is used, make certain that the permissions 
-on the file restrict access from unwanted users.  See the 
-\fI-A\fR for more details. 
-
-Be cautious about including passwords in scripts or in 
-the \fBPASSWD\fR environment variable. Also, on 
-many systems the command line of a running process may be seen 
-via the \fBps\fR command to be safe always allow 
-\fBsmbclient\fR to prompt for a password and type 
-it in directly. 
-.TP
-\fB-A filename\fR
-This option allows 
-you to specify a file from which to read the username, domain name, and 
-password used in the connection.  The format of the file is 
-
-
-.nf
-username = <value> 
-password = <value>
-domain = <value>
-.fi
-
-If the domain parameter is missing the current workgroup name
-is used instead. Make certain that the permissions on the file restrict 
-access from unwanted users. 
-.TP
 \fB-L\fR
 This option allows you to look at what services 
 are available on a server. You use it as \fBsmbclient -L 
@@ -328,10 +221,127 @@ size when getting or putting a file from/to the server. The default
 is 65520 bytes. Setting this value smaller (to 1200 bytes) has been 
 observed to speed up file transfers to and from a Win9x server. 
 .TP
-\fB-W WORKGROUP\fR
-Override the default workgroup (domain) specified
-in the workgroup parameter of the \fBsmb.conf\fR(5) file for this connection. This may be 
-needed to connect to some servers. 
+\fB-V\fR
+Prints the version number for 
+\fBsmbd\fR.
+.TP
+\fB-s <configuration file>\fR
+The file specified contains 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 \fIsmb.conf(5)\fR for more information.
+The default configuration file name is determined at 
+compile time.
+.TP
+\fB-d|--debug=debuglevel\fR
+\fIdebuglevel\fR 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 to the log files about the activities of the 
+server. At level 0, only critical errors and serious 
+warnings will be logged. Level 1 is a reasonable level for
+day to day running - it generates a small amount of 
+information about operations carried out.
+
+Levels above 1 will generate considerable 
+amounts of log data, and should only be used when 
+investigating a problem. Levels above 3 are designed for 
+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 file.
+.TP
+\fB-l|--logfile=logbasename\fR
+File name for log/debug files. The extension
+".client" will be appended. The log file is
+never removed by the client.
+.TP
+\fB-N\fR
+If specified, this parameter suppresses the normal
+password prompt from the client to the user. This is useful when
+accessing a service that does not require a password. 
+
+Unless a password is specified on the command line or
+this parameter is specified, the client will request a
+password.
+.TP
+\fB-k\fR
+Try to authenticate with kerberos. Only useful in
+an Active Directory environment.
+.TP
+\fB-A|--authfile=filename\fR
+This option allows
+you to specify a file from which to read the username and
+password used in the connection.  The format of the file is
+
+
+.nf
+username = <value>
+password = <value>
+domain   = <value>
+.fi
+
+Make certain that the permissions on the file restrict 
+access from unwanted users. 
+.TP
+\fB-U|--user=username[&%;password]\fR
+Sets the SMB username or username and password. 
+
+If &%;password is not specified, the user will be prompted. The
+client will first check the \fBUSER\fR environment variable, then the
+\fBLOGNAME\fR variable and if either exists, the
+string is uppercased. If these environmental variables are not
+found, the username GUEST is used. 
+
+A third option is to use a credentials file which
+contains the plaintext of the username and password.  This
+option is mainly provided for scripts where the admin does not
+wish to pass the credentials on the command line or via environment
+variables. If this method is used, make certain that the permissions
+on the file restrict access from unwanted users.  See the
+\fI-A\fR for more details. 
+
+Be cautious about including passwords in scripts. Also, on
+many systems the command line of a running process may be seen
+via the \fBps\fR command.  To be safe always allow
+\fBrpcclient\fR to prompt for a password and type
+it in directly. 
+.TP
+\fB-n <primary NetBIOS name>\fR
+This option allows you to override
+the NetBIOS name that Samba uses for itself. This is identical
+to setting the \fINetBIOS
+name\fR parameter in the \fBsmb.conf\fR(5) file.  However, a command
+line setting will take precedence over settings in
+\fBsmb.conf\fR(5).
+.TP
+\fB-i <scope>\fR
+This specifies a NetBIOS scope that
+\fBnmblookup\fR will use to communicate with when
+generating NetBIOS names. For details on the use of NetBIOS
+scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes are
+\fBvery\fR rarely used, only set this parameter
+if you are the system administrator in charge of all the
+NetBIOS systems you communicate with.
+.TP
+\fB-W|--workgroup=domain\fR
+Set the SMB domain of the username.   This
+overrides the default domain which is the domain defined in
+smb.conf.  If the domain specified is the same as the servers 
+NetBIOS name, it causes the client to log on using the servers local 
+SAM (as opposed to the Domain SAM). 
+.TP
+\fB-O socket options\fR
+TCP socket options to set on the client
+socket. See the socket options parameter in
+the \fBsmb.conf\fR(5) manual page for the list of valid
+options. 
 .TP
 \fB-T tar options\fR
 smbclient may be used to create \fBtar(1)
@@ -459,10 +469,6 @@ commands to be executed instead of prompting from stdin. \fI  -N\fR is implied b
 
 This is particularly useful in scripts and for printing stdin 
 to the server, e.g. \fB-c 'print -'\fR. 
-.TP
-\fB-k\fR
-Try to authenticate with kerberos. Only useful in 
-an Active Directory environment.
 .SH "OPERATIONS"
 .PP
 Once the client is running, the user is presented with 
diff --git a/docs/manpages/smbcontrol.1 b/docs/manpages/smbcontrol.1
index d9b66a86c4..a4fe043f3c 100644
--- a/docs/manpages/smbcontrol.1
+++ b/docs/manpages/smbcontrol.1
@@ -3,7 +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 "SMBCONTROL" "1" "18 March 2003" "" ""
+.TH "SMBCONTROL" "1" "24 March 2003" "" ""
 
 .SH NAME
 smbcontrol \- send messages to smbd, nmbd or winbindd processes
diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8
index 07045dee50..ef498cbf64 100644
--- a/docs/manpages/smbd.8
+++ b/docs/manpages/smbd.8
@@ -3,7 +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 "SMBD" "8" "18 March 2003" "" ""
+.TH "SMBD" "8" "24 March 2003" "" ""
 
 .SH NAME
 smbd \- server to provide SMB/CIFS services to clients
@@ -85,19 +85,21 @@ command line. \fBsmbd\fR also logs to standard
 output, as if the \fB-S\fR parameter had been
 given.
 .TP
-\fB-h\fR
-Prints the help information (usage) 
-for \fBsmbd\fR.
-.TP
 \fB-V\fR
 Prints the version number for 
 \fBsmbd\fR.
 .TP
-\fB-b\fR
-Prints information about how 
-Samba was built.
+\fB-s <configuration file>\fR
+The file specified contains 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 \fIsmb.conf(5)\fR for more information.
+The default configuration file name is determined at 
+compile time.
 .TP
-\fB-d <debug level>\fR
+\fB-d|--debug=debuglevel\fR
 \fIdebuglevel\fR is an integer 
 from 0 to 10.  The default value if this parameter is 
 not specified is zero.
@@ -116,8 +118,20 @@ 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 \fIlog
-level\fR parameter in the \fBsmb.conf\fR(5) file.
+override the log
+level file.
+.TP
+\fB-l|--logfile=logbasename\fR
+File name for log/debug files. The extension
+".client" will be appended. The log file is
+never removed by the client.
+.TP
+\fB-h|--help\fR
+Print a summary of command line options.
+.TP
+\fB-b\fR
+Prints information about how 
+Samba was built.
 .TP
 \fB-l <log directory>\fR
 If specified,
@@ -134,10 +148,6 @@ will log to the default debug log location defined at compile time.
 The default log directory is specified at
 compile time.
 .TP
-\fB-O <socket options>\fR
-See the \fIsocket options\fR 
-parameter in the \fBsmb.conf\fR(5) 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 
@@ -160,16 +170,6 @@ section 4.3.5.
 
 This parameter is not normally specified except 
 in the above situation.
-.TP
-\fB-s <configuration file>\fR
-The file specified contains 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 \fBsmb.conf\fR(5) for more information.
-The default configuration file name is determined at 
-compile time.
 .SH "FILES"
 .TP
 \fB\fI/etc/inetd.conf\fB\fR
diff --git a/docs/manpages/smbgroupedit.8 b/docs/manpages/smbgroupedit.8
index 7e7c481161..df8b4e30db 100644
--- a/docs/manpages/smbgroupedit.8
+++ b/docs/manpages/smbgroupedit.8
@@ -3,7 +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 "SMBGROUPEDIT" "8" "18 March 2003" "" ""
+.TH "SMBGROUPEDIT" "8" "24 March 2003" "" ""
 
 .SH NAME
 smbgroupedit \- Query/set/change UNIX - Windows NT group mapping
diff --git a/docs/manpages/smbmnt.8 b/docs/manpages/smbmnt.8
index 661f61e3fa..9d88e28655 100644
--- a/docs/manpages/smbmnt.8
+++ b/docs/manpages/smbmnt.8
@@ -3,7 +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 "SMBMNT" "8" "18 March 2003" "" ""
+.TH "SMBMNT" "8" "24 March 2003" "" ""
 
 .SH NAME
 smbmnt \- helper utility for mounting SMB filesystems
diff --git a/docs/manpages/smbmount.8 b/docs/manpages/smbmount.8
index f3244bb8fe..f34ec152af 100644
--- a/docs/manpages/smbmount.8
+++ b/docs/manpages/smbmount.8
@@ -3,7 +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 "SMBMOUNT" "8" "18 March 2003" "" ""
+.TH "SMBMOUNT" "8" "24 March 2003" "" ""
 
 .SH NAME
 smbmount \- mount an smbfs filesystem
diff --git a/docs/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5
index 435fc6004c..0556c8d4dd 100644
--- a/docs/manpages/smbpasswd.5
+++ b/docs/manpages/smbpasswd.5
@@ -3,7 +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 "SMBPASSWD" "5" "18 March 2003" "" ""
+.TH "SMBPASSWD" "5" "24 March 2003" "" ""
 
 .SH NAME
 smbpasswd \- The Samba encrypted password file
diff --git a/docs/manpages/smbpasswd.8 b/docs/manpages/smbpasswd.8
index 40232ff42a..3ebaa4f8c9 100644
--- a/docs/manpages/smbpasswd.8
+++ b/docs/manpages/smbpasswd.8
@@ -3,7 +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 "SMBPASSWD" "8" "18 March 2003" "" ""
+.TH "SMBPASSWD" "8" "24 March 2003" "" ""
 
 .SH NAME
 smbpasswd \- change a user's SMB password
diff --git a/docs/manpages/smbsh.1 b/docs/manpages/smbsh.1
index ffcfbfe440..8e99151e36 100644
--- a/docs/manpages/smbsh.1
+++ b/docs/manpages/smbsh.1
@@ -3,7 +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" "18 March 2003" "" ""
+.TH "SMBSH" "1" "24 March 2003" "" ""
 
 .SH NAME
 smbsh \- Allows access to Windows NT filesystem  using UNIX commands
diff --git a/docs/manpages/smbspool.8 b/docs/manpages/smbspool.8
index 44255d2a7d..2417a1ee2e 100644
--- a/docs/manpages/smbspool.8
+++ b/docs/manpages/smbspool.8
@@ -3,7 +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 "SMBSPOOL" "8" "18 March 2003" "" ""
+.TH "SMBSPOOL" "8" "24 March 2003" "" ""
 
 .SH NAME
 smbspool \- send a print file to an SMB printer
diff --git a/docs/manpages/smbstatus.1 b/docs/manpages/smbstatus.1
index 98c4ac2fad..5cc6811188 100644
--- a/docs/manpages/smbstatus.1
+++ b/docs/manpages/smbstatus.1
@@ -3,7 +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 "SMBSTATUS" "1" "18 March 2003" "" ""
+.TH "SMBSTATUS" "1" "24 March 2003" "" ""
 
 .SH NAME
 smbstatus \- report on current Samba connections
@@ -27,8 +27,46 @@ shared memory area.
 \fB-b|--brief\fR
 gives brief output.
 .TP
-\fB-d|--debug=<debuglevel>\fR
-sets debugging to specified level
+\fB-V\fR
+Prints the version number for 
+\fBsmbd\fR.
+.TP
+\fB-s <configuration file>\fR
+The file specified contains 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 \fIsmb.conf(5)\fR for more information.
+The default configuration file name is determined at 
+compile time.
+.TP
+\fB-d|--debug=debuglevel\fR
+\fIdebuglevel\fR 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 to the log files about the activities of the 
+server. At level 0, only critical errors and serious 
+warnings will be logged. Level 1 is a reasonable level for
+day to day running - it generates a small amount of 
+information about operations carried out.
+
+Levels above 1 will generate considerable 
+amounts of log data, and should only be used when 
+investigating a problem. Levels above 3 are designed for 
+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 file.
+.TP
+\fB-l|--logfile=logbasename\fR
+File name for log/debug files. The extension
+".client" will be appended. The log file is
+never removed by the client.
 .TP
 \fB-v|--verbose\fR
 gives verbose output.
@@ -46,10 +84,8 @@ Useful for scripting.
 \fB-S|--shares\fR
 causes smbstatus to only list shares.
 .TP
-\fB-s|--conf=<configuration file>\fR
-The default configuration file name is
-determined at compile time. The file specified contains the
-configuration details required by the server. See \fBsmb.conf\fR(5) for more information.
+\fB-h|--help\fR
+Print a summary of command line options.
 .TP
 \fB-u|--user=<username>\fR
 selects information relevant to 
diff --git a/docs/manpages/smbtar.1 b/docs/manpages/smbtar.1
index 310a99fb39..20a261a2b3 100644
--- a/docs/manpages/smbtar.1
+++ b/docs/manpages/smbtar.1
@@ -3,7 +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 "SMBTAR" "1" "18 March 2003" "" ""
+.TH "SMBTAR" "1" "24 March 2003" "" ""
 
 .SH NAME
 smbtar \- shell script for backing up SMB/CIFS shares  directly to UNIX tape drives
diff --git a/docs/manpages/smbumount.8 b/docs/manpages/smbumount.8
index f4c263ce95..21f5545cea 100644
--- a/docs/manpages/smbumount.8
+++ b/docs/manpages/smbumount.8
@@ -3,7 +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 "SMBUMOUNT" "8" "18 March 2003" "" ""
+.TH "SMBUMOUNT" "8" "24 March 2003" "" ""
 
 .SH NAME
 smbumount \- smbfs umount for normal users
diff --git a/docs/manpages/swat.8 b/docs/manpages/swat.8
index 4f16e31766..a76db24100 100644
--- a/docs/manpages/swat.8
+++ b/docs/manpages/swat.8
@@ -3,7 +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 "SWAT" "8" "18 March 2003" "" ""
+.TH "SWAT" "8" "24 March 2003" "" ""
 
 .SH NAME
 swat \- Samba Web Administration Tool
@@ -41,8 +41,57 @@ the \fIsmb.conf\fR file.
 
 \fBWARNING: Do NOT enable this option on a production 
 server. \fR
+.TP
+\fB-V\fR
+Prints the version number for 
+\fBsmbd\fR.
+.TP
+\fB-s <configuration file>\fR
+The file specified contains 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 \fIsmb.conf(5)\fR for more information.
+The default configuration file name is determined at 
+compile time.
+.TP
+\fB-d|--debug=debuglevel\fR
+\fIdebuglevel\fR 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 to the log files about the activities of the 
+server. At level 0, only critical errors and serious 
+warnings will be logged. Level 1 is a reasonable level for
+day to day running - it generates a small amount of 
+information about operations carried out.
+
+Levels above 1 will generate considerable 
+amounts of log data, and should only be used when 
+investigating a problem. Levels above 3 are designed for 
+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 file.
+.TP
+\fB-l|--logfile=logbasename\fR
+File name for log/debug files. The extension
+".client" will be appended. The log file is
+never removed by the client.
+.TP
+\fB-h|--help\fR
+Print a summary of command line options.
 .SH "INSTALLATION"
 .PP
+Swat is included as binary package with most distributions. The 
+package manager in this case takes care of the installation and 
+configuration. This section is only for those who have compiled 
+swat from scratch.
+.PP
 After you compile SWAT you need to run \fBmake install
 \fR to install the \fBswat\fR binary
 and the various help files and images. A default install would put 
@@ -67,7 +116,7 @@ add a line like this:
 .PP
 \fBswat            901/tcp\fR
 .PP
-Note for NIS/YP users - you may need to rebuild the 
+Note for NIS/YP and LDAP users - you may need to rebuild the 
 NIS service maps rather than alter your local \fI  /etc/services\fR file. 
 .PP
 the choice of port number isn't really important 
@@ -86,7 +135,7 @@ One you have edited \fI/etc/services\fR
 and \fI/etc/inetd.conf\fR you need to send a 
 HUP signal to inetd. To do this use \fBkill -1 PID
 \fR where PID is the process ID of the inetd daemon. 
-.SS "LAUNCHING"
+.SH "LAUNCHING"
 .PP
 To launch SWAT just run your favorite web browser and 
 point it at "http://localhost:901/".
@@ -118,7 +167,7 @@ comments, \fIinclude=\fR and \fIcopy=
 \fR options. If you have a carefully crafted \fI smb.conf\fR then back it up or don't use swat! 
 .SH "VERSION"
 .PP
-This man page is correct for version 2.2 of the Samba suite.
+This man page is correct for version 3.0 of the Samba suite.
 .SH "SEE ALSO"
 .PP
 \fBinetd(5)\fR, \fBsmbd\fR(8), \fBsmb.conf\fR(5)
diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1
index d66a018043..cf91b23295 100644
--- a/docs/manpages/testparm.1
+++ b/docs/manpages/testparm.1
@@ -3,7 +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 "TESTPARM" "1" "18 March 2003" "" ""
+.TH "TESTPARM" "1" "24 March 2003" "" ""
 
 .SH NAME
 testparm \- check an smb.conf configuration file for  internal correctness
@@ -40,8 +40,12 @@ Without this option, \fBtestparm\fR
 will prompt for a carriage return after printing the service 
 names and before dumping the service definitions.
 .TP
-\fB-h\fR
-Print usage message 
+\fB-h|--help\fR
+Print a summary of command line options.
+.TP
+\fB-V\fR
+Prints the version number for 
+\fBsmbd\fR.
 .TP
 \fB-L servername\fR
 Sets the value of the %L macro to \fIservername\fR.
diff --git a/docs/manpages/testprns.1 b/docs/manpages/testprns.1
index 77cf99c557..66f4a08f56 100644
--- a/docs/manpages/testprns.1
+++ b/docs/manpages/testprns.1
@@ -3,7 +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 "TESTPRNS" "1" "18 March 2003" "" ""
+.TH "TESTPRNS" "1" "24 March 2003" "" ""
 
 .SH NAME
 testprns \- check printer name for validity with smbd
diff --git a/docs/manpages/vfstest.1 b/docs/manpages/vfstest.1
index 116642ddc5..f123fcc9f3 100644
--- a/docs/manpages/vfstest.1
+++ b/docs/manpages/vfstest.1
@@ -3,7 +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 "VFSTEST" "1" "18 March 2003" "" ""
+.TH "VFSTEST" "1" "24 March 2003" "" ""
 
 .SH NAME
 vfstest \- tool for testing samba VFS modules
@@ -25,6 +25,28 @@ supports cascaded VFS modules.
 Execute the specified (colon-separated) commands.
 See below for the commands that are available.
 .TP
+\fB-h|--help\fR
+Print a summary of command line options.
+.TP
+\fB-l|--logfile=logbasename\fR
+File name for log/debug files. The extension
+\&'.client' will be appended. The log file is never removed
+by the client.
+.TP
+\fB-V\fR
+Prints the version number for 
+\fBsmbd\fR.
+.TP
+\fB-s <configuration file>\fR
+The file specified contains 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 \fIsmb.conf(5)\fR for more information.
+The default configuration file name is determined at 
+compile time.
+.TP
 \fB-d|--debug=debuglevel\fR
 \fIdebuglevel\fR is an integer 
 from 0 to 10.  The default value if this parameter is 
@@ -47,13 +69,10 @@ Note that specifying this parameter here will
 override the log
 level file.
 .TP
-\fB-h|--help\fR
-Print a summary of command line options.
-.TP
 \fB-l|--logfile=logbasename\fR
 File name for log/debug files. The extension
-\&'.client' will be appended. The log file is never removed
-by the client.
+".client" will be appended. The log file is
+never removed by the client.
 .SH "COMMANDS"
 .PP
 \fBVFS COMMANDS\fR
diff --git a/docs/manpages/wbinfo.1 b/docs/manpages/wbinfo.1
index 77f5d3e2fb..d3ed336b47 100644
--- a/docs/manpages/wbinfo.1
+++ b/docs/manpages/wbinfo.1
@@ -3,13 +3,13 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "WBINFO" "1" "18 March 2003" "" ""
+.TH "WBINFO" "1" "24 March 2003" "" ""
 
 .SH NAME
 wbinfo \- Query information from winbind daemon
 .SH SYNOPSIS
 
-\fBwbinfo\fR [ \fB-u\fR ] [ \fB-g\fR ] [ \fB-i ip\fR ] [ \fB-N netbios-name\fR ] [ \fB-n name\fR ] [ \fB-s sid\fR ] [ \fB-U uid\fR ] [ \fB-G gid\fR ] [ \fB-S sid\fR ] [ \fB-Y sid\fR ] [ \fB-t\fR ] [ \fB-m\fR ] [ \fB-r user\fR ] [ \fB-a user%password\fR ] [ \fB-A user%password\fR ] [ \fB-p\fR ]
+\fBwbinfo\fR [ \fB-u\fR ] [ \fB-g\fR ] [ \fB-N netbios-name\fR ] [ \fB-I ip\fR ] [ \fB-n name\fR ] [ \fB-s sid\fR ] [ \fB-U uid\fR ] [ \fB-G gid\fR ] [ \fB-S sid\fR ] [ \fB-Y sid\fR ] [ \fB-t\fR ] [ \fB-m\fR ] [ \fB--sequence\fR ] [ \fB-r user\fR ] [ \fB-a user%password\fR ] [ \fB-A user%password\fR ] [ \fB--get-auth-user\fR ] [ \fB-p\fR ]
 
 .SH "DESCRIPTION"
 .PP
@@ -96,6 +96,10 @@ Windows NT server \fBwinbindd\fR(8) contacts
 when resolving names.  This list does not include the Windows 
 NT domain the server is a Primary Domain Controller for.
 .TP
+\fB--sequence\fR
+Show sequence numbers of 
+all known domains
+.TP
 \fB-r username\fR
 Try to obtain the list of UNIX group ids
 to which the user belongs.  This only works for users
@@ -111,6 +115,23 @@ during session setup to a domain controller.  This enables
 winbindd to operate in a Windows 2000 domain with Restrict
 Anonymous turned on (a.k.a. Permissions compatiable with
 Windows 2000 servers only).
+.TP
+\fB--get-auth-user\fR
+Print username and password used by winbindd
+during session setup to a domain controller. Username 
+and password can be set using '-A'. Only available for 
+root.
+.TP
+\fB-p\fR
+Check whether winbindd is still alive. 
+Prints out either 'succeeded' or 'failed'.
+.TP
+\fB-V\fR
+Prints the version number for 
+\fBsmbd\fR.
+.TP
+\fB-h|--help\fR
+Print a summary of command line options.
 .SH "EXIT STATUS"
 .PP
 The wbinfo program returns 0 if the operation 
diff --git a/docs/manpages/winbindd.8 b/docs/manpages/winbindd.8
index 0d84648d77..a02fe32b04 100644
--- a/docs/manpages/winbindd.8
+++ b/docs/manpages/winbindd.8
@@ -3,7 +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 "WINBINDD" "8" "18 March 2003" "" ""
+.TH "WINBINDD" "8" "24 March 2003" "" ""
 
 .SH NAME
 winbindd \- Name Service Switch daemon for resolving names  from NT servers
@@ -90,11 +90,79 @@ If specified, this parameter causes
 \fBwinbindd\fR to log to standard output rather
 than a file.
 .TP
-\fB-d debuglevel\fR
-Sets the debuglevel to an integer between 
-0 and 100. 0 is for no debugging and 100 is for reams and 
-reams. To submit a bug report to the Samba Team, use debug 
-level 100 (see BUGS.txt).   
+\fB-V\fR
+Prints the version number for 
+\fBsmbd\fR.
+.TP
+\fB-s <configuration file>\fR
+The file specified contains 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 \fIsmb.conf(5)\fR for more information.
+The default configuration file name is determined at 
+compile time.
+.TP
+\fB-d|--debug=debuglevel\fR
+\fIdebuglevel\fR 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 to the log files about the activities of the 
+server. At level 0, only critical errors and serious 
+warnings will be logged. Level 1 is a reasonable level for
+day to day running - it generates a small amount of 
+information about operations carried out.
+
+Levels above 1 will generate considerable 
+amounts of log data, and should only be used when 
+investigating a problem. Levels above 3 are designed for 
+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 file.
+.TP
+\fB-l|--logfile=logbasename\fR
+File name for log/debug files. The extension
+".client" will be appended. The log file is
+never removed by the client.
+.TP
+\fB-n <primary NetBIOS name>\fR
+This option allows you to override
+the NetBIOS name that Samba uses for itself. This is identical
+to setting the \fINetBIOS
+name\fR parameter in the \fBsmb.conf\fR(5) file.  However, a command
+line setting will take precedence over settings in
+\fBsmb.conf\fR(5).
+.TP
+\fB-i <scope>\fR
+This specifies a NetBIOS scope that
+\fBnmblookup\fR will use to communicate with when
+generating NetBIOS names. For details on the use of NetBIOS
+scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes are
+\fBvery\fR rarely used, only set this parameter
+if you are the system administrator in charge of all the
+NetBIOS systems you communicate with.
+.TP
+\fB-W|--workgroup=domain\fR
+Set the SMB domain of the username.   This
+overrides the default domain which is the domain defined in
+smb.conf.  If the domain specified is the same as the servers 
+NetBIOS name, it causes the client to log on using the servers local 
+SAM (as opposed to the Domain SAM). 
+.TP
+\fB-O socket options\fR
+TCP socket options to set on the client
+socket. See the socket options parameter in
+the \fBsmb.conf\fR(5) manual page for the list of valid
+options. 
+.TP
+\fB-h|--help\fR
+Print a summary of command line options.
 .TP
 \fB-i\fR
 Tells \fBwinbindd\fR to not 
@@ -118,10 +186,6 @@ as 2 threads. The first will answer all requests from the cache,
 thus making responses to clients faster. The other will 
 update the cache for the query that the first has just responded. 
 Advantage of this is that responses are accurate and fast.
-.TP
-\fB-s|--conf=smb.conf\fR
-Specifies the location of the all-important
-\fBsmb.conf\fR(5) file. 
 .SH "NAME AND ID RESOLUTION"
 .PP
 Users and groups on a Windows NT server are assigned