there is seemingly no end to these man pages....

(This used to be commit e5996f4948a4220c71070769dce2c5baf1a65ac8)

3 files changed, 414 insertions, 159 deletions

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 @@
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="findsmb">
+
+<refmeta>
+	<refentrytitle>smbstatus</refentrytitle>
+	<manvolnum>1</manvolnum>
+</refmeta>
+
+
+<refnamediv>
+	<refname>smbstatus</refname>
+	<refpurpose>report on current Samba connections</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>smbstatus</command>
+		<arg choice="opt">-P</arg>
+		<arg choice="opt">-b</arg>
+		<arg choice="opt">-d</arg>
+		<arg choice="opt">-L</arg>
+		<arg choice="opt">-p</arg>
+		<arg choice="opt">-S</arg>
+		<arg choice="opt">-s &lt;configuration file&gt;</arg>
+		<arg choice="opt">-u &lt;username&gt;</arg>
+	</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para>This tool is part of the <ulink url="samba.7.html">
+	Samba</ulink> suite.</para>
+
+	<para><command>smbstatus</command> is a very simple program to 
+	list the current Samba connections.</para>
+</refsect1>
+
+<refsect1>
+	<title>OPTIONS</title>
+
+	<variablelist>
+		<varlistentry>
+		<term>-P</term>
+		<listitem><para>If samba has been compiled with the 
+		profiling option, print only the contents of the profiling 
+		shared memory area.</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-b</term>
+		<listitem><para>gives brief output.</para></listitem>
+		</varlistentry>
+
+
+		<varlistentry>
+		<term>-d</term>
+		<listitem><para>gives verbose output.</para></listitem>
+		</varlistentry>
+
+
+		<varlistentry>
+		<term>-L</term>
+		<listitem><para>causes smbstatus to only list locks.</para>
+		</listitem>
+		</varlistentry>
+		
+
+
+		<varlistentry>
+		<term>-p</term>
+		<listitem><para>print a list of <ulink url="smbd.8.html">
+		<command>smbd(8)</command></ulink> processes and exit. 
+		Useful for scripting.</para></listitem>
+		</varlistentry>
+		
+		
+		<varlistentry>
+		<term>-S</term>
+		<listitem><para>causes smbstatus to only list shares.</para>
+		</listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
+		<term>-s &lt;configuration file&gt;</term>
+		<listitem><para>The default configuration file name is
+		determined at compile time. The file specified contains the
+		configuration details required by the server. See <ulink 
+		url="smb.conf.5.html"><filename>smb.conf(5)</filename>
+		</ulink> for more information.</para>
+		</listitem>
+		</varlistentry>
+
+
+		<varlistentry>
+		<term>-u &lt;username&gt;</term>
+		<listitem><para>selects information relevant to 
+		<parameter>username</parameter> only.</para>
+		</listitem>
+		</varlistentry>
+
+	</variablelist>
+</refsect1>
+
+<refsect1>
+	<title>VERSION</title>
+
+	<para>This man page is correct for version 2.2 of 
+	the Samba suite.</para>
+</refsect1>
+
+<refsect1>
+	<title>SEE ALSO</title>
+	<para><ulink url="smbd.8.html"><command>smbd(8)</command></ulink> and
+	<ulink url="smb.conf.5.html">smb.conf(5)</ulink>.</para>
+</refsect1>
+
+<refsect1>
+	<title>AUTHOR</title>
+	
+	<para>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.</para>
+	
+	<para>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
+	<ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+	ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0 
+	release by Jeremy Allison.  The conversion to DocBook for 
+	Samba 2.2 was done by Gerald Carter</para>
+</refsect1>
+
+</refentry>
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 @@
-
-
- 
-
-
-
-<html><head><title>smbstatus (1)</title>
-
-<link rev="made" href="mailto:samba@samba.org">
-</head>
-<body>
-
-<hr>
-
-<h1>smbstatus (1)</h1>
-<h2>Samba</h2>
-<h2>23 Oct 1998</h2>
-
-
-    
-<p><a name="NAME"></a>
-<h2>NAME</h2>
-    smbstatus - report on current Samba connections
-<p><a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-     
-<p><strong>smbstatus</strong> [<a href="smbstatus.1.html#minusP">-P</a>] [<a href="smbstatus.1.html#minusb">-b</a>] [<a href="smbstatus.1.html#minusd">-d</a>] [<a href="smbstatus.1.html#minusL">-L</a>] [<a href="smbstatus.1.html#minusp">-p</a>] [<a href="smbstatus.1.html#minusS">-S</a>] [<a href="smbstatus.1.html#minuss">-s configuration file</a>] [<a href="smbstatus.1.html#minusu">-u username</a>]
-<p><a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-    
-<p>This program is part of the <strong>Samba</strong> suite.
-<p><strong>smbstatus</strong> is a very simple program to list the current Samba
-connections.
-<p><a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-    
-<p><dl>
-<p><a name="minusP"></a>
-<p></p><dt><strong><strong>-P</strong></strong><dd> If samba has been compiled with the profiling option,
-print only the contents of the profiling shared memory area.
-<p><a name="minusb"></a>
-<p></p><dt><strong><strong>-b</strong></strong><dd> gives brief output.
-<p><a name="minusd"></a>
-<p></p><dt><strong><strong>-d</strong></strong><dd> gives verbose output.
-<p><a name="minusL"></a>
-<p></p><dt><strong><strong>-L</strong></strong><dd> causes smbstatus to only list locks.
-<p><a name="minusp"></a>
-<p></p><dt><strong><strong>-p</strong></strong><dd> print a list of <a href="smbd.8.html"><strong>smbd</strong></a>
-processes and exit. Useful for scripting.
-<p><a name="minusS"></a>
-<p></p><dt><strong><strong>-S</strong></strong><dd> causes smbstatus to only list shares.
-<p><a name="minuss"></a>
-<p></p><dt><strong><strong>-s configuration file</strong></strong><dd> The default configuration file name is
-determined at compile time. The file specified contains the
-configuration details required by the server. See <a href="smb.conf.5.html"><strong>smb.conf
-(5)</strong></a> for more information.
-<p><a name="minusu"></a>
-<p></p><dt><strong><strong>-u username</strong></strong><dd> selects information relevant to <em>username</em>
-only.
-<p></dl>
-<p><a name="VERSION"></a>
-<h2>VERSION</h2>
-    
-<p>This man page is correct for version 2.0 of the Samba suite.
-<p><a name="SEEALSO"></a>
-<h2>SEE ALSO</h2>
-    
-<p><a href="smb.conf.5.html"><strong>smb.conf (5)</strong></a>, <a href="smbd.8.html"><strong>smbd (8)</strong></a>
-<p><a name="AUTHOR"></a>
-<h2>AUTHOR</h2>
-    
-<p>The original Samba software and related utilities were created by
-Andrew Tridgell <a href="mailto:samba@samba.org"><em>samba@samba.org</em></a>. Samba is now developed
-by the Samba Team as an Open Source project similar to the way the
-Linux kernel is developed.
-<p>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
-<a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>)
-and updated for the Samba2.0 release by Jeremy Allison.
-<a href="mailto:samba@samba.org"><em>samba@samba.org</em></a>.
-<p>See <a href="samba.7.html"><strong>samba (7)</strong></a> to find out how to get a full
-list of contributors and details on how to submit bug reports,
-comments etc.
-</body>
-</html>
+<HTML
+><HEAD
+><TITLE
+>nmblookup</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="FINDSMB"
+>nmblookup</A
+></H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN5"
+></A
+><H2
+>Name</H2
+>smbstatus&nbsp;--&nbsp;report on current Samba connections</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN8"
+></A
+><H2
+>Synopsis</H2
+><P
+><B
+CLASS="COMMAND"
+>smbstatus</B
+>  [-P] [-b] [-d] [-L] [-p] [-S] [-s &lt;configuration file&gt;] [-u &lt;username&gt;]</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN19"
+></A
+><H2
+>DESCRIPTION</H2
+><P
+>This tool is part of the <A
+HREF="samba.7.html"
+TARGET="_top"
+>	Samba</A
+> suite.</P
+><P
+><B
+CLASS="COMMAND"
+>smbstatus</B
+> is a very simple program to 
+	list the current Samba connections.</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN25"
+></A
+><H2
+>OPTIONS</H2
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>-P</DT
+><DD
+><P
+>If samba has been compiled with the 
+		profiling option, print only the contents of the profiling 
+		shared memory area.</P
+></DD
+><DT
+>-b</DT
+><DD
+><P
+>gives brief output.</P
+></DD
+><DT
+>-d</DT
+><DD
+><P
+>gives verbose output.</P
+></DD
+><DT
+>-L</DT
+><DD
+><P
+>causes smbstatus to only list locks.</P
+></DD
+><DT
+>-p</DT
+><DD
+><P
+>print a list of <A
+HREF="smbd.8.html"
+TARGET="_top"
+>		<B
+CLASS="COMMAND"
+>smbd(8)</B
+></A
+> processes and exit. 
+		Useful for scripting.</P
+></DD
+><DT
+>-S</DT
+><DD
+><P
+>causes smbstatus to only list shares.</P
+></DD
+><DT
+>-s &lt;configuration file&gt;</DT
+><DD
+><P
+>The default configuration file name is
+		determined at compile time. The file specified contains the
+		configuration details required by the server. See <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+>
+		</A
+> for more information.</P
+></DD
+><DT
+>-u &lt;username&gt;</DT
+><DD
+><P
+>selects information relevant to 
+		<TT
+CLASS="PARAMETER"
+><I
+>username</I
+></TT
+> only.</P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN65"
+></A
+><H2
+>VERSION</H2
+><P
+>This man page is correct for version 2.2 of 
+	the Samba suite.</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN68"
+></A
+><H2
+>SEE ALSO</H2
+><P
+><A
+HREF="smbd.8.html"
+TARGET="_top"
+><B
+CLASS="COMMAND"
+>smbd(8)</B
+></A
+> and
+	<A
+HREF="smb.conf.5.html"
+TARGET="_top"
+>smb.conf(5)</A
+>.</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN74"
+></A
+><H2
+>AUTHOR</H2
+><P
+>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.</P
+><P
+>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
+	<A
+HREF="ftp://ftp.icce.rug.nl/pub/unix/"
+TARGET="_top"
+>	ftp://ftp.icce.rug.nl/pub/unix/</A
+>) and updated for the Samba 2.0 
+	release by Jeremy Allison.  The conversion to DocBook for 
+	Samba 2.2 was done by Gerald Carter</P
+></DIV
+></BODY
+></HTML
+>
\ 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:
+.\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
+.\" Please send any bug reports, improvements, comments, patches, 
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.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 <configuration file>\fR ]  [ \fB-u <username>\fR ] 
+.SH "DESCRIPTION"
+.PP
+This tool is part of the  Samba <URL:samba.7.html> 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 <URL:smbd.8.html> processes and exit. 
+Useful for scripting.
+.TP
+\fB-S\fR
+causes smbstatus to only list shares.
+.TP
+\fB-s <configuration file>\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
+ <URL:smb.conf.5.html> for more information.
+.TP
+\fB-u <username>\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 <URL:smbd.8.html> and
+smb.conf(5) <URL:smb.conf.5.html>.
+.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/ <URL: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