mega-merge from 2.2

(This used to be commit c76bf8ed3275e217d1b691879153fe9137bcbe38)

1 files changed, 10 insertions, 5 deletions

diff --git a/docs/docbook/manpages/smbmnt.8.sgml b/docs/docbook/manpages/smbmnt.8.sgml
index 9527a19144..55b66d5d25 100644
--- a/docs/docbook/manpages/smbmnt.8.sgml
+++ b/docs/docbook/manpages/smbmnt.8.sgml
@@ -31,14 +31,19 @@
 
 	<para><command>smbmnt</command> is a helper application used 
 	by the smbmount program to do the actual mounting of SMB shares. 
-	<command>smbmnt</command> is meant to be installed setuid root 
-	so that normal users can mount their smb shares. It checks 
-	whether the user has write permissions on the mount point and 
-	then mounts the directory.</para>
+	<command>smbmnt</command> can be installed setuid root if you want
+	normal users to be able to mount their SMB shares.</para>
+
+	<para>A setuid smbmnt will only allow mounts on directories owned
+	by the user, and that the user has write permission on.</para>
 
 	<para>The <command>smbmnt</command> program is normally invoked 
 	by <ulink url="smbmount.8.html"><command>smbmount(8)</command>
 	</ulink>. It should not be invoked directly by users. </para>
+
+	<para>smbmount searches the normal PATH for smbmnt. You must ensure
+	that the smbmnt version in your path matches the smbmount used.</para>
+
 </refsect1>
 
 <refsect1>
@@ -79,7 +84,7 @@
 		<term>-o options</term>
 		<listitem><para>
 		list of options that are passed as-is to smbfs, if this
-		command is run on a 2.4 or higher linux kernel.
+		command is run on a 2.4 or higher Linux kernel.
 		</para></listitem>
 		</varlistentry>