syncing up changes in 2.2

(This used to be commit ffbbe67dbfde7f7ce4bb70becfc696c395dbf6b2)

1 files changed, 11 insertions, 13 deletions

diff --git a/docs/htmldocs/nmblookup.1.html b/docs/htmldocs/nmblookup.1.html
index 7150370875..4312481b1c 100644
--- a/docs/htmldocs/nmblookup.1.html
+++ b/docs/htmldocs/nmblookup.1.html
@@ -37,7 +37,7 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >nmblookup</B
->  [-M] [-R] [-S] [-r] [-A] [-h] [-B &lt;broadcast address&gt;] [-U &lt;unicast address&gt;] [-d &lt;debug level&gt;] [-s &lt;smb config file&gt;] [-i &lt;NetBIOS scope&gt;] [-T] {name}</P
+>  [-M] [-R] [-S] [-r] [-A] [-h] [-B &#60;broadcast address&#62;] [-U &#60;unicast address&#62;] [-d &#60;debug level&#62;] [-s &#60;smb config file&#62;] [-i &#60;NetBIOS scope&#62;] [-T] {name}</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
@@ -156,7 +156,7 @@ CLASS="REPLACEABLE"
 >Print a help (usage) message.</P
 ></DD
 ><DT
->-B &lt;broadcast address&gt;</DT
+>-B &#60;broadcast address&#62;</DT
 ><DD
 ><P
 >Send the query to the given broadcast address. Without 
@@ -179,7 +179,7 @@ CLASS="FILENAME"
 		</P
 ></DD
 ><DT
->-U &lt;unicast address&gt;</DT
+>-U &#60;unicast address&#62;</DT
 ><DD
 ><P
 >Do a unicast query to the specified address or 
@@ -198,7 +198,7 @@ CLASS="PARAMETER"
 		query a WINS server.</P
 ></DD
 ><DT
->-d &lt;debuglevel&gt;</DT
+>-d &#60;debuglevel&#62;</DT
 ><DD
 ><P
 >debuglevel is an integer from 0 to 10.</P
@@ -234,7 +234,7 @@ CLASS="FILENAME"
 > file.</P
 ></DD
 ><DT
->-s &lt;smb.conf&gt;</DT
+>-s &#60;smb.conf&#62;</DT
 ><DD
 ><P
 >This parameter specifies the pathname to 
@@ -246,7 +246,7 @@ TARGET="_top"
 		the Samba setup on the machine.</P
 ></DD
 ><DT
->-i &lt;scope&gt;</DT
+>-i &#60;scope&#62;</DT
 ><DD
 ><P
 >This specifies a NetBIOS scope that
@@ -256,9 +256,8 @@ CLASS="COMMAND"
 > will use to communicate with when 
 		generating NetBIOS names. For details on the use of NetBIOS 
 		scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes are 
-		<I
-CLASS="EMPHASIS"
->very</I
+		<EM
+>very</EM
 > rarely used, only set this parameter 
 		if you are the system administrator in charge of all the 
 		NetBIOS systems you communicate with.</P
@@ -271,9 +270,8 @@ CLASS="EMPHASIS"
 		lookup to be looked up via a reverse DNS lookup into a 
 		DNS name, and printed out before each</P
 ><P
-><I
-CLASS="EMPHASIS"
->IP address .... NetBIOS name</I
+><EM
+>IP address .... NetBIOS name</EM
 ></P
 ><P
 > pair that is the normal output.</P
@@ -285,7 +283,7 @@ CLASS="EMPHASIS"
 >This is the NetBIOS name being queried. Depending 
 		upon the previous options this may be a NetBIOS name or IP address. 
 		If a NetBIOS name then the different name types may be specified 
-		by appending '#&lt;type&gt;' to the name. This name may also be
+		by appending '#&#60;type&#62;' to the name. This name may also be
 		'*', which will return all registered names within a broadcast 
 		area.</P
 ></DD