while I was at it.....

(This used to be commit 723bcb57e8bd54a36f2c217246f78a4301b6b25b)

9 files changed, 1078 insertions, 149 deletions

diff --git a/docs/docbook/manpages/smbmnt.8.sgml b/docs/docbook/manpages/smbmnt.8.sgml
new file mode 100644
index 0000000000..e25c73d092
--- /dev/null
+++ b/docs/docbook/manpages/smbmnt.8.sgml
@@ -0,0 +1,97 @@
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="smbumount">
+
+<refmeta>
+	<refentrytitle>smbmnt</refentrytitle>
+	<manvolnum>8</manvolnum>
+</refmeta>
+
+
+<refnamediv>
+	<refname>smbmnt</refname>
+	<refpurpose>helper utility for mounting SMB filesystems</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>smbumount</command>
+		<arg choice="req">mount-point</arg>
+		<arg choice="opt">-s &lt;share&gt;</arg>
+		<arg choice="opt">-r</arg>
+		<arg choice="opt">-u &lt;uid&gt;</arg>
+		<arg choice="opt">-g &lt;gid&gt;</arg>
+		<arg choice="opt">-f &lt;mask&gt;</arg>
+		<arg choice="opt">-d &lt;mask&gt;</arg>
+	</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<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>
+
+	<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>
+</refsect1>
+
+<refsect1>
+	<title>OPTIONS</title>
+
+	<variablelist>
+		<varlistentry>
+		<term>-r</term>
+		<listitem><para>mount the filesystem read-only 
+		</para></listitem>
+		</varlistentry>
+
+
+		<varlistentry>
+		<term>-u uid</term>
+		<listitem><para>specify the uid that the files will 
+		be owned by </para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-g gid</term>
+		<listitem><para>specify the gid that the files will be 
+		owned by </para></listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
+		<term>-f mask</term>
+		<listitem><para>specify the octal file mask applied
+		</para></listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
+		<term>-d mask</term>
+		<listitem><para>specify the octal directory mask 
+		applied  </para></listitem>
+		</varlistentry>
+	</variablelist>
+</refsect1>
+
+
+<refsect1>
+	<title>AUTHOR</title>
+	
+	<para>The current maintainer of smbfs and the userspace
+	tools <command>smbmount</command>, <command>smbumount</command>,
+	and <command>smbmnt</command> is <ulink 
+	url="mailto:urban@teststation.com">Urban Widmark</ulink>.</para>
+	
+	<para>The conversion of this manpage for Samba 2.2 was performed 
+	by Gerald Carter</para>
+</refsect1>
+
+</refentry>
diff --git a/docs/docbook/manpages/smbmount.8.sgml b/docs/docbook/manpages/smbmount.8.sgml
new file mode 100644
index 0000000000..a1a510ecd7
--- /dev/null
+++ b/docs/docbook/manpages/smbmount.8.sgml
@@ -0,0 +1,181 @@
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="smbmount">
+
+<refmeta>
+	<refentrytitle>smbmount</refentrytitle>
+	<manvolnum>8</manvolnum>
+</refmeta>
+
+
+<refnamediv>
+	<refname>smbmount</refname>
+	<refpurpose>mount and smbfs filesystem</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>smbumount</command>
+		<arg choice="req">service</arg>
+		<arg choice="req">mount-point</arg>
+		<arg choice="opt">-o options</arg>
+	</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para><command>smbmount</command> mounts a SMB filesystem. It 
+	is usually invoked as <command>mount.smb</command> from 
+	the <command>mount(8)</command> command when using the 
+	"-t smb" option. The kernel must support the smbfs filesystem. </para>
+
+	<para>Options to smbmount are specified as a comma separated list 
+	of key=value pairs.</para>
+
+	<para><emphasis>NOTE:</emphasis> <command>smbmount</command> 
+	calls <command>smbmnt(8)</command> to do the actual mount. You 
+	must make sure that <command>smbmnt</command> is in the path so 
+	that it can be found. </para>
+	
+</refsect1>
+
+<refsect1>
+	<title>OPTIONS</title>
+
+	<variablelist>
+		<varlistentry>
+		<term>username=&lt;arg&gt;</term>
+		<listitem><para>specifies the username to connect as. If
+		this is not given then the environment variable <parameter>
+		$USER</parameter> is used. This option can also take the 
+		form "user%password" or "user/workgroup" or 
+		"user/workgroup%password" to allow the password and workgroup 
+		to be specified as part of the username.</para></listitem>
+		</varlistentry>
+
+
+		<varlistentry>
+		<term>password=&lt;arg&gt;</term>
+		<listitem><para>specifies the SMB password. If not given then 
+		<command>smbmount</command> will prompt for a passeword, unless 
+		the guest option is given. </para></listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
+		<term>netbiosname=&lt;arg&gt;</term>
+		<listitem><para>sets the source NetBIOS name. It defaults 
+		to the local hostname. </para></listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
+		<term>uid=&lt;arg&gt;</term>
+		<listitem><para>sets the uid that files will be mounted as. 
+		It may be specified as either a username or a numeric uid.
+		</para></listitem>
+		</varlistentry>
+		
+		
+		<varlistentry>
+		<term>gid=&lt;arg&gt;</term>
+		<listitem><para>sets the gid that files will be mounted as. 
+		It may be specified as either a groupname or a numeric 
+		gid. </para></listitem>		
+		</varlistentry>
+		
+		
+		<varlistentry>
+		<term>port=&lt;arg&gt;</term>
+		<listitem><para>sets the remote SMB port number. The default 
+		is 139. </para></listitem>
+		</varlistentry>
+		
+		
+		<varlistentry>
+		<term>fmask=&lt;arg&gt;</term>
+		<listitem><para>sets the file mask. This determines the 
+		permissions that remote files have in the local filesystem. 
+		The default is based on the current umask. </para></listitem>
+		</varlistentry>
+		
+
+		<varlistentry>
+		<term>dmask=&lt;arg&gt;</term>
+		<listitem><para>sets the directory mask. This deterines the 
+		permissions that remote directories have in the local filesystem. 
+		The default is based on the current umask. </para></listitem>
+		</varlistentry>
+		
+		
+		<varlistentry>
+		<term>debug=&lt;arg&gt;</term>
+		<listitem><para>sets the debug level. This is useful for 
+		tracking down SMB connection problems. </para></listitem>
+		</varlistentry>
+		
+		
+		<varlistentry>
+		<term>ip=&lt;arg&gt;</term>
+		<listitem><para>sets the destination host or IP address.
+		</para></listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
+		<term>workgroup=&lt;arg&gt;</term>
+		<listitem><para>sets the workgroup on the destination </para>
+		</listitem>
+		</varlistentry>
+
+
+		<varlistentry>
+		<term>sockopt=&lt;arg&gt;</term>
+		<listitem><para>sets the TCP socket options. See the <ulink
+		url="smb.conf.5.html#SOCKETOPTIONS"><filename>smb.conf
+		</filename></ulink> <parameter>socket options</parameter> option.
+		</para></listitem>
+		</varlistentry>
+
+
+		<varlistentry>
+		<term>scope=&lt;arg&gt;</term>
+		<listitem><para>sets the NetBIOS scope </para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>guest</term>
+		<listitem><para>don't prompt for a password </para></listitem>
+		</varlistentry>
+
+
+		<varlistentry>
+		<term>ro</term>
+		<listitem><para>mount read-only </para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>rw</term><listitem><para>mount read-write </para></listitem>
+		</varlistentry>
+	</variablelist>
+
+
+</refsect1>
+
+
+<refsect1>
+	<title>AUTHOR</title>
+	
+	<para>The current maintainer of smbfs and the userspace
+	tools <command>smbmount</command>, <command>smbumount</command>,
+	and <command>smbmnt</command> is <ulink 
+	url="mailto:urban@teststation.com">Urban Widmark</ulink></para>
+	
+	<para>The conversion of this manpage for Samba 2.2 was performed 
+	by Gerald Carter</para>
+</refsect1>
+
+</refentry>
diff --git a/docs/docbook/manpages/smbumount.8.sgml b/docs/docbook/manpages/smbumount.8.sgml
new file mode 100644
index 0000000000..be7e929e06
--- /dev/null
+++ b/docs/docbook/manpages/smbumount.8.sgml
@@ -0,0 +1,67 @@
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="smbumount">
+
+<refmeta>
+	<refentrytitle>smbumount</refentrytitle>
+	<manvolnum>8</manvolnum>
+</refmeta>
+
+
+<refnamediv>
+	<refname>smbumount</refname>
+	<refpurpose>smbfs umount for normal users</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>smbumount</command>
+		<arg choice="req">mount-point</arg>
+	</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para>With this program, normal users can unmount smb-filesystems, 
+	provided that it is suid root.  <command>smbumount</command> has 
+	been written to give normal linux-users more control over their 
+	resources. It is safe to install this program suid root, because only 
+	the user who has mounted a filesystem is allowed to unmount it again.  
+	For root it is not necessary to use smbumount. The normal umount 
+	program works perfectly well, but it would certainly be problematic 
+	to make umount setuid root.</para>  
+</refsect1>
+
+<refsect1>
+	<title>OPTIONS</title>
+
+	<variablelist>
+		<varlistentry>
+		<term>mount-point</term>
+		<listitem><para>The directory to unmount.</para></listitem>
+		</varlistentry>
+	</variablelist>
+</refsect1>
+
+
+<refsect1>
+	<title>SEE ALSO</title>
+	
+	<para><ulink url="smbmount.8.html"><command>smbmount(8)</command>
+	</ulink></para>
+</refsect1>
+
+
+<refsect1>
+	<title>AUTHOR</title>
+	
+	<para>The current maintainer of smbfs and the userspace
+	tools <command>smbmount</command>, <command>smbumount</command>,
+	and <command>smbmnt</command> is <ulink 
+	url="mailto:urban@teststation.com">Urban Widmark</ulink>.</para>
+	
+	<para>The conversion of this manpage for Samba 2.2 was performed 
+	by Gerald Carter</para>
+</refsect1>
+
+</refentry>
diff --git a/docs/htmldocs/smbmnt.8.html b/docs/htmldocs/smbmnt.8.html
new file mode 100644
index 0000000000..051684a291
--- /dev/null
+++ b/docs/htmldocs/smbmnt.8.html
@@ -0,0 +1,156 @@
+<HTML
+><HEAD
+><TITLE
+>smbmnt</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.57"></HEAD
+><BODY
+CLASS="REFENTRY"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><H1
+><A
+NAME="SMBUMOUNT"
+>smbmnt</A
+></H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN5"
+></A
+><H2
+>Name</H2
+>smbmnt&nbsp;--&nbsp;helper utility for mounting SMB filesystems</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN8"
+></A
+><H2
+>Synopsis</H2
+><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
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN18"
+></A
+><H2
+>DESCRIPTION</H2
+><P
+><B
+CLASS="COMMAND"
+>smbmnt</B
+> is a helper application used 
+	by the smbmount program to do the actual mounting of SMB shares. 
+	<B
+CLASS="COMMAND"
+>smbmnt</B
+> 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.</P
+><P
+>The <B
+CLASS="COMMAND"
+>smbmnt</B
+> program is normally invoked 
+	by <A
+HREF="smbmount.8.html"
+TARGET="_top"
+><B
+CLASS="COMMAND"
+>smbmount(8)</B
+>
+	</A
+>. It should not be invoked directly by users. </P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN27"
+></A
+><H2
+>OPTIONS</H2
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>-r</DT
+><DD
+><P
+>mount the filesystem read-only 
+		</P
+></DD
+><DT
+>-u uid</DT
+><DD
+><P
+>specify the uid that the files will 
+		be owned by </P
+></DD
+><DT
+>-g gid</DT
+><DD
+><P
+>specify the gid that the files will be 
+		owned by </P
+></DD
+><DT
+>-f mask</DT
+><DD
+><P
+>specify the octal file mask applied
+		</P
+></DD
+><DT
+>-d mask</DT
+><DD
+><P
+>specify the octal directory mask 
+		applied  </P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN50"
+></A
+><H2
+>AUTHOR</H2
+><P
+>The current maintainer of smbfs and the userspace
+	tools <B
+CLASS="COMMAND"
+>smbmount</B
+>, <B
+CLASS="COMMAND"
+>smbumount</B
+>,
+	and <B
+CLASS="COMMAND"
+>smbmnt</B
+> is <A
+HREF="mailto:urban@teststation.com"
+TARGET="_top"
+>Urban Widmark</A
+>.</P
+><P
+>The conversion of this manpage for Samba 2.2 was performed 
+	by Gerald Carter</P
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/docs/htmldocs/smbmount.8.html b/docs/htmldocs/smbmount.8.html
new file mode 100644
index 0000000000..94a4ae8bc8
--- /dev/null
+++ b/docs/htmldocs/smbmount.8.html
@@ -0,0 +1,264 @@
+<HTML
+><HEAD
+><TITLE
+>smbmount</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.57"></HEAD
+><BODY
+CLASS="REFENTRY"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><H1
+><A
+NAME="SMBMOUNT"
+>smbmount</A
+></H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN5"
+></A
+><H2
+>Name</H2
+>smbmount&nbsp;--&nbsp;mount and smbfs filesystem</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN8"
+></A
+><H2
+>Synopsis</H2
+><P
+><B
+CLASS="COMMAND"
+>smbumount</B
+>  {service} {mount-point} [-o options]</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN14"
+></A
+><H2
+>DESCRIPTION</H2
+><P
+><B
+CLASS="COMMAND"
+>smbmount</B
+> mounts a SMB filesystem. It 
+	is usually invoked as <B
+CLASS="COMMAND"
+>mount.smb</B
+> from 
+	the <B
+CLASS="COMMAND"
+>mount(8)</B
+> command when using the 
+	"-t smb" option. The kernel must support the smbfs filesystem. </P
+><P
+>Options to smbmount are specified as a comma separated list 
+	of key=value pairs.</P
+><P
+><I
+CLASS="EMPHASIS"
+>NOTE:</I
+> <B
+CLASS="COMMAND"
+>smbmount</B
+> 
+	calls <B
+CLASS="COMMAND"
+>smbmnt(8)</B
+> to do the actual mount. You 
+	must make sure that <B
+CLASS="COMMAND"
+>smbmnt</B
+> is in the path so 
+	that it can be found. </P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN26"
+></A
+><H2
+>OPTIONS</H2
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>username=&lt;arg&gt;</DT
+><DD
+><P
+>specifies the username to connect as. If
+		this is not given then the environment variable <TT
+CLASS="PARAMETER"
+><I
+>		$USER</I
+></TT
+> is used. This option can also take the 
+		form "user%password" or "user/workgroup" or 
+		"user/workgroup%password" to allow the password and workgroup 
+		to be specified as part of the username.</P
+></DD
+><DT
+>password=&lt;arg&gt;</DT
+><DD
+><P
+>specifies the SMB password. If not given then 
+		<B
+CLASS="COMMAND"
+>smbmount</B
+> will prompt for a passeword, unless 
+		the guest option is given. </P
+></DD
+><DT
+>netbiosname=&lt;arg&gt;</DT
+><DD
+><P
+>sets the source NetBIOS name. It defaults 
+		to the local hostname. </P
+></DD
+><DT
+>uid=&lt;arg&gt;</DT
+><DD
+><P
+>sets the uid that files will be mounted as. 
+		It may be specified as either a username or a numeric uid.
+		</P
+></DD
+><DT
+>gid=&lt;arg&gt;</DT
+><DD
+><P
+>sets the gid that files will be mounted as. 
+		It may be specified as either a groupname or a numeric 
+		gid. </P
+></DD
+><DT
+>port=&lt;arg&gt;</DT
+><DD
+><P
+>sets the remote SMB port number. The default 
+		is 139. </P
+></DD
+><DT
+>fmask=&lt;arg&gt;</DT
+><DD
+><P
+>sets the file mask. This determines the 
+		permissions that remote files have in the local filesystem. 
+		The default is based on the current umask. </P
+></DD
+><DT
+>dmask=&lt;arg&gt;</DT
+><DD
+><P
+>sets the directory mask. This deterines the 
+		permissions that remote directories have in the local filesystem. 
+		The default is based on the current umask. </P
+></DD
+><DT
+>debug=&lt;arg&gt;</DT
+><DD
+><P
+>sets the debug level. This is useful for 
+		tracking down SMB connection problems. </P
+></DD
+><DT
+>ip=&lt;arg&gt;</DT
+><DD
+><P
+>sets the destination host or IP address.
+		</P
+></DD
+><DT
+>workgroup=&lt;arg&gt;</DT
+><DD
+><P
+>sets the workgroup on the destination </P
+></DD
+><DT
+>sockopt=&lt;arg&gt;</DT
+><DD
+><P
+>sets the TCP socket options. See the <A
+HREF="smb.conf.5.html#SOCKETOPTIONS"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf
+		</TT
+></A
+> <TT
+CLASS="PARAMETER"
+><I
+>socket options</I
+></TT
+> option.
+		</P
+></DD
+><DT
+>scope=&lt;arg&gt;</DT
+><DD
+><P
+>sets the NetBIOS scope </P
+></DD
+><DT
+>guest</DT
+><DD
+><P
+>don't prompt for a password </P
+></DD
+><DT
+>ro</DT
+><DD
+><P
+>mount read-only </P
+></DD
+><DT
+>rw</DT
+><DD
+><P
+>mount read-write </P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN98"
+></A
+><H2
+>AUTHOR</H2
+><P
+>The current maintainer of smbfs and the userspace
+	tools <B
+CLASS="COMMAND"
+>smbmount</B
+>, <B
+CLASS="COMMAND"
+>smbumount</B
+>,
+	and <B
+CLASS="COMMAND"
+>smbmnt</B
+> is <A
+HREF="mailto:urban@teststation.com"
+TARGET="_top"
+>Urban Widmark</A
+></P
+><P
+>The conversion of this manpage for Samba 2.2 was performed 
+	by Gerald Carter</P
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/docs/htmldocs/smbumount.8.html b/docs/htmldocs/smbumount.8.html
new file mode 100644
index 0000000000..cdecec69a1
--- /dev/null
+++ b/docs/htmldocs/smbumount.8.html
@@ -0,0 +1,130 @@
+<HTML
+><HEAD
+><TITLE
+>smbumount</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.57"></HEAD
+><BODY
+CLASS="REFENTRY"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><H1
+><A
+NAME="SMBUMOUNT"
+>smbumount</A
+></H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN5"
+></A
+><H2
+>Name</H2
+>smbumount&nbsp;--&nbsp;smbfs umount for normal users</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN8"
+></A
+><H2
+>Synopsis</H2
+><P
+><B
+CLASS="COMMAND"
+>smbumount</B
+>  {mount-point}</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN12"
+></A
+><H2
+>DESCRIPTION</H2
+><P
+>With this program, normal users can unmount smb-filesystems, 
+	provided that it is suid root.  <B
+CLASS="COMMAND"
+>smbumount</B
+> has 
+	been written to give normal linux-users more control over their 
+	resources. It is safe to install this program suid root, because only 
+	the user who has mounted a filesystem is allowed to unmount it again.  
+	For root it is not necessary to use smbumount. The normal umount 
+	program works perfectly well, but it would certainly be problematic 
+	to make umount setuid root.</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN16"
+></A
+><H2
+>OPTIONS</H2
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>mount-point</DT
+><DD
+><P
+>The directory to unmount.</P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN23"
+></A
+><H2
+>SEE ALSO</H2
+><P
+><A
+HREF="smbmount.8.html"
+TARGET="_top"
+><B
+CLASS="COMMAND"
+>smbmount(8)</B
+>
+	</A
+></P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN28"
+></A
+><H2
+>AUTHOR</H2
+><P
+>The current maintainer of smbfs and the userspace
+	tools <B
+CLASS="COMMAND"
+>smbmount</B
+>, <B
+CLASS="COMMAND"
+>smbumount</B
+>,
+	and <B
+CLASS="COMMAND"
+>smbmnt</B
+> is <A
+HREF="mailto:urban@teststation.com"
+TARGET="_top"
+>Urban Widmark</A
+>.</P
+><P
+>The conversion of this manpage for Samba 2.2 was performed 
+	by Gerald Carter</P
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/docs/manpages/smbmnt.8 b/docs/manpages/smbmnt.8
index e8cc1f2cd9..fcba71f49a 100644
--- a/docs/manpages/smbmnt.8
+++ b/docs/manpages/smbmnt.8
@@ -1,37 +1,50 @@
-.TH "smbmnt " "1" "25 September 1999" "Samba" "SAMBA" 
-.PP 
-.SH "NAME" 
+.\" This manpage has been automatically generated by docbook2man-spec
+.\" from a DocBook document.  docbook2man-spec can be found at:
+.\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
+.\" Please send any bug reports, improvements, comments, patches, 
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "SMBMNT" "8" "22 February 2001" "" ""
+.SH NAME
 smbmnt \- helper utility for mounting SMB filesystems
-.PP 
-.SH "SYNOPSIS" 
-\fBsmbmnt\fP mount-point [ -s share ] [ -r ] [ -u uid ] [ -g gid ] [ -f mask ] [ -d mask ] 
-.PP 
-.SH "DESCRIPTION" 
-.PP 
-smbmnt is a helper application used by the smbmount program to do the
-actual mounting of SMB shares\&. smbmnt 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\&.
-.PP 
-The smbmnt program is normally invoked by smbmount\&. It should not be
-invoked directly by users\&.
-.PP 
-.IP "\fB-r\fP" 
-mount the filesystem read-only
-.PP 
-.IP "\fB-u uid\fP" 
-specify the uid that the files will be owned by
-.PP 
-.IP "\fB-g gid\fP" 
-specify the gid that the files will be owned by
-.PP 
-.IP "\fB-f mask\fP" 
-specify the octal file mask applied 
-.PP 
-.IP "\fB-d mask\fP" 
-specify the octal directory mask applied 
-.PP 
-.SH "AUTHOR" 
-The maintainer of smbfs, smbmnt and smbmount is Andrew Tridgell
-\fItridge@samba\&.org\fP
+.SH SYNOPSIS
+.sp
+\fBsmbumount\fR \fBmount-point\fR [ \fB-s <share>\fR ]  [ \fB-r\fR ]  [ \fB-u <uid>\fR ]  [ \fB-g <gid>\fR ]  [ \fB-f <mask>\fR ]  [ \fB-d <mask>\fR ] 
+.SH "DESCRIPTION"
+.PP
+\fBsmbmnt\fR is a helper application used 
+by the smbmount program to do the actual mounting of SMB shares. 
+\fBsmbmnt\fR 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.
+.PP
+The \fBsmbmnt\fR program is normally invoked 
+by \fBsmbmount(8)\fR
+ <URL:smbmount.8.html>. It should not be invoked directly by users. 
+.SH "OPTIONS"
+.TP
+\fB-r\fR
+mount the filesystem read-only 
+.TP
+\fB-u uid\fR
+specify the uid that the files will 
+be owned by 
+.TP
+\fB-g gid\fR
+specify the gid that the files will be 
+owned by 
+.TP
+\fB-f mask\fR
+specify the octal file mask applied
+.TP
+\fB-d mask\fR
+specify the octal directory mask 
+applied 
+.SH "AUTHOR"
+.PP
+The current maintainer of smbfs and the userspace
+tools \fBsmbmount\fR, \fBsmbumount\fR,
+and \fBsmbmnt\fR is Urban Widmark <URL:mailto:urban@teststation.com>.
+.PP
+The conversion of this manpage for Samba 2.2 was performed 
+by Gerald Carter
diff --git a/docs/manpages/smbmount.8 b/docs/manpages/smbmount.8
index 457a940ddb..de241824a4 100644
--- a/docs/manpages/smbmount.8
+++ b/docs/manpages/smbmount.8
@@ -1,87 +1,99 @@
-.TH "smbmount " "1" "25 September 1999" "Samba" "SAMBA" 
-.PP 
-.SH "NAME" 
-smbmount \- mount an SMB filesystem
-.PP 
-.SH "SYNOPSIS" 
-\fBsmbmount\fP service mountpoint [ -o options ]
-.PP 
-.SH "DESCRIPTION" 
-.PP 
-smbmount mounts a SMB filesystem\&. It is usually invoked as mount\&.smb
-from the mount(8) command when using the "-t smb" option\&. The kernel
-must support the smbfs filesystem\&.
-.PP 
-Options to smbmount are specified as a comma separated list of
-key=value pairs\&. 
-.PP 
-NOTE: smbmount calls smbmnt to do the actual mount\&. You must make sure
-that smbmnt is in the path so that it can be found\&.
-.PP 
-.IP "\fBusername=<arg>\fP" 
-specifies the username to connect as\&. If this is
-not given then the environment variable USER is used\&. This option can
-also take the form user%password or user/workgroup or
-user/workgroup%password to allow the password and workgroup to be
-specified as part of the username\&.
-.IP 
-.IP "\fBpassword=<arg>\fP" 
-specifies the SMB password\&. If not given then
-smbmount will prompt for a passeword, unless the guest option is
-given\&.
-.IP 
-.IP "\fBnetbiosname=<arg>\fP" 
-sets the source NetBIOS name\&. It defaults to
-the local hostname\&.
-.IP 
-.IP "\fBuid=<arg>\fP" 
-sets the uid that files will be mounted as\&. It may be
-specified as either a username or a numeric uid\&.
-.IP 
-.IP "\fBgid=<arg>\fP" 
-sets the gid that files will be mounted as\&. It may be
-specified as either a groupname or a numeric gid\&.
-.IP 
-.IP "\fBport=<arg>\fP" 
-sets the remote SMB port number\&. The default is 139\&.
-.IP 
-.IP "\fBfmask=<arg>\fP" 
-sets the file mask\&. This deterines the permissions
-that remote files have in the local filesystem\&. The default is based
-on the current umask\&.
-.IP 
-.IP "\fBdmask=<arg>\fP" 
-sets the directory mask\&. This deterines the
-permissions that remote directories have in the local filesystem\&. The
-default is based on the current umask\&.
-.IP 
-.IP "\fBdebug=<arg>\fP" 
-sets the debug level\&. This is useful for tracking
-down SMB connection problems\&.
-.IP 
-.IP "\fBip=<arg>\fP" 
-sets the destination host or IP address\&.
-.IP 
-.IP "\fBworkgroup=<arg>\fP" 
-sets the workgroup on the destination
-.IP 
-.IP "\fBsockopt=<arg>\fP" 
-sets the TCP socket options\&. See the smb\&.conf
-"socket options" option\&.
-.IP 
-.IP "\fBscope=<arg>\fP" 
-sets the NetBIOS scope
-.IP 
-.IP "\fBguest\fP" 
-don\'t prompt for a password
-.IP 
-.IP "\fBro\fP" 
-mount read-only
-.IP 
-.IP "\fBrw\fP" 
-mount read-write
-.IP 
-.PP 
-.SH "AUTHOR" 
-The maintainer of smbfs, smbmnt and smbmount is Andrew Tridgell
-\fItridge@samba\&.org\fP
+.\" This manpage has been automatically generated by docbook2man-spec
+.\" from a DocBook document.  docbook2man-spec can be found at:
+.\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
+.\" Please send any bug reports, improvements, comments, patches, 
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "SMBMOUNT" "8" "22 February 2001" "" ""
+.SH NAME
+smbmount \- mount and smbfs filesystem
+.SH SYNOPSIS
+.sp
+\fBsmbumount\fR \fBservice\fR \fBmount-point\fR [ \fB-o options\fR ] 
+.SH "DESCRIPTION"
+.PP
+\fBsmbmount\fR mounts a SMB filesystem. It 
+is usually invoked as \fBmount.smb\fR from 
+the \fBmount(8)\fR command when using the 
+"-t smb" option. The kernel must support the smbfs filesystem. 
+.PP
+Options to smbmount are specified as a comma separated list 
+of key=value pairs.
+.PP
+\fBNOTE:\fR \fBsmbmount\fR 
+calls \fBsmbmnt(8)\fR to do the actual mount. You 
+must make sure that \fBsmbmnt\fR is in the path so 
+that it can be found. 
+.SH "OPTIONS"
+.TP
+\fBusername=<arg>\fR
+specifies the username to connect as. If
+this is not given then the environment variable \fI $USER\fR is used. This option can also take the 
+form "user%password" or "user/workgroup" or 
+"user/workgroup%password" to allow the password and workgroup 
+to be specified as part of the username.
+.TP
+\fBpassword=<arg>\fR
+specifies the SMB password. If not given then 
+\fBsmbmount\fR will prompt for a passeword, unless 
+the guest option is given. 
+.TP
+\fBnetbiosname=<arg>\fR
+sets the source NetBIOS name. It defaults 
+to the local hostname. 
+.TP
+\fBuid=<arg>\fR
+sets the uid that files will be mounted as. 
+It may be specified as either a username or a numeric uid.
+.TP
+\fBgid=<arg>\fR
+sets the gid that files will be mounted as. 
+It may be specified as either a groupname or a numeric 
+gid. 
+.TP
+\fBport=<arg>\fR
+sets the remote SMB port number. The default 
+is 139. 
+.TP
+\fBfmask=<arg>\fR
+sets the file mask. This determines the 
+permissions that remote files have in the local filesystem. 
+The default is based on the current umask. 
+.TP
+\fBdmask=<arg>\fR
+sets the directory mask. This deterines the 
+permissions that remote directories have in the local filesystem. 
+The default is based on the current umask. 
+.TP
+\fBdebug=<arg>\fR
+sets the debug level. This is useful for 
+tracking down SMB connection problems. 
+.TP
+\fBip=<arg>\fR
+sets the destination host or IP address.
+.TP
+\fBworkgroup=<arg>\fR
+sets the workgroup on the destination 
+.TP
+\fBsockopt=<arg>\fR
+sets the TCP socket options. See the \fIsmb.conf
+\fR <URL:smb.conf.5.html#SOCKETOPTIONS> \fIsocket options\fR option.
+.TP
+\fBscope=<arg>\fR
+sets the NetBIOS scope 
+.TP
+\fBguest\fR
+don't prompt for a password 
+.TP
+\fBro\fR
+mount read-only 
+.TP
+\fBrw\fR
+mount read-write 
+.SH "AUTHOR"
+.PP
+The current maintainer of smbfs and the userspace
+tools \fBsmbmount\fR, \fBsmbumount\fR,
+and \fBsmbmnt\fR is Urban Widmark <URL:mailto:urban@teststation.com>
+.PP
+The conversion of this manpage for Samba 2.2 was performed 
+by Gerald Carter
diff --git a/docs/manpages/smbumount.8 b/docs/manpages/smbumount.8
index 724684a221..1699b6bf6f 100644
--- a/docs/manpages/smbumount.8
+++ b/docs/manpages/smbumount.8
@@ -1,28 +1,37 @@
-.TH SMBUMOUNT 8 "18 May 1999" "smbumount 2.0.4"
+.\" This manpage has been automatically generated by docbook2man-spec
+.\" from a DocBook document.  docbook2man-spec can be found at:
+.\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
+.\" Please send any bug reports, improvements, comments, patches, 
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "SMBUMOUNT" "8" "22 February 2001" "" ""
 .SH NAME
-smbumount \- umount for normal users
+smbumount \- smbfs umount for normal users
 .SH SYNOPSIS
-.B smbumount
-.B mount-point
-
-.SH DESCRIPTION
-With this program, normal users can unmount smb-filesystems, provided
-that it is suid root.
-
-.B smbumount
-has been written to give normal linux-users more control over their
-resources. It is safe to install this program suid root, because only
-the user who has mounted a filesystem is allowed to unmount it again.
-
-For root it is not necessary to use smbumount. The normal umount
-program works perfectly well, but it would certainly be problematic to
-make umount setuid root.
-
-.SH OPTIONS
-.B mount-point
-.RS 3
-.B mount-point
-is the directory you want to unmount.
-
-.SH SEE ALSO
-.B smbmount(8)
+.sp
+\fBsmbumount\fR \fBmount-point\fR
+.SH "DESCRIPTION"
+.PP
+With this program, normal users can unmount smb-filesystems, 
+provided that it is suid root. \fBsmbumount\fR has 
+been written to give normal linux-users more control over their 
+resources. It is safe to install this program suid root, because only 
+the user who has mounted a filesystem is allowed to unmount it again. 
+For root it is not necessary to use smbumount. The normal umount 
+program works perfectly well, but it would certainly be problematic 
+to make umount setuid root.
+.SH "OPTIONS"
+.TP
+\fBmount-point\fR
+The directory to unmount.
+.SH "SEE ALSO"
+.PP
+\fBsmbmount(8)\fR
+ <URL:smbmount.8.html>
+.SH "AUTHOR"
+.PP
+The current maintainer of smbfs and the userspace
+tools \fBsmbmount\fR, \fBsmbumount\fR,
+and \fBsmbmnt\fR is Urban Widmark <URL:mailto:urban@teststation.com>.
+.PP
+The conversion of this manpage for Samba 2.2 was performed 
+by Gerald Carter