3 files changed, 183 insertions, 149 deletions
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