syncing up changes in 2.2

(This used to be commit ffbbe67dbfde7f7ce4bb70becfc696c395dbf6b2)

1 files changed, 31 insertions, 23 deletions

diff --git a/docs/htmldocs/smbmount.8.html b/docs/htmldocs/smbmount.8.html
index ba07f08ed4..c8c9727be9 100644
--- a/docs/htmldocs/smbmount.8.html
+++ b/docs/htmldocs/smbmount.8.html
@@ -72,9 +72,8 @@ CLASS="COMMAND"
 	typically this output will end up in log.smbmount. The
 	smbmount process may also be called mount.smbfs.</P
 ><P
-><I
-CLASS="EMPHASIS"
->NOTE:</I
+><EM
+>NOTE:</EM
 > <B
 CLASS="COMMAND"
 >smbmount</B
@@ -102,7 +101,7 @@ NAME="AEN27"
 CLASS="VARIABLELIST"
 ><DL
 ><DT
->username=&lt;arg&gt;</DT
+>username=&#60;arg&#62;</DT
 ><DD
 ><P
 >specifies the username to connect as. If
@@ -115,7 +114,7 @@ CLASS="ENVAR"
 		to be specified as part of the username.</P
 ></DD
 ><DT
->password=&lt;arg&gt;</DT
+>password=&#60;arg&#62;</DT
 ><DD
 ><P
 >specifies the SMB password. If this
@@ -132,17 +131,26 @@ CLASS="COMMAND"
 		given. </P
 ></DD
 ><DT
->credentials=&lt;filename&gt;</DT
+>credentials=&#60;filename&#62;</DT
 ><DD
 ><P
 >specifies a file that contains a username
 		and/or password. The format of the file is:</P
 ><P
->		<PRE
+>		<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
@@ -152,14 +160,14 @@ CLASS="PROGRAMLISTING"
 		</P
 ></DD
 ><DT
->netbiosname=&lt;arg&gt;</DT
+>netbiosname=&#60;arg&#62;</DT
 ><DD
 ><P
 >sets the source NetBIOS name. It defaults 
 		to the local hostname. </P
 ></DD
 ><DT
->uid=&lt;arg&gt;</DT
+>uid=&#60;arg&#62;</DT
 ><DD
 ><P
 >sets the uid that will own all files on
@@ -168,7 +176,7 @@ CLASS="PROGRAMLISTING"
 		</P
 ></DD
 ><DT
->gid=&lt;arg&gt;</DT
+>gid=&#60;arg&#62;</DT
 ><DD
 ><P
 >sets the gid that will own all files on
@@ -177,14 +185,14 @@ CLASS="PROGRAMLISTING"
 		gid. </P
 ></DD
 ><DT
->port=&lt;arg&gt;</DT
+>port=&#60;arg&#62;</DT
 ><DD
 ><P
 >sets the remote SMB port number. The default 
 		is 139. </P
 ></DD
 ><DT
->fmask=&lt;arg&gt;</DT
+>fmask=&#60;arg&#62;</DT
 ><DD
 ><P
 >sets the file mask. This determines the 
@@ -192,7 +200,7 @@ CLASS="PROGRAMLISTING"
 		The default is based on the current umask. </P
 ></DD
 ><DT
->dmask=&lt;arg&gt;</DT
+>dmask=&#60;arg&#62;</DT
 ><DD
 ><P
 >sets the directory mask. This deterines the 
@@ -200,27 +208,27 @@ CLASS="PROGRAMLISTING"
 		The default is based on the current umask. </P
 ></DD
 ><DT
->debug=&lt;arg&gt;</DT
+>debug=&#60;arg&#62;</DT
 ><DD
 ><P
 >sets the debug level. This is useful for 
 		tracking down SMB connection problems. </P
 ></DD
 ><DT
->ip=&lt;arg&gt;</DT
+>ip=&#60;arg&#62;</DT
 ><DD
 ><P
 >sets the destination host or IP address.
 		</P
 ></DD
 ><DT
->workgroup=&lt;arg&gt;</DT
+>workgroup=&#60;arg&#62;</DT
 ><DD
 ><P
 >sets the workgroup on the destination </P
 ></DD
 ><DT
->sockopt=&lt;arg&gt;</DT
+>sockopt=&#60;arg&#62;</DT
 ><DD
 ><P
 >sets the TCP socket options. See the <A
@@ -240,7 +248,7 @@ CLASS="PARAMETER"
 		</P
 ></DD
 ><DT
->scope=&lt;arg&gt;</DT
+>scope=&#60;arg&#62;</DT
 ><DD
 ><P
 >sets the NetBIOS scope </P
@@ -264,7 +272,7 @@ CLASS="PARAMETER"
 >mount read-write </P
 ></DD
 ><DT
->iocharset=&lt;arg&gt;</DT
+>iocharset=&#60;arg&#62;</DT
 ><DD
 ><P
 >		sets the charset used by the linux side for codepage
@@ -274,7 +282,7 @@ CLASS="PARAMETER"
 		</P
 ></DD
 ><DT
->codepage=&lt;arg&gt;</DT
+>codepage=&#60;arg&#62;</DT
 ><DD
 ><P
 >		sets the codepage the server uses. See the iocharset
@@ -283,7 +291,7 @@ CLASS="PARAMETER"
 		</P
 ></DD
 ><DT
->ttl=&lt;arg&gt;</DT
+>ttl=&#60;arg&#62;</DT
 ><DD
 ><P
 >		how long a directory listing is cached in milliseconds