- Regenerate docs

- Document 'preload modules'
(This used to be commit 57407401d0f261d4b8e42fdc64479afef10211c3)

5 files changed, 48 insertions, 141 deletions

diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index f5dfe5e5de..6906231177 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" "24 March 2003" "" ""
+.TH "NMBD" "8" "30 March 2003" "" ""
 
 .SH NAME
 nmbd \- NetBIOS name server to provide NetBIOS  over IP naming services to clients
@@ -146,36 +146,6 @@ 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-p <UDP port number>\fR
 UDP port number is a positive integer value.
 This option changes the default UDP port number (normally 137)
diff --git a/docs/manpages/pdbedit.8 b/docs/manpages/pdbedit.8
index c5c8ba4aea..0f48988600 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" "24 March 2003" "" ""
+.TH "PDBEDIT" "8" "30 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-C 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-g\fR ] [ \fB-b passdb-backend\fR ] [ \fB-g\fR ] [ \fB-d debuglevel\fR ] [ \fB-s configfile\fR ] [ \fB-P account-policy\fR ] [ \fB-C value\fR ]
 
 .SH "DESCRIPTION"
 .PP
@@ -175,6 +175,22 @@ another and will ease backing up.
 
 Example: \fBpdbedit -e smbpasswd:/root/samba-users.backup\fR
 .TP
+\fB-g\fR
+If you specify \fI-g\fR,
+then \fI-i in-backend -e out-backend\fR
+applies to the group mapping instead of the user database.
+
+This option will ease migration from one passdb backend to
+another and will ease backing up.
+.TP
+\fB-g\fR
+If you specify \fI-g\fR,
+then \fI-i in-backend -e out-backend\fR
+applies to the group mapping instead of the user database.
+
+This option will ease migration from one passdb backend to
+another and will ease backing up.
+.TP
 \fB-b passdb-backend\fR
 Use a different default passdb backend. 
 
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index ced5057fcd..ddcc2d24e5 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" "24 March 2003" "" ""
+.TH "SMB.CONF" "5" "30 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 delete dn\fR
+.TP 0.2i
+\(bu
 \fIldap del only sam attr\fR
 .TP 0.2i
 \(bu
@@ -874,6 +877,9 @@ each parameter for details.  Note that some are synonyms.
 \fIpreload\fR
 .TP 0.2i
 \(bu
+\fIpreload modules\fR
+.TP 0.2i
+\(bu
 \fIprintcap\fR
 .TP 0.2i
 \(bu
@@ -2525,7 +2531,7 @@ DOS SMB clients assume the server has
 the same charset as they do. This option specifies which 
 charset Samba should talk to DOS clients.
 
-The default depends on which charsets you have instaled. 
+The default depends on which charsets you have installed. 
 Samba tries to use charset 850 but falls back to ASCII in 
 case it is not available. Run \fBtestparm\fR(1) to check the default on your system.
 .TP
@@ -3350,10 +3356,13 @@ 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.
+operation in the ldapsam deletes the complete entry or only the attributes
+specific to Samba.
 
-Default : \fBldap del only sam attr = yes\fR
+Default : \fBldap delete dn = no\fR
+.TP
+\fB>ldap del only sam attr (G)\fR
+Inverted synonym for \fI  ldap delete dn\fR.
 .TP
 \fB>ldap filter (G)\fR
 This parameter specifies the RFC 2254 compliant LDAP search filter.
@@ -5330,6 +5339,18 @@ Default: \fBno preloaded services\fR
 
 Example: \fBpreload = fred lp colorlp\fR
 .TP
+\fB>preload modules (G)\fR
+This is a list of paths to modules that should 
+be loaded into smbd before a client connects. This improves 
+the speed of smbd when reacting to new connections somewhat. 
+
+It is recommended to only use this option on heavy-performance 
+servers.
+
+Default: \fBpreload modules = \fR
+
+Example: \fBpreload modules = /usr/lib/samba/passdb/mysql.so\fR
+.TP
 \fB>preserve case (S)\fR
 This controls if new filenames are created
 with the case that the client passes, or if they are forced to 
diff --git a/docs/manpages/smbsh.1 b/docs/manpages/smbsh.1
index 8e99151e36..0f7ed1d290 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" "24 March 2003" "" ""
+.TH "SMBSH" "1" "30 March 2003" "" ""
 
 .SH NAME
 smbsh \- Allows access to Windows NT filesystem  using UNIX commands
@@ -39,76 +39,6 @@ the user to set the directory prefix for SMB access. The
 default value if this option is not specified is 
 \fBsmb\fR.
 .TP
-\fB-R <name resolve order>\fR
-This option is used to determine what naming 
-services and in what order to resolve 
-host names to IP addresses. The option takes a space-separated 
-string of different name resolution options.
-
-The options are: "lmhosts", "host", "wins" and "bcast". 
-They cause names to be resolved as follows :
-.RS
-.TP 0.2i
-\(bu
-lmhosts: 
-Lookup an IP address in the Samba lmhosts file. If the 
-line in lmhosts has no name type attached to the 
-NetBIOS name 
-(see the \fBlmhosts\fR(5) for details) 
-then any name type matches for lookup.
-.TP 0.2i
-\(bu
-host: 
-Do a standard host name to IP address resolution, using
-the system \fI/etc/hosts\fR, NIS, or DNS
-lookups. This method of name resolution is operating 
-system dependent, for instance on IRIX or Solaris this 
-may be controlled by the \fI/etc/nsswitch.conf
-\fR file).  Note that this method is only used 
-if the NetBIOS name type being queried is the 0x20 
-(server) name type, otherwise it is ignored.
-.TP 0.2i
-\(bu
-wins: 
-Query a name with the IP address listed in the 
-\fIwins server\fR parameter.  If no 
-WINS server has been specified this method will be 
-ignored.
-.TP 0.2i
-\(bu
-bcast: 
-Do a broadcast on each of the known local interfaces 
-listed in the \fIinterfaces\fR
-parameter. This is the least reliable of the name 
-resolution methods as it depends on the target host 
-being on a locally connected subnet.
-.RE
-
-If this parameter is not set then the name resolve order 
-defined in the \fBsmb.conf\fR(5) file parameter  
-(\fIname resolve order\fR) will be used. 
-
-The default order is lmhosts, host, wins, bcast. Without 
-this parameter or any entry in the \fIname resolve order
-\fR parameter of the \fBsmb.conf\fR(5) file, the name resolution methods 
-will be attempted in this order. 
-.TP
-\fB-d <debug level>\fR
-debug level is an integer from 0 to 10.
-
-The default value if this parameter is not specified
-is zero.
-
-The higher this value, the more detail will be logged
-about the activities of \fBnmblookup\fR(1). At level
-0, only critical errors and serious warnings will be logged.
-.TP
-\fB-l logfilename\fR
-If specified causes all debug messages to be
-written to the file specified by \fIlogfilename
-\fR. If not specified then all messages will be 
-written to\fIstderr\fR.
-.TP
 \fB-L libdir\fR
 This parameter specifies the location of the 
 shared libraries used by \fBsmbsh\fR. The default
diff --git a/docs/manpages/winbindd.8 b/docs/manpages/winbindd.8
index a02fe32b04..0a35a9264d 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" "24 March 2003" "" ""
+.TH "WINBINDD" "8" "30 March 2003" "" ""
 
 .SH NAME
 winbindd \- Name Service Switch daemon for resolving names  from NT servers
@@ -131,36 +131,6 @@ 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
@@ -185,7 +155,7 @@ 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.
+Advantage of this is that responses stay accurate and are faster.
 .SH "NAME AND ID RESOLUTION"
 .PP
 Users and groups on a Windows NT server are assigned