'make everything' in docs

(This used to be commit 960082d860c36419c63094be778decdadb061c1d)

13 files changed, 261 insertions, 88 deletions

diff --git a/docs/manpages/findsmb.1 b/docs/manpages/findsmb.1
index c5553267b5..7bd2e53a72 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" "01 October 2002" "" ""
+.TH "FINDSMB" "1" "05 November 2002" "" ""
 .SH NAME
 findsmb \- list info about machines that respond to SMB  name queries on a subnet
 .SH SYNOPSIS
@@ -68,7 +68,7 @@ IP ADDR         NETBIOS NAME   WORKGROUP/OS/VERSION
 .fi
 .SH "VERSION"
 .PP
-This man page is correct for version 2.2 of 
+This man page is correct for version 3.0 of 
 the Samba suite.
 .SH "SEE ALSO"
 .PP
diff --git a/docs/manpages/lmhosts.5 b/docs/manpages/lmhosts.5
index f13d8ff78a..e5443f61e8 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" "01 October 2002" "" ""
+.TH "LMHOSTS" "5" "05 November 2002" "" ""
 .SH NAME
 lmhosts \- The Samba NetBIOS hosts file
 .SH SYNOPSIS
diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index d5662dbdb4..0b52f48c7d 100644
--- a/docs/manpages/nmbd.8
+++ b/docs/manpages/nmbd.8
@@ -3,12 +3,12 @@
 .\" <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" "01 October 2002" "" ""
+.TH "NMBD" "8" "05 November 2002" "" ""
 .SH NAME
 nmbd \- NetBIOS name server to provide NetBIOS  over IP naming services to clients
 .SH SYNOPSIS
 
-\fBnmbd\fR [ \fB-D\fR ] [ \fB-a\fR ] [ \fB-i\fR ] [ \fB-o\fR ] [ \fB-P\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-d <debug level>\fR ] [ \fB-H <lmhosts file>\fR ] [ \fB-l <log directory>\fR ] [ \fB-n <primary netbios name>\fR ] [ \fB-p <port number>\fR ] [ \fB-s <configuration file>\fR ]
+\fBnmbd\fR [ \fB-D\fR ] [ \fB-a\fR ] [ \fB-i\fR ] [ \fB-o\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-d <debug level>\fR ] [ \fB-H <lmhosts file>\fR ] [ \fB-l <log directory>\fR ] [ \fB-n <primary netbios name>\fR ] [ \fB-p <port number>\fR ] [ \fB-s <configuration file>\fR ]
 
 .SH "DESCRIPTION"
 .PP
@@ -17,7 +17,7 @@ This program is part of the Samba suite.
 \fBnmbd\fR is a server that understands 
 and can reply to NetBIOS over IP name service requests, like 
 those produced by SMB/CIFS clients such as Windows 95/98/ME, 
-Windows NT, Windows 2000, and LanManager clients. It also
+Windows NT, Windows 2000, Windows XP and LanManager clients. It also
 participates in the browsing protocols which make up the 
 Windows "Network Neighborhood" view.
 .PP
@@ -226,7 +226,7 @@ to allow transient problems to be diagnosed, whilst still running
 at a normally low log level.
 .SH "VERSION"
 .PP
-This man page is correct for version 2.2 of 
+This man page is correct for version 3.0 of 
 the Samba suite.
 .SH "SEE ALSO"
 .PP
diff --git a/docs/manpages/nmblookup.1 b/docs/manpages/nmblookup.1
index 49f602ab42..ecf10dfc1f 100644
--- a/docs/manpages/nmblookup.1
+++ b/docs/manpages/nmblookup.1
@@ -3,12 +3,12 @@
 .\" <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" "01 October 2002" "" ""
+.TH "NMBLOOKUP" "1" "05 November 2002" "" ""
 .SH NAME
 nmblookup \- NetBIOS over TCP/IP client used to lookup NetBIOS  names
 .SH SYNOPSIS
 
-\fBnmblookup\fR [ \fB-M\fR ] [ \fB-R\fR ] [ \fB-S\fR ] [ \fB-r\fR ] [ \fB-A\fR ] [ \fB-h\fR ] [ \fB-B <broadcast address>\fR ] [ \fB-U <unicast address>\fR ] [ \fB-d <debug level>\fR ] [ \fB-s <smb config file>\fR ] [ \fB-i <NetBIOS scope>\fR ] [ \fB-T\fR ] \fBname\fR
+\fBnmblookup\fR [ \fB-M\fR ] [ \fB-R\fR ] [ \fB-S\fR ] [ \fB-r\fR ] [ \fB-A\fR ] [ \fB-h\fR ] [ \fB-B <broadcast address>\fR ] [ \fB-U <unicast address>\fR ] [ \fB-d <debug level>\fR ] [ \fB-s <smb config file>\fR ] [ \fB-i <NetBIOS scope>\fR ] [ \fB-T\fR ] [ \fB-f\fR ] \fBname\fR
 
 .SH "DESCRIPTION"
 .PP
@@ -110,6 +110,11 @@ DNS name, and printed out before each
 
 pair that is the normal output.
 .TP
+\fB-f\fR
+Show which flags apply to the name that has been looked up. Possible 
+answers are zero or more of: Response, Authoritative, 
+Truncated, Recursion_Desired, Recursion_Available, Broadcast.
+.TP
 \fBname\fR
 This is the NetBIOS name being queried. Depending 
 upon the previous options this may be a NetBIOS name or IP address. 
@@ -134,7 +139,7 @@ would query the WINS server samba.org for the domain
 master browser (1B name type) for the IRIX workgroup.
 .SH "VERSION"
 .PP
-This man page is correct for version 2.2 of 
+This man page is correct for version 3.0 of 
 the Samba suite.
 .SH "SEE ALSO"
 .PP
diff --git a/docs/manpages/pdbedit.8 b/docs/manpages/pdbedit.8
index 38e5efab59..b3c1f72c33 100644
--- a/docs/manpages/pdbedit.8
+++ b/docs/manpages/pdbedit.8
@@ -3,12 +3,12 @@
 .\" <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" "01 October 2002" "" ""
+.TH "PDBEDIT" "8" "05 November 2002" "" ""
 .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 ]
+\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 ]
 
 .SH "DESCRIPTION"
 .PP
@@ -108,14 +108,14 @@ directory network path.
 
 Example: \fB-h "\\\\\\\\BERSERKER\\\\sorce"\fR
 .TP
-\fB-d drive\fR
+\fB-D drive\fR
 This option can be used while adding or
 modifing a user account. It will specify the windows drive
 letter to be used to map the home directory.
 
 Example: \fB-d "H:"\fR
 .TP
-\fB-s script\fR
+\fB-S script\fR
 This option can be used while adding or
 modifing a user account. It will specify the user's logon
 script path.
@@ -181,6 +181,70 @@ Example: \fBpdbedit -e smbpasswd:/root/samba-users.backup\fR
 Use a different default passdb backend. 
 
 Example: \fBpdbedit -b xml:/root/pdb-backup.xml -l\fR
+.TP
+\fB-P account-policy\fR
+Display an account policy
+
+Valid policies are: minimum password age, reset count minutes, disconnect time,
+user must logon to change password, password history, lockout duration, min password length,
+maximum password age and bad lockout attempt.
+
+Example: \fBpdbedit -P "bad lockout attempt"\fR
+
+
+.nf
+		account policy value for bad lockout attempt is 0
+		
+.fi
+.TP
+\fB-V 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
+
+
+.nf
+		account policy value for bad lockout attempt was 0
+		account policy value for bad lockout attempt is now 3
+		
+.fi
+.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-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.
 .SH "NOTES"
 .PP
 This command may be used only by root.
diff --git a/docs/manpages/rpcclient.1 b/docs/manpages/rpcclient.1
index 083aef4f5f..e09892b5b9 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" "01 October 2002" "" ""
+.TH "RPCCLIENT" "1" "05 November 2002" "" ""
 .SH NAME
 rpcclient \- tool for executing client side  MS-RPC functions
 .SH SYNOPSIS
@@ -48,9 +48,26 @@ execute semicolon separated commands (listed
 below)) 
 .TP
 \fB-d|--debug=debuglevel\fR
-set the debuglevel. Debug level 0 is the lowest 
-and 100 being the highest. This should be set to 100 if you are
-planning on submitting a bug report to the Samba team (see \fIBUGS.txt\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-h|--help\fR
 Print a summary of command line options.
diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7
index c898b8ce73..0635cc7884 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" "01 October 2002" "" ""
+.TH "SAMBA" "7" "05 November 2002" "" ""
 .SH NAME
 SAMBA \- A Windows SMB/CIFS fileserver for UNIX
 .SH SYNOPSIS
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index dc2adaba47..9afba79ef4 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" "03 October 2002" "" ""
+.TH "SMB.CONF" "5" "05 November 2002" "" ""
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
 .SH "SYNOPSIS"
@@ -303,19 +303,6 @@ These substitutions are mostly noted in the descriptions below,
 but there are some general substitutions which apply whenever they 
 might be relevant. These are:
 .TP
-\fB%S\fR
-the name of the current service, if any.
-.TP
-\fB%P\fR
-the root directory of the current service, 
-if any.
-.TP
-\fB%u\fR
-user name of the current service, if any.
-.TP
-\fB%g\fR
-primary group name of %u.
-.TP
 \fB%U\fR
 session user name (the user name that the client 
 wanted, not necessarily the same as the one they got).
@@ -323,13 +310,6 @@ wanted, not necessarily the same as the one they got).
 \fB%G\fR
 primary group name of %U.
 .TP
-\fB%H\fR
-the home directory of the user given 
-by %u.
-.TP
-\fB%v\fR
-the Samba version.
-.TP
 \fB%h\fR
 the Internet hostname that Samba is running 
 on.
@@ -349,17 +329,6 @@ on port 445, as clients no longer send this information
 \fB%M\fR
 the Internet name of the client machine.
 .TP
-\fB%N\fR
-the name of your NIS home directory server.  
-This is obtained from your NIS auto.map entry.  If you have 
-not compiled Samba with the \fB--with-automount\fR 
-option then this value will be the same as %L.
-.TP
-\fB%p\fR
-the path of the service's home directory, 
-obtained from your NIS auto.map entry. The NIS auto.map entry 
-is split up as "%N:%p".
-.TP
 \fB%R\fR
 the selected protocol level after 
 protocol negotiation. It can be one of CORE, COREPLUS, 
@@ -384,10 +353,44 @@ The IP address of the client machine.
 \fB%T\fR
 the current date and time.
 .TP
+\fB%D\fR
+Name of the domain or workgroup of the current user.
+.TP
 \fB%$(\fIenvvar\fB)\fR
 The value of the environment variable
 \fIenvar\fR.
 .PP
+The following substitutes apply only to some configuration options(only those 
+that are used when a connection has been established):
+.TP
+\fB%S\fR
+the name of the current service, if any.
+.TP
+\fB%P\fR
+the root directory of the current service, 
+if any.
+.TP
+\fB%u\fR
+user name of the current service, if any.
+.TP
+\fB%g\fR
+primary group name of %u.
+.TP
+\fB%H\fR
+the home directory of the user given 
+by %u.
+.TP
+\fB%N\fR
+the name of your NIS home directory server.  
+This is obtained from your NIS auto.map entry.  If you have 
+not compiled Samba with the \fB--with-automount\fR 
+option then this value will be the same as %L.
+.TP
+\fB%p\fR
+the path of the service's home directory, 
+obtained from your NIS auto.map entry. The NIS auto.map entry 
+is split up as "%N:%p".
+.PP
 There are some quite creative things that can be done 
 with these substitutions and other smb.conf options.
 .SH "NAME MANGLING"
@@ -433,7 +436,7 @@ case. This option can be use with "preserve case = yes"
 to permit long filenames to retain their case, while short names 
 are lowercased. Default \fByes\fR.
 .PP
-By default, Samba 2.2 has the same semantics as a Windows 
+By default, Samba 3.0 has the same semantics as a Windows 
 NT server, in that it is case insensitive but case preserving.
 .SH "NOTE ABOUT USERNAME/PASSWORD VALIDATION"
 .PP
@@ -685,6 +688,9 @@ each parameter for details.  Note that some are synonyms.
 \fIldap passwd sync\fR
 .TP 0.2i
 \(bu
+\fIldap trust ids\fR
+.TP 0.2i
+\(bu
 \fIlm announce\fR
 .TP 0.2i
 \(bu
@@ -1713,10 +1719,10 @@ Example: \fBannounce as = Win95\fR
 \fBannounce version (G)\fR
 This specifies the major and minor version numbers 
 that nmbd will use when announcing itself as a server. The default 
-is 4.2.  Do not change this parameter unless you have a specific 
+is 4.9.  Do not change this parameter unless you have a specific 
 need to set a Samba server to be a downlevel server.
 
-Default: \fBannounce version = 4.5\fR
+Default: \fBannounce version = 4.9\fR
 
 Example: \fBannounce version = 2.0\fR
 .TP
@@ -1806,12 +1812,12 @@ to obtain a byte range lock on a region of an open file, and the
 request has a time limit associated with it.
 
 If this parameter is set and the lock range requested 
-cannot be immediately satisfied, Samba 2.2 will internally 
+cannot be immediately satisfied, samba will internally 
 queue the lock request, and periodically attempt to obtain 
 the lock until the timeout period expires.
 
 If this parameter is set to no, then 
-Samba 2.2 will behave as previous versions of Samba would and 
+samba will behave as previous versions of Samba would and 
 will fail the lock request immediately if the lock range 
 cannot be obtained.
 
@@ -2069,7 +2075,7 @@ effect.
 Default: \fBdebug pid = no\fR
 .TP
 \fBdebug timestamp (G)\fR
-Samba 2.2 debug log messages are timestamped 
+Samba debug log messages are timestamped 
 by default. If you are running at a high   \fIdebug level\fR these timestamps
 can be distracting. This boolean parameter allows timestamping 
 to be turned off.
@@ -2933,7 +2939,7 @@ this by trying to log in as your guest user (perhaps by using the
 \fBsu -\fR command) and trying to print using the 
 system print command such as \fBlpr(1)\fR or \fB  lp(1)\fR.
 
-This paramater does not accept % macros, because
+This parameter does not accept % macros, because
 many parts of the system require this value to be
 constant for correct operation.
 
@@ -3391,20 +3397,25 @@ The \fIldap ssl\fR can be set to one of three values:
 .RS
 .TP 0.2i
 \(bu
-\fIOn\fR  =  Always use SSL when contacting the 
-\fIldap server\fR.
-.TP 0.2i
-\(bu
 \fIOff\fR = Never use SSL when querying the directory.
 .TP 0.2i
 \(bu
 \fIStart_tls\fR = Use the LDAPv3 StartTLS extended operation 
 (RFC2830) for communicating with the directory server.
+.TP 0.2i
+\(bu
+\fIOn\fR  =
+Use SSL on the ldaps port when contacting the 
+\fIldap server\fR.  Only
+available when the backwards-compatiblity \fB   --with-ldapsam\fR option is specified
+to configure.  See \fIpassdb backend\fR
 .RE
 
-Default : \fBldap ssl = on\fR
+Default : \fBldap ssl = start_tls\fR
 .TP
 \fBldap suffix (G)\fR
+Specifies where user and machine accounts are added to the tree. Can be overriden by \fBldap user suffix\fR and \fBldap machine suffix\fR. It also used as the base dn for all ldap searches. 
+
 Default : \fBnone\fR
 .TP
 \fBldap user suffix (G)\fR
@@ -3440,6 +3451,23 @@ The \fIldap passwd sync\fR can be set to one of three values:
 
 Default : \fBldap passwd sync = no\fR
 .TP
+\fBldap trust ids (G)\fR
+Normally, Samba validates each entry
+in the LDAP server against getpwnam().  This allows
+LDAP to be used for Samba with the unix system using
+NIS (for example) and also ensures that Samba does not
+present accounts that do not otherwise exist.  
+
+This option is used to disable this functionality, and
+instead to rely on the presence of the appropriate
+attributes in LDAP directly, which can result in a
+significant performance boost in some situations.  
+Setting this option to yes effectivly assumes
+that the local machine is running \fBnss_ldap\fR against the
+same LDAP server.
+
+Default: \fBldap trust ids = No\fR
+.TP
 \fBlevel2 oplocks (S)\fR
 This parameter controls whether Samba supports
 level2 (read-only) oplocks on a share.
@@ -4056,11 +4084,21 @@ a better algorithm (generates less collisions) in the names.
 However, many Win32 applications store the mangled names and so
 changing to the new algorithm must not be done
 lightly as these applications may break unless reinstalled.
-New installations of Samba may set the default to hash2.
 
-Default: \fBmangling method = hash\fR
+Default: \fBmangling method = hash2\fR
+
+Example: \fBmangling method = hash\fR
+.TP
+\fBmangle prefix (G)\fR
+controls the number of prefix
+characters from the original name used when generating
+the mangled names. A larger value will give a weaker
+hash and therefore more name collisions. The minimum
+value is 1 and the maximum value is 6.
+
+Default: \fBmangle prefix = 1\fR
 
-Example: \fBmangling method = hash2\fR
+Example: \fBmangle prefix = 4\fR
 .TP
 \fBmangled stack (G)\fR
 This parameter controls the number of mangled names 
@@ -4868,7 +4906,18 @@ backend.  Takes an LDAP URL as an optional argument (defaults to
 backend, with non unix account support.  Takes an LDAP URL as an optional argument (defaults to 
 \fBldap://localhost\fR)
 
-See also                         \fInon unix account range\fR
+Note:  In this module, any account
+without a matching POSIX account is regarded
+as 'non unix'.
+
+See also                         \fInon unix account
+range\fR
+
+LDAP connections should be secured where
+possible.  This may be done using either
+Start-TLS (see                         \fIldap ssl\fR) or by
+specifying \fIldaps://\fR in
+the URL argument.  
 .TP 0.2i
 \(bu
 \fBnisplussam\fR - The NIS+ based passdb backend. Takes name NIS domain as an optional argument. Only works with sun NIS+ servers. 
@@ -6553,7 +6602,8 @@ Example: \fBtotal print jobs = 5000\fR
 .TP
 \fBunicode (G)\fR
 Specifies whether Samba should try 
-to use unicode on the wire by default. 
+to use unicode on the wire by default. Note: This does NOT
+mean that samba will assume that the unix machine uses unicode!
 
 Default: \fBunicode = yes\fR
 .TP
@@ -6563,6 +6613,8 @@ Samba runs on uses. Samba needs to know this in order to be able to
 convert text to the charsets other SMB clients use.
 
 Default: \fBunix charset = ASCII\fR
+
+Example: \fBunix charset = UTF8\fR
 .TP
 \fBunix extensions(G)\fR
 This boolean parameter controls whether Samba 
@@ -7313,7 +7365,7 @@ sections. In particular, ensure that the permissions on spool
 directories are correct.
 .SH "VERSION"
 .PP
-This man page is correct for version 2.2 of 
+This man page is correct for version 3.0 of 
 the Samba suite.
 .SH "SEE ALSO"
 .PP
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index 63d78658a6..0c33475048 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -3,12 +3,12 @@
 .\" <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" "01 October 2002" "" ""
+.TH "SMBCLIENT" "1" "05 November 2002" "" ""
 .SH NAME
 smbclient \- ftp-like client to access SMB/CIFS resources  on servers
 .SH SYNOPSIS
 
-\fBsmbclient\fR \fBservicename\fR [ \fBpassword\fR ] [ \fB-b <buffer size>\fR ] [ \fB-d debuglevel\fR ] [ \fB-D Directory\fR ] [ \fB-U username\fR ] [ \fB-W workgroup\fR ] [ \fB-M <netbios name>\fR ] [ \fB-m maxprotocol\fR ] [ \fB-A authfile\fR ] [ \fB-N\fR ] [ \fB-l logfile\fR ] [ \fB-L <netbios name>\fR ] [ \fB-I destinationIP\fR ] [ \fB-E <terminal code>\fR ] [ \fB-c <command string>\fR ] [ \fB-i scope\fR ] [ \fB-O <socket options>\fR ] [ \fB-p port\fR ] [ \fB-R <name resolve order>\fR ] [ \fB-s <smb config file>\fR ] [ \fB-T<c|x>IXFqgbNan\fR ]
+\fBsmbclient\fR \fBservicename\fR [ \fBpassword\fR ] [ \fB-b <buffer size>\fR ] [ \fB-d debuglevel\fR ] [ \fB-D Directory\fR ] [ \fB-U username\fR ] [ \fB-W workgroup\fR ] [ \fB-M <netbios name>\fR ] [ \fB-m maxprotocol\fR ] [ \fB-A authfile\fR ] [ \fB-N\fR ] [ \fB-l logfile\fR ] [ \fB-L <netbios name>\fR ] [ \fB-I destinationIP\fR ] [ \fB-E\fR ] [ \fB-c <command string>\fR ] [ \fB-i scope\fR ] [ \fB-O <socket options>\fR ] [ \fB-p port\fR ] [ \fB-R <name resolve order>\fR ] [ \fB-s <smb config file>\fR ] [ \fB-T<c|x>IXFqgbNan\fR ]
 
 .SH "DESCRIPTION"
 .PP
diff --git a/docs/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5
index 47eabcaec8..907e388bee 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" "01 October 2002" "" ""
+.TH "SMBPASSWD" "5" "05 November 2002" "" ""
 .SH NAME
 smbpasswd \- The Samba encrypted password file
 .SH SYNOPSIS
@@ -135,7 +135,7 @@ in seconds since the epoch (1970) that the last change was made.
 All other colon separated fields are ignored at this time.
 .SH "VERSION"
 .PP
-This man page is correct for version 2.2 of 
+This man page is correct for version 3.0 of 
 the Samba suite.
 .SH "SEE ALSO"
 .PP
diff --git a/docs/manpages/vfstest.1 b/docs/manpages/vfstest.1
index dc3092bc66..c4958e3dd4 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" "01 October 2002" "" ""
+.TH "VFSTEST" "1" "05 November 2002" "" ""
 .SH NAME
 vfstest \- tool for testing samba VFS modules
 .SH SYNOPSIS
@@ -25,10 +25,26 @@ Execute the specified (colon-seperated) commands.
 See below for the commands that are available.
 .TP
 \fB-d|--debug=debuglevel\fR
-set the debuglevel. Debug level 0 is the lowest
-and 100 being the highest. This should be set to 100 if you are
-planning on submitting a bug report to the Samba team (see
-\fIBUGS.txt\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-h|--help\fR
 Print a summary of command line options.
diff --git a/docs/manpages/wbinfo.1 b/docs/manpages/wbinfo.1
index 96464987e3..312ef3acb2 100644
--- a/docs/manpages/wbinfo.1
+++ b/docs/manpages/wbinfo.1
@@ -3,12 +3,12 @@
 .\" <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" "01 October 2002" "" ""
+.TH "WBINFO" "1" "05 November 2002" "" ""
 .SH NAME
 wbinfo \- Query information from winbind daemon
 .SH SYNOPSIS
 
-\fBwbinfo\fR [ \fB-u\fR ] [ \fB-g\fR ] [ \fB-h 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-r user\fR ] [ \fB-a user%password\fR ] [ \fB-A user%password\fR ]
+\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 ]
 
 .SH "DESCRIPTION"
 .PP
@@ -38,14 +38,14 @@ will also be listed.  Note that this operation does not assign
 group ids to any groups that have not already been seen by
 \fBwinbindd(8)\fR. 
 .TP
-\fB-h name\fR
-The \fI-h\fR option 
+\fB-N name\fR
+The \fI-N\fR option 
 queries \fBwinbindd(8)\fR to query the WINS
 server for the IP address associated with the NetBIOS name
 specified by the \fIname\fR parameter.
 .TP
-\fB-i ip\fR
-The \fI-i\fR option 
+\fB-I ip\fR
+The \fI-I\fR option 
 queries \fBwinbindd(8)\fR to send a node status
 request to get the NetBIOS name associated with the IP address
 specified by the \fIip\fR parameter.
@@ -119,7 +119,7 @@ succeeded, or 1 if the operation failed.  If the \fBwinbindd(8)
 failure. 
 .SH "VERSION"
 .PP
-This man page is correct for version 2.2 of 
+This man page is correct for version 3.0 of 
 the Samba suite.
 .SH "SEE ALSO"
 .PP
diff --git a/docs/manpages/winbindd.8 b/docs/manpages/winbindd.8
index fe02c424e1..21c5cc0635 100644
--- a/docs/manpages/winbindd.8
+++ b/docs/manpages/winbindd.8
@@ -3,12 +3,12 @@
 .\" <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" "01 October 2002" "" ""
+.TH "WINBINDD" "8" "18 oktober 2002" "" ""
 .SH NAME
 winbindd \- Name Service Switch daemon for resolving names  from NT servers
 .SH SYNOPSIS
 
-\fBwinbindd\fR [ \fB-i\fR ] [ \fB-d <debug level>\fR ] [ \fB-s <smb config file>\fR ]
+\fBwinbindd\fR [ \fB-i\fR ] [ \fB-B\fR ] [ \fB-d <debug level>\fR ] [ \fB-s <smb config file>\fR ] [ \fB-n\fR ]
 
 .SH "DESCRIPTION"
 .PP
@@ -85,6 +85,25 @@ Tells \fBwinbindd\fR to not
 become a daemon and detach from the current terminal. This 
 option is used by developers when interactive debugging 
 of \fBwinbindd\fR is required. 
+.TP
+\fB-n\fR
+Disable caching. This means winbindd will 
+always have to wait for a response from the domain controller 
+before it can respond to a client and this thus makes things 
+slower. The results will however be more accurate, since 
+results from the cache might not be up-to-date. This 
+might also temporarily hang winbindd if the DC doesn't respond.
+.TP
+\fB-B\fR
+Dual daemon mode. This means winbindd will run 
+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
+\fIsmb.conf\fR file. 
 .SH "NAME AND ID RESOLUTION"
 .PP
 Users and groups on a Windows NT server are assigned 
@@ -291,7 +310,7 @@ This directory is by default \fI/usr/local/samba/var/locks
 Storage for cached user and group information.
 .SH "VERSION"
 .PP
-This man page is correct for version 2.2 of
+This man page is correct for version 3.0 of
 the Samba suite.
 .SH "SEE ALSO"
 .PP