mega-merge from 2.2

(This used to be commit c76bf8ed3275e217d1b691879153fe9137bcbe38)

1 files changed, 15 insertions, 9 deletions

diff --git a/docs/htmldocs/rpcclient.1.html b/docs/htmldocs/rpcclient.1.html
index 9c19660a46..53a0ea98dd 100644
--- a/docs/htmldocs/rpcclient.1.html
+++ b/docs/htmldocs/rpcclient.1.html
@@ -137,7 +137,10 @@ CLASS="PROGRAMLISTING"
 ><P
 >set the debuglevel. Debug level 0 is the lowest 
 		and 100 being the highest. This should be set to 100 if you are
-		planning on submitting a bug report to the Samba team (see BUGS.txt). 
+		planning on submitting a bug report to the Samba team (see <TT
+CLASS="FILENAME"
+>BUGS.txt</TT
+>). 
 		</P
 ></DD
 ><DT
@@ -152,7 +155,10 @@ CLASS="PROGRAMLISTING"
 ><DD
 ><P
 >File name for log/debug files. The extension 
-		'.client' will be appended. The log file is never removed  
+		<TT
+CLASS="CONSTANT"
+>'.client'</TT
+> will be appended. The log file is never removed  
 		by the client.
 		</P
 ></DD
@@ -199,7 +205,7 @@ CLASS="ENVAR"
 		<TT
 CLASS="ENVAR"
 >LOGNAME</TT
-> variable and if either exist, the 
+> variable and if either exists, the 
 		string is uppercased. If these environmental variables are not 
 		found, the username <TT
 CLASS="CONSTANT"
@@ -247,7 +253,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90"
+NAME="AEN92"
 ></A
 ><H2
 >COMMANDS</H2
@@ -641,7 +647,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN210"
+NAME="AEN212"
 ></A
 ><H2
 >BUGS</H2
@@ -663,7 +669,7 @@ CLASS="COMMAND"
 	available from the original creators  (Microsoft) on how MSRPC over 
 	SMB works, or how the individual MSRPC services  work. Microsoft's 
 	implementation of these services has been demonstrated  (and reported) 
-	to be... a bit flakey in places. </P
+	to be... a bit flaky in places. </P
 ><P
 >The development of Samba's implementation is also a bit rough, 
 	and as more  of the services are understood, it can even result in 
@@ -682,7 +688,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN220"
+NAME="AEN222"
 ></A
 ><H2
 >VERSION</H2
@@ -693,7 +699,7 @@ NAME="AEN220"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN223"
+NAME="AEN225"
 ></A
 ><H2
 >AUTHOR</H2
@@ -704,7 +710,7 @@ NAME="AEN223"
 	to the way the Linux kernel is developed.</P
 ><P
 >The original rpcclient man page was written by Matthew 
-	Geddes, Luke Kenneth Casson, and rewriten by Gerald Carter.  
+	Geddes, Luke Kenneth Casson Leighton, and rewritten by Gerald Carter.  
 	The conversion to DocBook for Samba 2.2 was done by Gerald 
 	Carter.</P
 ></DIV