few fixes and regenerate

(This used to be commit 0ffda9ffad2073a5995ce34fde5c3b5fc4859b90)

2 files changed, 79 insertions, 25 deletions

diff --git a/docs/htmldocs/rpcclient.1.html b/docs/htmldocs/rpcclient.1.html
index 98a19c6ea2..eaa864f109 100644
--- a/docs/htmldocs/rpcclient.1.html
+++ b/docs/htmldocs/rpcclient.1.html
@@ -37,7 +37,7 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >rpcclient</B
->  {server} [-A authfile] [-c &#60;command string&#62;] [-d debuglevel] [-h] [-l logfile] [-N] [-s &#60;smb config file&#62;] [-U username[%password]] [-W workgroup] [-N]</P
+>  [-A authfile] [-c &#60;command string&#62;] [-d debuglevel] [-h] [-l logfile] [-N] [-s &#60;smb config file&#62;] [-U username[%password]] [-W workgroup] [-N] {server}</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
@@ -96,7 +96,7 @@ CLASS="FILENAME"
 >.</P
 ></DD
 ><DT
->-A filename</DT
+>-A|--authfile=filename</DT
 ><DD
 ><P
 >This option allows 
@@ -125,14 +125,14 @@ CLASS="PROGRAMLISTING"
 		access from unwanted users. </P
 ></DD
 ><DT
->-c 'command string'</DT
+>-c|--command='command string'</DT
 ><DD
 ><P
 >execute semicolon separated commands (listed 
 		below)) </P
 ></DD
 ><DT
->-d debuglevel</DT
+>-d|--debug=debuglevel</DT
 ><DD
 ><P
 >set the debuglevel. Debug level 0 is the lowest 
@@ -144,14 +144,14 @@ CLASS="FILENAME"
 		</P
 ></DD
 ><DT
->-h</DT
+>-h|--help</DT
 ><DD
 ><P
 >Print a summary of command line options.
 		</P
 ></DD
 ><DT
->-l logbasename</DT
+>-l|--logfile=logbasename</DT
 ><DD
 ><P
 >File name for log/debug files. The extension 
@@ -163,7 +163,7 @@ CLASS="CONSTANT"
 		</P
 ></DD
 ><DT
->-N</DT
+>-N|--nopass</DT
 ><DD
 ><P
 >instruct <B
@@ -182,7 +182,7 @@ CLASS="PARAMETER"
 > option.</P
 ></DD
 ><DT
->-s smb.conf</DT
+>-s|--conf=smb.conf</DT
 ><DD
 ><P
 >Specifies the location of the all important 
@@ -192,7 +192,7 @@ CLASS="FILENAME"
 > file. </P
 ></DD
 ><DT
->-U username[%password]</DT
+>-U|--user=username[%password]</DT
 ><DD
 ><P
 >Sets the SMB username or username and password. </P
@@ -238,7 +238,7 @@ CLASS="COMMAND"
 		it in directly. </P
 ></DD
 ><DT
->-W domain</DT
+>-W|--workgroup=domain</DT
 ><DD
 ><P
 >Set the SMB domain of the username.   This 
@@ -693,7 +693,7 @@ NAME="AEN222"
 ><H2
 >VERSION</H2
 ><P
->This man page is correct for version 2.2 of the Samba 
+>This man page is correct for version 3.0 of the Samba 
 	suite.</P
 ></DIV
 ><DIV
diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index 183cefbd3b..ff8590df85 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -924,6 +924,18 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#ALGORITHMICRIDBASE"
+><TT
+CLASS="PARAMETER"
+><I
+>algorithmic rid base</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#ALLOWTRUSTEDDOMAINS"
 ><TT
 CLASS="PARAMETER"
@@ -3002,7 +3014,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN971"
+NAME="AEN975"
 ></A
 ><H2
 >COMPLETE LIST OF SERVICE PARAMETERS</H2
@@ -4445,7 +4457,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1451"
+NAME="AEN1455"
 ></A
 ><H2
 >EXPLANATION OF EACH PARAMETER</H2
@@ -5019,6 +5031,38 @@ CLASS="PARAMETER"
 ></DD
 ><DT
 ><A
+NAME="ALGORITHMICRIDBASE"
+></A
+>algorithmic rid base (G)</DT
+><DD
+><P
+>This determines how Samba will use its
+                algorithmic mapping from uids/gid to the RIDs needed to construct
+                NT Security Identifiers.</P
+><P
+>Setting this option to a larger value could be useful to sites
+                transitioning from WinNT and Win2k, as existing user and 
+                group rids would otherwise clash with sytem users etc. 
+                </P
+><P
+>All UIDs and GIDs must be able to be resolved into SIDs for  
+                the correct operation of ACLs on the server.  As such the algorithmic
+                mapping can't be 'turned off', but pushing it 'out of the way' should
+                resolve the issues.  Users and groups can then be assigned 'low' RIDs
+                in arbitary-rid supporting backends. </P
+><P
+>Default: <B
+CLASS="COMMAND"
+>algorithmic rid base = 1000</B
+></P
+><P
+>Example: <B
+CLASS="COMMAND"
+>algorithmic rid base = 100000</B
+></P
+></DD
+><DT
+><A
 NAME="ALLOWTRUSTEDDOMAINS"
 ></A
 >allow trusted domains (G)</DT
@@ -12655,10 +12699,10 @@ NAME="PASSDBBACKEND"
 >passdb backend (G)</DT
 ><DD
 ><P
->This option allows the administrator to chose what
-                backend in which to store passwords.  This allows (for example) both 
-                smbpasswd and tdbsam to be used without a recompile.  Only one can
-                be used at a time however, and experimental backends must still be selected
+>This option allows the administrator to chose which backends to retrieve and store passwords with. This allows (for example) both 
+                smbpasswd and tdbsam to be used without a recompile. 
+                Multiple backends can be specified, seperated by spaces. The backends will be searched in the order they are specified. New users are always added to the first backend specified.
+                Experimental backends must still be selected
                 (eg --with-tdbsam) at configure time.
 		</P
 ><P
@@ -12798,7 +12842,7 @@ CLASS="COMMAND"
 ><P
 >Example: <B
 CLASS="COMMAND"
->passdb backend = tdbsam:/etc/samba/private/passdb.tdb</B
+>passdb backend = tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd</B
 ></P
 ><P
 >Example: <B
@@ -12808,7 +12852,7 @@ CLASS="COMMAND"
 ><P
 >Example: <B
 CLASS="COMMAND"
->passdb backend = plugin:/usr/local/samba/lib/my_passdb.so:my_plugin_args</B
+>passdb backend = plugin:/usr/local/samba/lib/my_passdb.so:my_plugin_args tdbsam:/etc/samba/private/passdb.tdb</B
 ></P
 ></DD
 ><DT
@@ -14013,6 +14057,12 @@ HREF="#AEN79"
 > section above for reasons 
 		why you might want to do this.</P
 ><P
+>To use the CUPS printing interface set <B
+CLASS="COMMAND"
+>printcap name = cups
+		</B
+>.</P
+><P
 >On System V systems that use <B
 CLASS="COMMAND"
 >lpstat</B
@@ -18435,14 +18485,18 @@ CLASS="FILENAME"
 > modules for UNIX services.
 		</P
 ><P
+>Please note that setting this parameter to + causes problems
+		with group membership at least on glibc systems, as the character +
+		is used as a special character for NIS in /etc/group.</P
+><P
 >Example: <B
 CLASS="COMMAND"
->winbind separator = \</B
+>winbind separator = \\</B
 ></P
 ><P
 >Example: <B
 CLASS="COMMAND"
->winbind separator = +</B
+>winbind separator = /</B
 ></P
 ></DD
 ><DT
@@ -18869,7 +18923,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5973"
+NAME="AEN5991"
 ></A
 ><H2
 >WARNINGS</H2
@@ -18899,7 +18953,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5979"
+NAME="AEN5997"
 ></A
 ><H2
 >VERSION</H2
@@ -18910,7 +18964,7 @@ NAME="AEN5979"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5982"
+NAME="AEN6000"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -18989,7 +19043,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6002"
+NAME="AEN6020"
 ></A
 ><H2
 >AUTHOR</H2