syncing up changes in 2.2

(This used to be commit ffbbe67dbfde7f7ce4bb70becfc696c395dbf6b2)

1 files changed, 54 insertions, 55 deletions

diff --git a/docs/htmldocs/smbclient.1.html b/docs/htmldocs/smbclient.1.html
index f9cc6085d8..8232906680 100644
--- a/docs/htmldocs/smbclient.1.html
+++ b/docs/htmldocs/smbclient.1.html
@@ -37,7 +37,7 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >smbclient</B
->  {servicename} [password] [-b &lt;buffer size&gt;] [-d debuglevel] [-D Directory] [-S server] [-U username] [-W workgroup] [-M &lt;netbios name&gt;] [-m maxprotocol] [-A authfile] [-N] [-l logfile] [-L &lt;netbios name&gt;] [-I destinationIP] [-E &lt;terminal code&gt;] [-c &lt;command string&gt;] [-i scope] [-O &lt;socket options&gt;] [-p port] [-R &lt;name resolve order&gt;] [-s &lt;smb config file&gt;] [-T&lt;c|x&gt;IXFqgbNan]</P
+>  {servicename} [password] [-b &#60;buffer size&#62;] [-d debuglevel] [-D Directory] [-S server] [-U username] [-W workgroup] [-M &#60;netbios name&#62;] [-m maxprotocol] [-A authfile] [-N] [-l logfile] [-L &#60;netbios name&#62;] [-I destinationIP] [-E &#60;terminal code&#62;] [-c &#60;command string&#62;] [-i scope] [-O &#60;socket options&#62;] [-p port] [-R &#60;name resolve order&#62;] [-s &#60;smb config file&#62;] [-T&#60;c|x&#62;IXFqgbNan]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
@@ -189,7 +189,7 @@ CLASS="FILENAME"
 		options. </P
 ></DD
 ><DT
->-R &lt;name resolve order&gt;</DT
+>-R &#60;name resolve order&#62;</DT
 ><DD
 ><P
 >This option is used by the programs in the Samba 
@@ -339,9 +339,8 @@ CLASS="FILENAME"
 > for a description of how to handle incoming 
 		WinPopup messages in Samba. </P
 ><P
-><I
-CLASS="EMPHASIS"
->Note</I
+><EM
+>Note</EM
 >: Copy WinPopup into the startup group 
 		on your WfWg PCs if you want them to always be able to receive 
 		messages. </P
@@ -353,9 +352,8 @@ CLASS="EMPHASIS"
 >This specifies a NetBIOS scope that smbclient 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
+		NetBIOS scopes are <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
@@ -402,14 +400,12 @@ CLASS="EMPHASIS"
 		data, and should only be used when investigating a problem.
 		Levels above 3 are designed for use only by developers and 
 		generate HUGE amounts of log data, most of which is extremely 
-		cryptic. If debuglevel is set to the letter 'A', then <I
-CLASS="EMPHASIS"
+		cryptic. If debuglevel is set to the letter 'A', then <EM
 >all
-		</I
+		</EM
 >  debug messages will be printed. This setting
-		is for developers only (and people who <I
-CLASS="EMPHASIS"
->really</I
+		is for developers only (and people who <EM
+>really</EM
 > want 
 		to know how the code works internally). </P
 ><P
@@ -561,11 +557,20 @@ CLASS="COMMAND"
 		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;
+>username = &#60;value&#62; 
+password = &#60;value&#62;
 		</PRE
+></TD
+></TR
+></TABLE
 ></P
 ><P
 >Make certain that the permissions on the file restrict 
@@ -597,12 +602,10 @@ CLASS="PARAMETER"
 >This option tells smbclient how to interpret 
 		filenames coming from the remote server. Usually Asian language 
 		multibyte UNIX implementations use different character sets than 
-		SMB/CIFS servers (<I
-CLASS="EMPHASIS"
->EUC</I
-> instead of <I
-CLASS="EMPHASIS"
->		SJIS</I
+		SMB/CIFS servers (<EM
+>EUC</EM
+> instead of <EM
+>		SJIS</EM
 > for example). Setting this parameter will let 
 		<B
 CLASS="COMMAND"
@@ -816,9 +819,8 @@ CLASS="PARAMETER"
 ></LI
 ></UL
 ><P
-><I
-CLASS="EMPHASIS"
->Tar Long File Names</I
+><EM
+>Tar Long File Names</EM
 ></P
 ><P
 ><B
@@ -831,18 +833,16 @@ CLASS="COMMAND"
 		files in the archive with relative names, not absolute names. 
 		</P
 ><P
-><I
-CLASS="EMPHASIS"
->Tar Filenames</I
+><EM
+>Tar Filenames</EM
 ></P
 ><P
 >All file names can be given as DOS path names (with '\' 
 		as the component separator) or as UNIX path names (with '/' as 
 		the component separator). </P
 ><P
-><I
-CLASS="EMPHASIS"
->Examples</I
+><EM
+>Examples</EM
 ></P
 ><P
 >Restore from tar file backup.tar into myshare on mypc 
@@ -941,7 +941,7 @@ NAME="AEN297"
 ><P
 ><TT
 CLASS="PROMPT"
->smb:\&gt; </TT
+>smb:\&#62; </TT
 ></P
 ><P
 >The backslash ("\") indicates the current working directory 
@@ -961,7 +961,7 @@ CLASS="PROMPT"
 ><P
 >Parameters shown in square brackets (e.g., "[parameter]") are 
 	optional.  If not given, the command will use suitable defaults. Parameters 
-	shown in angle brackets (e.g., "&lt;parameter&gt;") are required.
+	shown in angle brackets (e.g., "&#60;parameter&#62;") are required.
 	</P
 ><P
 >Note that all commands operating on the server are actually 
@@ -1006,7 +1006,7 @@ CLASS="VARIABLELIST"
 		directory on the server will be reported. </P
 ></DD
 ><DT
->del &lt;mask&gt;</DT
+>del &#60;mask&#62;</DT
 ><DD
 ><P
 >The client will request that the server attempt 
@@ -1014,7 +1014,7 @@ CLASS="VARIABLELIST"
 		directory on the server. </P
 ></DD
 ><DT
->dir &lt;mask&gt;</DT
+>dir &#60;mask&#62;</DT
 ><DD
 ><P
 >A list of the files matching "mask" in the current 
@@ -1029,7 +1029,7 @@ CLASS="VARIABLELIST"
 		from the program. </P
 ></DD
 ><DT
->get &lt;remote file name&gt; [local file name]</DT
+>get &#60;remote file name&#62; [local file name]</DT
 ><DD
 ><P
 >Copy the file called "remote file name" from 
@@ -1073,13 +1073,13 @@ CLASS="COMMAND"
 		lowercase filenames are the norm on UNIX systems. </P
 ></DD
 ><DT
->ls &lt;mask&gt;</DT
+>ls &#60;mask&#62;</DT
 ><DD
 ><P
 >See the dir command above. </P
 ></DD
 ><DT
->mask &lt;mask&gt;</DT
+>mask &#60;mask&#62;</DT
 ><DD
 ><P
 >This command allows the user to set up a mask 
@@ -1105,13 +1105,13 @@ CLASS="COMMAND"
 		mask back to "*" after using the mget or mput commands. </P
 ></DD
 ><DT
->md &lt;directory name&gt;</DT
+>md &#60;directory name&#62;</DT
 ><DD
 ><P
 >See the mkdir command. </P
 ></DD
 ><DT
->mget &lt;mask&gt;</DT
+>mget &#60;mask&#62;</DT
 ><DD
 ><P
 >Copy all files matching mask from the server to 
@@ -1123,14 +1123,14 @@ CLASS="COMMAND"
 		smbclient are binary. See also the lowercase command. </P
 ></DD
 ><DT
->mkdir &lt;directory name&gt;</DT
+>mkdir &#60;directory name&#62;</DT
 ><DD
 ><P
 >Create a new directory on the server (user access 
 		privileges permitting) with the specified name. </P
 ></DD
 ><DT
->mput &lt;mask&gt;</DT
+>mput &#60;mask&#62;</DT
 ><DD
 ><P
 >Copy all files matching mask in the current working 
@@ -1143,7 +1143,7 @@ CLASS="COMMAND"
 		are binary. </P
 ></DD
 ><DT
->print &lt;file name&gt;</DT
+>print &#60;file name&#62;</DT
 ><DD
 ><P
 >Print the specified file from the local machine 
@@ -1152,7 +1152,7 @@ CLASS="COMMAND"
 >See also the printmode command.</P
 ></DD
 ><DT
->printmode &lt;graphics or text&gt;</DT
+>printmode &#60;graphics or text&#62;</DT
 ><DD
 ><P
 >Set the print mode to suit either binary data 
@@ -1172,7 +1172,7 @@ CLASS="COMMAND"
 		</P
 ></DD
 ><DT
->put &lt;local file name&gt; [remote file name]</DT
+>put &#60;local file name&#62; [remote file name]</DT
 ><DD
 ><P
 >Copy the file called "local file name" from the 
@@ -1195,7 +1195,7 @@ CLASS="COMMAND"
 >See the exit command. </P
 ></DD
 ><DT
->rd &lt;directory name&gt;</DT
+>rd &#60;directory name&#62;</DT
 ><DD
 ><P
 >See the rmdir command. </P
@@ -1220,21 +1220,21 @@ CLASS="COMMAND"
 		using the mask command will be ignored. </P
 ></DD
 ><DT
->rm &lt;mask&gt;</DT
+>rm &#60;mask&#62;</DT
 ><DD
 ><P
 >Remove all files matching mask from the current 
 		working directory on the server. </P
 ></DD
 ><DT
->rmdir &lt;directory name&gt;</DT
+>rmdir &#60;directory name&#62;</DT
 ><DD
 ><P
 >Remove the specified directory (user access 
 		privileges permitting) from the server. </P
 ></DD
 ><DT
->tar &lt;c|x&gt;[IXbgNa]</DT
+>tar &#60;c|x&#62;[IXbgNa]</DT
 ><DD
 ><P
 >Performs a tar operation - see the <TT
@@ -1250,7 +1250,7 @@ CLASS="PARAMETER"
 		</P
 ></DD
 ><DT
->blocksize &lt;blocksize&gt;</DT
+>blocksize &#60;blocksize&#62;</DT
 ><DD
 ><P
 >Blocksize. Must be followed by a valid (greater 
@@ -1258,7 +1258,7 @@ CLASS="PARAMETER"
 		blocksize*TBLOCK (usually 512 byte) blocks. </P
 ></DD
 ><DT
->tarmode &lt;full|inc|reset|noreset&gt;</DT
+>tarmode &#60;full|inc|reset|noreset&#62;</DT
 ><DD
 ><P
 >Changes tar's behavior with regard to archive 
@@ -1269,7 +1269,7 @@ CLASS="PARAMETER"
 		read/write share). </P
 ></DD
 ><DT
->setmode &lt;filename&gt; &lt;perm=[+|\-]rsha&gt;</DT
+>setmode &#60;filename&#62; &#60;perm=[+|\-]rsha&#62;</DT
 ><DD
 ><P
 >A version of the DOS attrib command to set 
@@ -1355,9 +1355,8 @@ CLASS="FILENAME"
 >	/usr/samba/bin/</TT
 > directory, this directory readable 
 	by all, writeable only by root. The client program itself should 
-	be executable by all. The client should <I
-CLASS="EMPHASIS"
->NOT</I
+	be executable by all. The client should <EM
+>NOT</EM
 > be 
 	setuid or setgid! </P
 ><P