diff --git a/docs/docbook/manpages/smbrun.1.sgml b/docs/docbook/manpages/smbrun.1.sgml
new file mode 100644
index 00000000000..f1afd7a28e0
--- /dev/null
+++ b/docs/docbook/manpages/smbrun.1.sgml
@@ -0,0 +1,106 @@
+
+
+
+
+ smbrun
+ 1
+
+
+
+
+ smbrun
+ interface program between smbd and external
+ programs
+
+
+
+
+ smbrun
+ <shell command>
+
+
+
+
+ DESCRIPTION
+
+ This tool is part of the
+ Samba suite.
+
+ smbrun is a very small 'glue' program,
+ which runs shell commands for the
+ smbd(8) daemon.
+
+ It first changes to the highest effective user and group
+ ID that it can, then runs the command line provided using the
+ system() call. This program is necessary to allow some operating
+ systems to run external programs as non-root.
+
+
+
+ OPTIONS
+
+
+
+ shell command
+ The shell command to execute. The
+ command should have a fully-qualified path.
+
+
+
+
+
+ ENVIRONMENT VARIABLES
+
+ The PATH variable set for the
+ environment in which smbrun is executed will affect
+ what executables are located and executed if a fully-qualified path
+ is not given in the command.
+
+
+
+
+ DIAGNOSTICS
+
+ If smbrun cannot be located or cannot
+ be executed by smbd(8)
+ , then appropriate messages will be found in the
+ smbd logs. Other diagnostics are dependent on the shell-command
+ being run. It is advisable for your shell commands to issue suitable
+ diagnostics to aid trouble-shooting.
+
+
+
+
+ VERSION
+
+ This man page is correct for version 2.2 of
+ the Samba suite.
+
+
+
+ SEE ALSO
+ nmbd(8),
+ smbclient(1)
+ , and
+ nmblookup(1)
+
+
+
+
+ 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/smbrun.1.html b/docs/htmldocs/smbrun.1.html
index 16133fcb220..95de5bebdf5 100644
--- a/docs/htmldocs/smbrun.1.html
+++ b/docs/htmldocs/smbrun.1.html
@@ -1,86 +1,215 @@
-
-
-
-
-
-
-
smbrun (1)
-
-
-
-
-
-
-
-
smbrun (1)
-
Samba
-
23 Oct 1998
-
-
-
-
-
NAME
- smbrun - interface program between smbd and external programs
-
smbrun is a very small 'glue' program, which runs shell commands
-for the smbd daemon smbd
-(8).
-
It first changes to the highest effective user and group ID that it
-can, then runs the command line provided using the system() call. This
-program is necessary to allow some operating systems to run external
-programs as non-root.
-
-
OPTIONS
-
-
-
-
shell-command
The shell command to execute. The command
-should have a fully-qualified path.
-
-
-
ENVIRONMENT VARIABLES
-
-
The PATH variable set for the environment in which smbrun is
-executed will affect what executables are located and executed if a
-fully-qualified path is not given in the command.
-
-
DIAGNOSTICS
-
-
If smbrun cannot be located or cannot be executed by
-smbd then appropriate messages will be found in
-the smbd logs. Other diagnostics are dependent
-on the shell-command being run. It is advisable for your shell
-commands to issue suitable diagnostics to aid trouble-shooting.
-
-
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.
-
-
+
smbrun is a very small 'glue' program,
+ which runs shell commands for the smbd(8) daemon.
It first changes to the highest effective user and group
+ ID that it can, then runs the command line provided using the
+ system() call. This program is necessary to allow some operating
+ systems to run external programs as non-root.
OPTIONS
shell command
The shell command to execute. The
+ command should have a fully-qualified path.
ENVIRONMENT VARIABLES
The PATH variable set for the
+ environment in which smbrun is executed will affect
+ what executables are located and executed if a fully-qualified path
+ is not given in the command.
DIAGNOSTICS
If smbrun cannot be located or cannot
+ be executed by smbd(8)
+ , then appropriate messages will be found in the smbd logs. Other diagnostics are dependent on the shell-command
+ being run. It is advisable for your shell commands to issue suitable
+ diagnostics to aid trouble-shooting.
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/smbrun.1 b/docs/manpages/smbrun.1
index 24d6efdfcd9..24b320947ea 100644
--- a/docs/manpages/smbrun.1
+++ b/docs/manpages/smbrun.1
@@ -1,69 +1,62 @@
-.TH "smbrun " "1" "23 Oct 1998" "Samba" "SAMBA"
-.PP
-.SH "NAME"
-smbrun \- interface program between smbd and external programs
-.PP
-.SH "SYNOPSIS"
-.PP
-\fBsmbrun\fP shell-command
-.PP
-.SH "DESCRIPTION"
-.PP
-This program is part of the \fBSamba\fP suite\&.
-.PP
-\fBsmbrun\fP is a very small \'glue\' program, which runs shell commands
-for the \fBsmbd\fP daemon \fBsmbd
-(8)\fP\&.
-.PP
-It first changes to the highest effective user and group ID that it
-can, then runs the command line provided using the system() call\&. This
-program is necessary to allow some operating systems to run external
-programs as non-root\&.
-.PP
-.SH "OPTIONS"
-.PP
-.IP
-.IP "\fBshell-command\fP"
-The shell command to execute\&. The command
-should have a fully-qualified path\&.
-.IP
-.PP
-.SH "ENVIRONMENT VARIABLES"
-.PP
-The \fIPATH\fP variable set for the environment in which \fBsmbrun\fP is
-executed will affect what executables are located and executed if a
-fully-qualified path is not given in the command\&.
-.PP
-.SH "DIAGNOSTICS"
-.PP
-If \fBsmbrun\fP cannot be located or cannot be executed by
-\fBsmbd\fP then appropriate messages will be found in
-the \fBsmbd\fP logs\&. Other diagnostics are dependent
-on the shell-command being run\&. It is advisable for your shell
-commands to issue suitable diagnostics to aid trouble-shooting\&.
-.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\&.
+.\" 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 "SMBRUN" "1" "22 February 2001" "" ""
+.SH NAME
+smbrun \- interface program between smbd and external programs
+.SH SYNOPSIS
+.sp
+\fBsmbrun\fR \fB\fR
+.SH "DESCRIPTION"
+.PP
+This tool is part of the Samba suite.
+.PP
+\fBsmbrun\fR is a very small 'glue' program,
+which runs shell commands for the \fB smbd(8)\fR daemon.
+.PP
+It first changes to the highest effective user and group
+ID that it can, then runs the command line provided using the
+system() call. This program is necessary to allow some operating
+systems to run external programs as non-root.
+.SH "OPTIONS"
+.TP
+\fBshell command\fR
+The shell command to execute. The
+command should have a fully-qualified path.
+.SH "ENVIRONMENT VARIABLES"
+.PP
+The \fIPATH\fR variable set for the
+environment in which \fBsmbrun\fR is executed will affect
+what executables are located and executed if a fully-qualified path
+is not given in the command.
+.SH "DIAGNOSTICS"
+.PP
+If \fBsmbrun\fR cannot be located or cannot
+be executed by \fBsmbd(8)\fR
+ , then appropriate messages will be found in the \fB smbd\fR logs. Other diagnostics are dependent on the shell-command
+being run. It is advisable for your shell commands to issue suitable
+diagnostics to aid trouble-shooting.
+.SH "VERSION"
+.PP
+This man page is correct for version 2.2 of
+the Samba suite.
+.SH "SEE ALSO"
+.PP
+\fBnmbd(8)\fR ,
+\fBsmbclient(1)
+\fR , and \fBnmblookup(1)\fR
+.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