mega-merge from 2.2

(This used to be commit c76bf8ed3275e217d1b691879153fe9137bcbe38)

1 files changed, 16 insertions, 8 deletions

diff --git a/docs/htmldocs/testparm.1.html b/docs/htmldocs/testparm.1.html
index 599746e414..bae907c687 100644
--- a/docs/htmldocs/testparm.1.html
+++ b/docs/htmldocs/testparm.1.html
@@ -125,7 +125,12 @@ CLASS="COMMAND"
 >-L servername</DT
 ><DD
 ><P
->Sets the value of the %L macro to servername.
+>Sets the value of the %L macro to <TT
+CLASS="REPLACEABLE"
+><I
+>servername</I
+></TT
+>.
 		This is useful for testing include files specified with the 
 		%L macro. </P
 ></DD
@@ -146,7 +151,10 @@ CLASS="FILENAME"
 ><DD
 ><P
 >If this parameter and the following are 
-		specified, then testparm will examine the <TT
+		specified, then <B
+CLASS="COMMAND"
+>testparm</B
+> will examine the <TT
 CLASS="PARAMETER"
 ><I
 >hosts
@@ -184,7 +192,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN64"
+NAME="AEN66"
 ></A
 ><H2
 >FILES</H2
@@ -213,13 +221,13 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73"
+NAME="AEN75"
 ></A
 ><H2
 >DIAGNOSTICS</H2
 ><P
 >The program will issue a message saying whether the 
-	configuration file loaded OK or not. This message may be preceeded by 
+	configuration file loaded OK or not. This message may be preceded by 
 	errors and warnings if the file did not load. If the file was 
 	loaded OK, the program then dumps all known service details 
 	to stdout. </P
@@ -227,7 +235,7 @@ NAME="AEN73"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76"
+NAME="AEN78"
 ></A
 ><H2
 >VERSION</H2
@@ -238,7 +246,7 @@ NAME="AEN76"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79"
+NAME="AEN81"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -264,7 +272,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86"
+NAME="AEN88"
 ></A
 ><H2
 >AUTHOR</H2