mega-merge from 2.2

(This used to be commit c76bf8ed3275e217d1b691879153fe9137bcbe38)

1 files changed, 73 insertions, 27 deletions

diff --git a/docs/htmldocs/smbmount.8.html b/docs/htmldocs/smbmount.8.html
index c8c9727be9..b7263ebf83 100644
--- a/docs/htmldocs/smbmount.8.html
+++ b/docs/htmldocs/smbmount.8.html
@@ -49,28 +49,41 @@ NAME="AEN14"
 ><B
 CLASS="COMMAND"
 >smbmount</B
-> mounts a SMB filesystem. It 
+> mounts a Linux SMB filesystem. It 
 	is usually invoked as <B
 CLASS="COMMAND"
->mount.smb</B
-> from 
+>mount.smbfs</B
+> by
 	the <B
 CLASS="COMMAND"
 >mount(8)</B
 > command when using the 
-	"-t smb" option. The kernel must support the smbfs filesystem. </P
+	"-t smbfs" option. This command only works in Linux, and the kernel must
+	support the smbfs filesystem. </P
 ><P
->Options to smbmount are specified as a comma separated
+>Options to <B
+CLASS="COMMAND"
+>smbmount</B
+> are specified as a comma-separated
 	list of key=value pairs. It is possible to send options other
 	than those listed here, assuming that smbfs supports them. If
 	you get mount failures, check your kernel log for errors on
 	unknown options.</P
 ><P
->smbmount is a daemon. After mounting it keeps running until
+><B
+CLASS="COMMAND"
+>smbmount</B
+> is a daemon. After mounting it keeps running until
 	the mounted smbfs is umounted. It will log things that happen
 	when in daemon mode using the "machine name" smbmount, so
-	typically this output will end up in log.smbmount. The
-	smbmount process may also be called mount.smbfs.</P
+	typically this output will end up in <TT
+CLASS="FILENAME"
+>log.smbmount</TT
+>. The
+	<B
+CLASS="COMMAND"
+>smbmount</B
+> process may also be called mount.smbfs.</P
 ><P
 ><EM
 >NOTE:</EM
@@ -91,7 +104,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN27"
+NAME="AEN31"
 ></A
 ><H2
 >OPTIONS</H2
@@ -129,6 +142,13 @@ CLASS="COMMAND"
 > will prompt
 		for a passeword, unless the guest option is
 		given. </P
+><P
+>		Note that password which contain the arguement delimiter
+		character (i.e. a comma ',') will failed to be parsed correctly
+		on the command line.  However, the same password defined
+		in the PASSWD environment variable or a credentials file (see
+		below) will be read correctly.
+		</P
 ></DD
 ><DT
 >credentials=&#60;filename&#62;</DT
@@ -155,7 +175,10 @@ CLASS="PROGRAMLISTING"
 		</P
 ><P
 >This is preferred over having passwords in plaintext in a
-		shared file, such as /etc/fstab. Be sure to protect any
+		shared file, such as <TT
+CLASS="FILENAME"
+>/etc/fstab</TT
+>. Be sure to protect any
 		credentials file properly.
 		</P
 ></DD
@@ -203,7 +226,7 @@ CLASS="PROGRAMLISTING"
 >dmask=&#60;arg&#62;</DT
 ><DD
 ><P
->sets the directory mask. This deterines the 
+>sets the directory mask. This determines the 
 		permissions that remote directories have in the local filesystem. 
 		The default is based on the current umask. </P
 ></DD
@@ -212,7 +235,9 @@ CLASS="PROGRAMLISTING"
 ><DD
 ><P
 >sets the debug level. This is useful for 
-		tracking down SMB connection problems. </P
+		tracking down SMB connection problems. A suggested value to
+		start with is 4. If set too high there will be a lot of
+		output, possibly hiding the useful output.</P
 ></DD
 ><DT
 >ip=&#60;arg&#62;</DT
@@ -275,7 +300,7 @@ CLASS="PARAMETER"
 >iocharset=&#60;arg&#62;</DT
 ><DD
 ><P
->		sets the charset used by the linux side for codepage
+>		sets the charset used by the Linux side for codepage
 		to charset translations (NLS). Argument should be the
 		name of a charset, like iso8859-1. (Note: only kernel
 		2.4.0 or later)
@@ -311,7 +336,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN119"
+NAME="AEN125"
 ></A
 ><H2
 >ENVIRONMENT VARIABLES</H2
@@ -336,20 +361,27 @@ CLASS="ENVAR"
 >The variable <TT
 CLASS="ENVAR"
 >PASSWD_FILE</TT
-> may contain the pathname of
-	a file to read the password from. A single line of input is
-	read and used as password.</P
+> may contain the pathname
+	of a file to read the password from. A single line of input is
+	read and used as the password.</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN127"
+NAME="AEN133"
 ></A
 ><H2
 >BUGS</H2
 ><P
->Not many known smbmount bugs. But one smbfs bug is
-	important enough to mention here anyway:</P
+>Passwords and other options containing , can not be handled.
+	For passwords an alternative way of passing them is in a credentials
+	file or in the PASSWD environment.</P
+><P
+>The credentials file does not handle usernames or passwords with
+	leading space.</P
+><P
+>One smbfs bug is important enough to mention here, even if it
+	is a bit misplaced:</P
 ><P
 ></P
 ><UL
@@ -357,13 +389,13 @@ NAME="AEN127"
 ><P
 >Mounts sometimes stop working. This is usually
 	caused by smbmount terminating. Since smbfs needs smbmount to
-	reconnect when the server disconnects, the mount will go
-	dead. A re-mount normally fixes this. At least 2 ways to
+	reconnect when the server disconnects, the mount will eventually go
+	dead. An umount/mount normally fixes this. At least 2 ways to
 	trigger this bug are known.</P
 ></LI
 ></UL
 ><P
->Note that the typical response to a bugreport is suggestion
+>Note that the typical response to a bug report is suggestion
 	to try the latest version first. So please try doing that first,
 	and always include which versions you use of relevant software
 	when reporting bugs (minimum: samba, kernel, distribution)</P
@@ -371,18 +403,32 @@ NAME="AEN127"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN134"
+NAME="AEN142"
 ></A
 ><H2
 >SEE ALSO</H2
 ><P
->Documentation/filesystems/smbfs.txt in the kernel source tree
-	may contain additional options and information.</P
+>Documentation/filesystems/smbfs.txt in the linux kernel
+	source tree may contain additional options and information.</P
+><P
+>FreeBSD also has a smbfs, but it is not related to smbmount</P
+><P
+>For Solaris, HP-UX and others you may want to look at
+	<A
+HREF="smbsh.1.html"
+TARGET="_top"
+><B
+CLASS="COMMAND"
+>smbsh(1)</B
+></A
+> or at other
+	solutions, such as sharity or perhaps replacing the SMB server with
+	a NFS server.</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN137"
+NAME="AEN149"
 ></A
 ><H2
 >AUTHOR</H2