diff --git a/docs/docbook/manpages/smbstatus.1.sgml b/docs/docbook/manpages/smbstatus.1.sgml
new file mode 100644
index 00000000000..6f2361d0215
--- /dev/null
+++ b/docs/docbook/manpages/smbstatus.1.sgml
@@ -0,0 +1,137 @@
+
+
+
+
+ smbstatus
+ 1
+
+
+
+
+ smbstatus
+ report on current Samba connections
+
+
+
+
+ smbstatus
+ -P
+ -b
+ -d
+ -L
+ -p
+ -S
+ -s <configuration file>
+ -u <username>
+
+
+
+
+ DESCRIPTION
+
+ This tool is part of the
+ Samba suite.
+
+ smbstatus is a very simple program to
+ list the current Samba connections.
+
+
+
+ OPTIONS
+
+
+
+ -P
+ If samba has been compiled with the
+ profiling option, print only the contents of the profiling
+ shared memory area.
+
+
+
+ -b
+ gives brief output.
+
+
+
+
+ -d
+ gives verbose output.
+
+
+
+
+ -L
+ causes smbstatus to only list locks.
+
+
+
+
+
+
+ -p
+ print a list of
+ smbd(8) processes and exit.
+ Useful for scripting.
+
+
+
+
+ -S
+ causes smbstatus to only list shares.
+
+
+
+
+
+
+ -s <configuration file>
+ The default configuration file name is
+ determined at compile time. The file specified contains the
+ configuration details required by the server. See smb.conf(5)
+ for more information.
+
+
+
+
+
+ -u <username>
+ selects information relevant to
+ username only.
+
+
+
+
+
+
+
+ VERSION
+
+ This man page is correct for version 2.2 of
+ the Samba suite.
+
+
+
+ SEE ALSO
+ smbd(8) and
+ smb.conf(5).
+
+
+
+ AUTHOR
+
+ The original Samba software and related utilities
+ were created by Andrew Tridgell. Samba is now developed
+ by the Samba Team as an Open Source project similar
+ to the way the Linux kernel is developed.
+
+ The original Samba man pages were written by Karl Auer.
+ The man page sources were converted to YODL format (another
+ excellent piece of Open Source software, available at
+
+ ftp://ftp.icce.rug.nl/pub/unix/) and updated for the Samba 2.0
+ release by Jeremy Allison. The conversion to DocBook for
+ Samba 2.2 was done by Gerald Carter
+
+
+
diff --git a/docs/htmldocs/smbstatus.1.html b/docs/htmldocs/smbstatus.1.html
index cdce69cdbf8..b29940585de 100644
--- a/docs/htmldocs/smbstatus.1.html
+++ b/docs/htmldocs/smbstatus.1.html
@@ -1,86 +1,209 @@
-
-
-
-
-
-
-
smbstatus (1)
-
-
-
-
-
-
-
-
smbstatus (1)
-
Samba
-
23 Oct 1998
-
-
-
-
-
NAME
- smbstatus - report on current Samba connections
-
smbstatus is a very simple program to list the current Samba
-connections.
-
-
OPTIONS
-
-
-
-
-P
If samba has been compiled with the profiling option,
-print only the contents of the profiling shared memory area.
-
-
-b
gives brief output.
-
-
-d
gives verbose output.
-
-
-L
causes smbstatus to only list locks.
-
-
-p
print a list of smbd
-processes and exit. Useful for scripting.
-
-
-S
causes smbstatus to only list shares.
-
-
-s configuration file
The default configuration file name is
-determined at compile time. The file specified contains the
-configuration details required by the server. See smb.conf
-(5) for more information.
-
-
-u username
selects information relevant to username
-only.
-
-
-
VERSION
-
-
This man page is correct for version 2.0 of the Samba suite.
-
The original Samba software and related utilities were created by
-Andrew Tridgell samba@samba.org. Samba is now developed
-by the Samba Team as an Open Source project similar to the way the
-Linux kernel is developed.
-
The original Samba man pages were written by Karl Auer. The man page
-sources were converted to YODL format (another excellent piece of Open
-Source software, available at
-ftp://ftp.icce.rug.nl/pub/unix/)
-and updated for the Samba2.0 release by Jeremy Allison.
-samba@samba.org.
-
See samba (7) to find out how to get a full
-list of contributors and details on how to submit bug reports,
-comments etc.
-
-
+
smbstatus is a very simple program to
+ list the current Samba connections.
OPTIONS
-P
If samba has been compiled with the
+ profiling option, print only the contents of the profiling
+ shared memory area.
-b
gives brief output.
-d
gives verbose output.
-L
causes smbstatus to only list locks.
-p
print a list of smbd(8) processes and exit.
+ Useful for scripting.
-S
causes smbstatus to only list shares.
-s <configuration file>
The default configuration file name is
+ determined at compile time. The file specified contains the
+ configuration details required by the server. See smb.conf(5)
+ for more information.
-u <username>
selects information relevant to
+ username only.
VERSION
This man page is correct for version 2.2 of
+ the Samba suite.
The original Samba software and related utilities
+ were created by Andrew Tridgell. Samba is now developed
+ by the Samba Team as an Open Source project similar
+ to the way the Linux kernel is developed.
The original Samba man pages were written by Karl Auer.
+ The man page sources were converted to YODL format (another
+ excellent piece of Open Source software, available at
+ ftp://ftp.icce.rug.nl/pub/unix/) and updated for the Samba 2.0
+ release by Jeremy Allison. The conversion to DocBook for
+ Samba 2.2 was done by Gerald Carter
\ No newline at end of file
diff --git a/docs/manpages/smbstatus.1 b/docs/manpages/smbstatus.1
index ac7cba7149d..f8819fe6cb7 100644
--- a/docs/manpages/smbstatus.1
+++ b/docs/manpages/smbstatus.1
@@ -1,75 +1,70 @@
-.TH "smbstatus " "1" "23 Oct 1998" "Samba" "SAMBA"
-.PP
-.SH "NAME"
+.\" This manpage has been automatically generated by docbook2man-spec
+.\" from a DocBook document. docbook2man-spec can be found at:
+.\"
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng .
+.TH "SMBSTATUS" "1" "22 February 2001" "" ""
+.SH NAME
smbstatus \- report on current Samba connections
-.PP
-.SH "SYNOPSIS"
-.PP
-\fBsmbstatus\fP [-P] [-b] [-d] [-L] [-p] [-S] [-s configuration file] [-u username]
-.PP
-.SH "DESCRIPTION"
-.PP
-This program is part of the \fBSamba\fP suite\&.
-.PP
-\fBsmbstatus\fP is a very simple program to list the current Samba
-connections\&.
-.PP
-.SH "OPTIONS"
-.PP
-.IP
-.IP "\fB-P\fP"
-If samba has been compiled with the profiling option,
-print only the contents of the profiling shared memory area\&.
-.IP
-.IP "\fB-b\fP"
-gives brief output\&.
-.IP
-.IP "\fB-d\fP"
-gives verbose output\&.
-.IP
-.IP "\fB-L\fP"
-causes smbstatus to only list locks\&.
-.IP
-.IP "\fB-p\fP"
-print a list of \fBsmbd\fP
-processes and exit\&. Useful for scripting\&.
-.IP
-.IP "\fB-S\fP"
-causes smbstatus to only list shares\&.
-.IP
-.IP "\fB-s configuration file\fP"
+.SH SYNOPSIS
+.sp
+\fBsmbstatus\fR [ \fB-P\fR ] [ \fB-b\fR ] [ \fB-d\fR ] [ \fB-L\fR ] [ \fB-p\fR ] [ \fB-S\fR ] [ \fB-s \fR ] [ \fB-u \fR ]
+.SH "DESCRIPTION"
+.PP
+This tool is part of the Samba suite.
+.PP
+\fBsmbstatus\fR is a very simple program to
+list the current Samba connections.
+.SH "OPTIONS"
+.TP
+\fB-P\fR
+If samba has been compiled with the
+profiling option, print only the contents of the profiling
+shared memory area.
+.TP
+\fB-b\fR
+gives brief output.
+.TP
+\fB-d\fR
+gives verbose output.
+.TP
+\fB-L\fR
+causes smbstatus to only list locks.
+.TP
+\fB-p\fR
+print a list of \fBsmbd(8)\fR processes and exit.
+Useful for scripting.
+.TP
+\fB-S\fR
+causes smbstatus to only list shares.
+.TP
+\fB-s \fR
The default configuration file name is
-determined at compile time\&. The file specified contains the
-configuration details required by the server\&. See \fBsmb\&.conf
-(5)\fP for more information\&.
-.IP
-.IP "\fB-u username\fP"
-selects information relevant to \fIusername\fP
-only\&.
-.IP
-.PP
-.SH "VERSION"
-.PP
-This man page is correct for version 2\&.0 of the Samba suite\&.
-.PP
-.SH "SEE ALSO"
-.PP
-\fBsmb\&.conf (5)\fP, \fBsmbd (8)\fP
-.PP
-.SH "AUTHOR"
-.PP
-The original Samba software and related utilities were created by
-Andrew Tridgell samba@samba\&.org\&. Samba is now developed
-by the Samba Team as an Open Source project similar to the way the
-Linux kernel is developed\&.
-.PP
-The original Samba man pages were written by Karl Auer\&. The man page
-sources were converted to YODL format (another excellent piece of Open
-Source software, available at
-\fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
-and updated for the Samba2\&.0 release by Jeremy Allison\&.
-samba@samba\&.org\&.
-.PP
-See \fBsamba (7)\fP to find out how to get a full
-list of contributors and details on how to submit bug reports,
-comments etc\&.
+determined at compile time. The file specified contains the
+configuration details required by the server. See \fIsmb.conf(5)\fR
+ for more information.
+.TP
+\fB-u \fR
+selects information relevant to
+\fIusername\fR only.
+.SH "VERSION"
+.PP
+This man page is correct for version 2.2 of
+the Samba suite.
+.SH "SEE ALSO"
+.PP
+\fBsmbd(8)\fR and
+smb.conf(5) .
+.SH "AUTHOR"
+.PP
+The original Samba software and related utilities
+were created by Andrew Tridgell. Samba is now developed
+by the Samba Team as an Open Source project similar
+to the way the Linux kernel is developed.
+.PP
+The original Samba man pages were written by Karl Auer.
+The man page sources were converted to YODL format (another
+excellent piece of Open Source software, available at
+ftp://ftp.icce.rug.nl/pub/unix/ ) and updated for the Samba 2.0
+release by Jeremy Allison. The conversion to DocBook for
+Samba 2.2 was done by Gerald Carter