syncing up with SAMBA_2_2

(This used to be commit 1bc58c21b15fcdb0a504d051f60e20c4e24441e6)

1 files changed, 54 insertions, 16 deletions

diff --git a/docs/htmldocs/rpcclient.1.html b/docs/htmldocs/rpcclient.1.html
index 786dd6c866..9c19660a46 100644
--- a/docs/htmldocs/rpcclient.1.html
+++ b/docs/htmldocs/rpcclient.1.html
@@ -151,8 +151,9 @@ CLASS="PROGRAMLISTING"
 >-l logbasename</DT
 ><DD
 ><P
->File name for log/debug files. .client will be 
-		appended. The log file is never removed  by the client.
+>File name for log/debug files. The extension 
+		'.client' will be appended. The log file is never removed  
+		by the client.
 		</P
 ></DD
 ><DT
@@ -235,14 +236,8 @@ CLASS="COMMAND"
 ><DD
 ><P
 >Set the SMB domain of the username.   This 
-		overrides the default  domain which is the domain of the 
-		server specified with the  <TT
-CLASS="PARAMETER"
-><I
->-S</I
-></TT
-> option.  
-		If the domain specified is the same as the server's NetBIOS name, 
+		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). </P
 ></DD
@@ -252,7 +247,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN91"
+NAME="AEN90"
 ></A
 ><H2
 >COMMANDS</H2
@@ -275,14 +270,18 @@ CLASS="COMMAND"
 ><B
 CLASS="COMMAND"
 >lookupsids</B
-></P
+> - Resolve a list 
+		of SIDs to usernames.
+		</P
 ></LI
 ><LI
 ><P
 ><B
 CLASS="COMMAND"
 >lookupnames</B
-></P
+> - Resolve s list 
+		of usernames to SIDs.
+		</P
 ></LI
 ><LI
 ><P
@@ -329,6 +328,34 @@ CLASS="COMMAND"
 >querygroupmem</B
 ></P
 ></LI
+><LI
+><P
+><B
+CLASS="COMMAND"
+>queryaliasmem</B
+></P
+></LI
+><LI
+><P
+><B
+CLASS="COMMAND"
+>querydispinfo</B
+></P
+></LI
+><LI
+><P
+><B
+CLASS="COMMAND"
+>querydominfo</B
+></P
+></LI
+><LI
+><P
+><B
+CLASS="COMMAND"
+>enumdomgroups</B
+></P
+></LI
 ></UL
 ><P
 > </P
@@ -429,6 +456,17 @@ CLASS="COMMAND"
 ><P
 ><B
 CLASS="COMMAND"
+>deldriver</B
+> - Delete the 
+		specified printer driver for all architectures.  This
+		does not delete the actual driver files from the server,
+		only the entry from the server's list of drivers.
+		</P
+></LI
+><LI
+><P
+><B
+CLASS="COMMAND"
 >enumdata</B
 > - Enumerate all 
 		printer setting data stored on the server. On Windows NT  clients, 
@@ -603,7 +641,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN196"
+NAME="AEN210"
 ></A
 ><H2
 >BUGS</H2
@@ -644,7 +682,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN206"
+NAME="AEN220"
 ></A
 ><H2
 >VERSION</H2
@@ -655,7 +693,7 @@ NAME="AEN206"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN209"
+NAME="AEN223"
 ></A
 ><H2
 >AUTHOR</H2