large sync up with 2.2

(This used to be commit 96523293da19df201703fed6130f1ff9ba25324b)

1 files changed, 25 insertions, 7 deletions

diff --git a/docs/htmldocs/smbmnt.8.html b/docs/htmldocs/smbmnt.8.html
index 051684a291..88a28b8a69 100644
--- a/docs/htmldocs/smbmnt.8.html
+++ b/docs/htmldocs/smbmnt.8.html
@@ -14,7 +14,7 @@ VLINK="#840084"
 ALINK="#0000FF"
 ><H1
 ><A
-NAME="SMBUMOUNT"
+NAME="SMBMNT"
 >smbmnt</A
 ></H1
 ><DIV
@@ -35,13 +35,13 @@ NAME="AEN8"
 ><P
 ><B
 CLASS="COMMAND"
->smbumount</B
->  {mount-point} [-s &lt;share&gt;] [-r] [-u &lt;uid&gt;] [-g &lt;gid&gt;] [-f &lt;mask&gt;] [-d &lt;mask&gt;]</P
+>smbmnt</B
+>  {mount-point} [-s &lt;share&gt;] [-r] [-u &lt;uid&gt;] [-g &lt;gid&gt;] [-f &lt;mask&gt;] [-d &lt;mask&gt;] [-o &lt;options&gt;]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18"
+NAME="AEN19"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -76,7 +76,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN27"
+NAME="AEN28"
 ></A
 ><H2
 >OPTIONS</H2
@@ -120,17 +120,28 @@ CLASS="VARIABLELIST"
 >specify the octal directory mask 
 		applied  </P
 ></DD
+><DT
+>-o options</DT
+><DD
+><P
+>		list of options that are passed as-is to smbfs, if this
+		command is run on a 2.4 or higher linux kernel.
+		</P
+></DD
 ></DL
 ></DIV
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN50"
+NAME="AEN55"
 ></A
 ><H2
 >AUTHOR</H2
 ><P
+>Volker Lendecke, Andrew Tridgell, Michael H. Warfield 
+	and others.</P
+><P
 >The current maintainer of smbfs and the userspace
 	tools <B
 CLASS="COMMAND"
@@ -146,7 +157,14 @@ CLASS="COMMAND"
 HREF="mailto:urban@teststation.com"
 TARGET="_top"
 >Urban Widmark</A
->.</P
+>.
+	The <A
+HREF="mailto:samba@samba.org"
+TARGET="_top"
+>SAMBA Mailing list</A
+>
+	is the preferred place to ask questions regarding these programs.
+	</P
 ><P
 >The conversion of this manpage for Samba 2.2 was performed 
 	by Gerald Carter</P