syncing up changes in 2.2

(This used to be commit ffbbe67dbfde7f7ce4bb70becfc696c395dbf6b2)

1 files changed, 42 insertions, 29 deletions

diff --git a/docs/htmldocs/rpcclient.1.html b/docs/htmldocs/rpcclient.1.html
index 0242f7b827..786dd6c866 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 &lt;command string&gt;] [-d debuglevel] [-h] [-l logfile] [-N] [-s &lt;smb config file&gt;] [-U username[%password]] [-W workgroup] [-N]</P
+>  {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
 ></DIV
 ><DIV
 CLASS="REFSECT1"
@@ -104,12 +104,21 @@ CLASS="FILENAME"
 		password used in the connection.  The format of the file is 
 		</P
 ><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->		username = &lt;value&gt; 
-		password = &lt;value&gt;
-		domain   = &lt;value&gt;
+>		username = &#60;value&#62; 
+		password = &#60;value&#62;
+		domain   = &#60;value&#62;
 		</PRE
+></TD
+></TR
+></TABLE
 ></P
 ><P
 >Make certain that the permissions on the file restrict 
@@ -248,9 +257,8 @@ NAME="AEN91"
 ><H2
 >COMMANDS</H2
 ><P
-><I
-CLASS="EMPHASIS"
->LSARPC</I
+><EM
+>LSARPC</EM
 ></P
 ><P
 ></P
@@ -287,9 +295,8 @@ CLASS="COMMAND"
 ><P
 > </P
 ><P
-><I
-CLASS="EMPHASIS"
->SAMR</I
+><EM
+>SAMR</EM
 ></P
 ><P
 ></P
@@ -326,9 +333,8 @@ CLASS="COMMAND"
 ><P
 > </P
 ><P
-><I
-CLASS="EMPHASIS"
->SPOOLSS</I
+><EM
+>SPOOLSS</EM
 ></P
 ><P
 ></P
@@ -337,7 +343,7 @@ CLASS="EMPHASIS"
 ><P
 ><B
 CLASS="COMMAND"
->adddriver &lt;arch&gt; &lt;config&gt;</B
+>adddriver &#60;arch&#62; &#60;config&#62;</B
 > 
 		- Execute an AddPrinterDriver() RPC to install the printer driver 
 		information on the server.  Note that the driver files should 
@@ -364,6 +370,12 @@ CLASS="PARAMETER"
 > parameter is defined as 
 		follows: </P
 ><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
 ><PRE
 CLASS="PROGRAMLISTING"
 >		Long Printer Name:\
@@ -375,6 +387,9 @@ CLASS="PROGRAMLISTING"
 		Default Data Type:\
 		Comma Separated list of Files
 		</PRE
+></TD
+></TR
+></TABLE
 ></P
 ><P
 >Any empty fields should be enter as the string "NULL". </P
@@ -390,8 +405,8 @@ CLASS="PROGRAMLISTING"
 ><P
 ><B
 CLASS="COMMAND"
->addprinter &lt;printername&gt; 
-		&lt;sharename&gt; &lt;drivername&gt; &lt;port&gt;</B
+>addprinter &#60;printername&#62; 
+		&#60;sharename&#62; &#60;drivername&#62; &#60;port&#62;</B
 > 
 		- Add a printer on the remote server.  This printer 
  		will be automatically shared.  Be aware that the printer driver 
@@ -426,7 +441,7 @@ CLASS="COMMAND"
 ><P
 ><B
 CLASS="COMMAND"
->enumjobs &lt;printer&gt;</B
+>enumjobs &#60;printer&#62;</B
 > 
 		- List the jobs and status of a given printer.  
 		This command corresponds to the MS Platform SDK EnumJobs() 
@@ -468,7 +483,7 @@ CLASS="COMMAND"
 ><P
 ><B
 CLASS="COMMAND"
->getdata &lt;printername&gt;</B
+>getdata &#60;printername&#62;</B
 > 
 		- Retrieve the data for a given printer setting.  See 
 		the  <B
@@ -482,7 +497,7 @@ CLASS="COMMAND"
 ><P
 ><B
 CLASS="COMMAND"
->getdriver &lt;printername&gt;</B
+>getdriver &#60;printername&#62;</B
 > 
 		- Retrieve the printer driver information (such as driver file, 
 		config file, dependent files, etc...) for 
@@ -494,7 +509,7 @@ CLASS="COMMAND"
 ><P
 ><B
 CLASS="COMMAND"
->getdriverdir &lt;arch&gt;</B
+>getdriverdir &#60;arch&#62;</B
 > 
 		- Execute a GetPrinterDriverDirectory()
 		RPC to retreive the SMB share name and subdirectory for 
@@ -512,7 +527,7 @@ CLASS="PARAMETER"
 ><P
 ><B
 CLASS="COMMAND"
->getprinter &lt;printername&gt;</B
+>getprinter &#60;printername&#62;</B
 > 
 		- Retrieve the current printer information.  This command 
 		corresponds to the GetPrinter() MS Platform SDK function. 
@@ -522,7 +537,7 @@ CLASS="COMMAND"
 ><P
 ><B
 CLASS="COMMAND"
->openprinter &lt;printername&gt;</B
+>openprinter &#60;printername&#62;</B
 > 
 		- Execute an OpenPrinterEx() and ClosePrinter() RPC 
 		against a given printer. </P
@@ -531,7 +546,7 @@ CLASS="COMMAND"
 ><P
 ><B
 CLASS="COMMAND"
->setdriver &lt;printername&gt; &lt;drivername&gt;</B
+>setdriver &#60;printername&#62; &#60;drivername&#62;</B
 > 
 		- Execute a SetPrinter() command to update the printer driver associated
 		with an installed printer.  The printer driver must already be correctly
@@ -549,9 +564,8 @@ CLASS="COMMAND"
 ></LI
 ></UL
 ><P
-><I
-CLASS="EMPHASIS"
->GENERAL OPTIONS</I
+><EM
+>GENERAL OPTIONS</EM
 ></P
 ><P
 ></P
@@ -604,9 +618,8 @@ CLASS="COMMAND"
 ><P
 >From Luke Leighton's original rpcclient man page:</P
 ><P
-><I
-CLASS="EMPHASIS"
->"WARNING!</I
+><EM
+>"WARNING!</EM
 > The MSRPC over SMB code has 
 	been developed from examining  Network traces. No documentation is 
 	available from the original creators  (Microsoft) on how MSRPC over