- added new deldriver command to rpcclient.1

- made 'log level' the preferred parameter to match swat
- regenerated formats

6 files changed, 146 insertions, 63 deletions

diff --git a/docs/docbook/manpages/rpcclient.1.sgml b/docs/docbook/manpages/rpcclient.1.sgml
index c02f935d823..17e4f803a3c 100644
--- a/docs/docbook/manpages/rpcclient.1.sgml
+++ b/docs/docbook/manpages/rpcclient.1.sgml
@@ -107,8 +107,9 @@
 		
 		<varlistentry>
 		<term>-l logbasename</term>
-		<listitem><para>File name for log/debug files. .client will be 
-		appended. The log file is never removed  by the client.
+		<listitem><para>File name for log/debug files. The extension 
+		'.client' will be appended. The log file is never removed  
+		by the client.
 		</para></listitem>
 		</varlistentry>
 
@@ -179,8 +180,15 @@
 	<para><emphasis>LSARPC</emphasis></para>
 	<itemizedlist>
 		<listitem><para><command>lsaquery</command></para></listitem>
-		<listitem><para><command>lookupsids</command></para></listitem>
-		<listitem><para><command>lookupnames</command></para></listitem>
+		
+		<listitem><para><command>lookupsids</command> - Resolve a list 
+		of SIDs to usernames.
+		</para></listitem>
+		
+		<listitem><para><command>lookupnames</command>Resolve s list 
+		of usernames to SIDs.
+		</para></listitem>
+		
 		<listitem><para><command>enumtrusts</command></para></listitem>
 	</itemizedlist>	
 	<para> </para>
@@ -193,6 +201,10 @@
 		<listitem><para><command>querygroup</command></para></listitem>
 		<listitem><para><command>queryusergroups</command></para></listitem>
 		<listitem><para><command>querygroupmem</command></para></listitem>
+		<listitem><para><command>queryaliasmem</command></para></listitem>
+		<listitem><para><command>querydispinfo</command></para></listitem>
+		<listitem><para><command>querydominfo</command></para></listitem>
+		<listitem><para><command>enumdomgroups</command></para></listitem>
 	</itemizedlist>
 	<para> </para>
 
@@ -244,6 +256,12 @@
 		</listitem>
 
 
+		<listitem><para><command>deldriver</command> - 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.
+		</para></listitem>
+
 		<listitem><para><command>enumdata</command> - Enumerate all 
 		printer setting data stored on the server. On Windows NT  clients, 
 		these values are stored  in the registry, while Samba servers 
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index e1317a5d737..70b4cc1c8ee 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -1764,15 +1764,9 @@
 
 		<varlistentry>
 		<term><anchor id="DEBUGLEVEL">debuglevel (G)</term>
-		<listitem><para>The value of the parameter (an integer) allows 
-		the debug level (logging level) to be specified in the 
-		<filename>smb.conf</filename> file. This is to give greater 
-		flexibility in the configuration of the system.</para>
-
-		<para>The default will be the debug level specified on 
-		the command line or level zero if none was specified.</para>
-
-		<para>Example: <command>debug level = 3</command></para></listitem>
+		<listitem><para>Synonym for <link linkend="LOGLEVEL"><parameter>
+		log level</parameter></link>.</para>
+		</listitem>
 		</varlistentry>
 
 
@@ -3493,9 +3487,15 @@
 
 		<varlistentry>
 		<term><anchor id="LOGLEVEL">log level (G)</term>
-		<listitem><para>Synonym for <link linkend="DEBUGLEVEL"><parameter>
-		debug level</parameter></link>.</para>
-		</listitem>
+		<listitem><para>The value of the parameter (an integer) allows 
+		the debug level (logging level) to be specified in the 
+		<filename>smb.conf</filename> file. This is to give greater 
+		flexibility in the configuration of the system.</para>
+
+		<para>The default will be the log level specified on 
+		the command line or level zero if none was specified.</para>
+
+		<para>Example: <command>log level = 3</command></para></listitem>
 		</varlistentry>
 
 
diff --git a/docs/htmldocs/rpcclient.1.html b/docs/htmldocs/rpcclient.1.html
index 786dd6c8668..e41f5a7c93e 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
@@ -275,14 +276,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 +334,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 +462,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 +647,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN196"
+NAME="AEN211"
 ></A
 ><H2
 >BUGS</H2
@@ -644,7 +688,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN206"
+NAME="AEN221"
 ></A
 ><H2
 >VERSION</H2
@@ -655,7 +699,7 @@ NAME="AEN206"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN209"
+NAME="AEN224"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index f0a56a60c6c..75e25876894 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -6215,21 +6215,15 @@ NAME="DEBUGLEVEL"
 >debuglevel (G)</DT
 ><DD
 ><P
->The value of the parameter (an integer) allows 
-		the debug level (logging level) to be specified in the 
-		<TT
-CLASS="FILENAME"
->smb.conf</TT
-> file. This is to give greater 
-		flexibility in the configuration of the system.</P
-><P
->The default will be the debug level specified on 
-		the command line or level zero if none was specified.</P
-><P
->Example: <B
-CLASS="COMMAND"
->debug level = 3</B
-></P
+>Synonym for <A
+HREF="#LOGLEVEL"
+><TT
+CLASS="PARAMETER"
+><I
+>		log level</I
+></TT
+></A
+>.</P
 ></DD
 ><DT
 ><A
@@ -9698,15 +9692,21 @@ NAME="LOGLEVEL"
 >log level (G)</DT
 ><DD
 ><P
->Synonym for <A
-HREF="#DEBUGLEVEL"
-><TT
-CLASS="PARAMETER"
-><I
->		debug level</I
-></TT
-></A
->.</P
+>The value of the parameter (an integer) allows 
+		the debug level (logging level) to be specified in the 
+		<TT
+CLASS="FILENAME"
+>smb.conf</TT
+> file. This is to give greater 
+		flexibility in the configuration of the system.</P
+><P
+>The default will be the log level specified on 
+		the command line or level zero if none was specified.</P
+><P
+>Example: <B
+CLASS="COMMAND"
+>log level = 3</B
+></P
 ></DD
 ><DT
 ><A
diff --git a/docs/manpages/rpcclient.1 b/docs/manpages/rpcclient.1
index e9ea6427d5d..b97e1474266 100644
--- a/docs/manpages/rpcclient.1
+++ b/docs/manpages/rpcclient.1
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "RPCCLIENT" "1" "03 May 2001" "" ""
+.TH "RPCCLIENT" "1" "18 May 2001" "" ""
 .SH NAME
 rpcclient \- tool for executing client side  MS-RPC functions
 .SH SYNOPSIS
@@ -56,8 +56,9 @@ planning on submitting a bug report to the Samba team (see BUGS.txt).
 Print a summary of command line options.
 .TP
 \fB-l logbasename\fR
-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.
 .TP
 \fB-N\fR
 instruct \fBrpcclient\fR not to ask 
@@ -106,10 +107,12 @@ opposed to the Domain SAM).
 \fBlsaquery\fR
 .TP 0.2i
 \(bu
-\fBlookupsids\fR
+\fBlookupsids\fR - Resolve a list 
+of SIDs to usernames.
 .TP 0.2i
 \(bu
-\fBlookupnames\fR
+\fBlookupnames\fRResolve s list 
+of usernames to SIDs.
 .TP 0.2i
 \(bu
 \fBenumtrusts\fR
@@ -130,6 +133,18 @@ opposed to the Domain SAM).
 .TP 0.2i
 \(bu
 \fBquerygroupmem\fR
+.TP 0.2i
+\(bu
+\fBqueryaliasmem\fR
+.TP 0.2i
+\(bu
+\fBquerydispinfo\fR
+.TP 0.2i
+\(bu
+\fBquerydominfo\fR
+.TP 0.2i
+\(bu
+\fBenumdomgroups\fR
 .PP
 .PP
 .PP
@@ -180,6 +195,12 @@ and the \fIport\fRmust be a valid port name (see
 \fBenumports\fR.
 .TP 0.2i
 \(bu
+\fBdeldriver\fR - 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.
+.TP 0.2i
+\(bu
 \fBenumdata\fR - Enumerate all 
 printer setting data stored on the server. On Windows NT clients, 
 these values are stored in the registry, while Samba servers 
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index f7d8058e355..1b77fd95e3c 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMB.CONF" "5" "16 May 2001" "" ""
+.TH "SMB.CONF" "5" "18 May 2001" "" ""
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
 .SH "SYNOPSIS"
@@ -2079,15 +2079,7 @@ effect.
 Default: \fBdebug uid = no\fR
 .TP
 \fBdebuglevel (G)\fR
-The value of the parameter (an integer) allows 
-the debug level (logging level) to be specified in the 
-\fIsmb.conf\fR file. This is to give greater 
-flexibility in the configuration of the system.
-
-The default will be the debug level specified on 
-the command line or level zero if none was specified.
-
-Example: \fBdebug level = 3\fR
+Synonym for \fI log level\fR.
 .TP
 \fBdefault (G)\fR
 A synonym for \fI default service\fR.
@@ -3437,7 +3429,15 @@ you to have separate log files for each user or machine.
 Example: \fBlog file = /usr/local/samba/var/log.%m
 \fR.TP
 \fBlog level (G)\fR
-Synonym for \fI debug level\fR.
+The value of the parameter (an integer) allows 
+the debug level (logging level) to be specified in the 
+\fIsmb.conf\fR file. This is to give greater 
+flexibility in the configuration of the system.
+
+The default will be the log level specified on 
+the command line or level zero if none was specified.
+
+Example: \fBlog level = 3\fR
 .TP
 \fBlogon drive (G)\fR
 This parameter specifies the local path to