more updates.....

(This used to be commit 773ccb36ad3186ad11d92185b66678d49d9ec4fd)

3 files changed, 461 insertions, 168 deletions

diff --git a/docs/docbook/manpages/smbspool.8.sgml b/docs/docbook/manpages/smbspool.8.sgml
new file mode 100644
index 0000000000..b16f925597
--- /dev/null
+++ b/docs/docbook/manpages/smbspool.8.sgml
@@ -0,0 +1,132 @@
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="findsmb">
+
+<refmeta>
+	<refentrytitle>smbspool</refentrytitle>
+	<manvolnum>8</manvolnum>
+</refmeta>
+
+
+<refnamediv>
+	<refname>nmblookup</refname>
+	<refpurpose>send print file to an SMB printer</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>smbspool</command>
+		<arg>job</arg> 
+		<arg>user</arg> 
+		<arg>title</arg> 
+		<arg>copies</arg> 
+		<arg>options</arg> 
+		<arg>filename</arg> 
+	</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para>This tool is part of the <ulink url="samba.7.html">
+	Samba</ulink> suite.</para>
+
+	<para>smbspool is a very small print spooling program that 
+	sends a print file to an SMB printer. The command-line arguments 
+	are position-dependent for compatibility with the Common UNIX 
+	Printing System, but you can use smbspool with any printing system 
+	or from a program or script.</para>
+
+	<para><emphasis>DEVICE URI</emphasis></para>
+
+	<para>smbspool specifies the destination using a Uniform Resource 
+	Identifier ("URI") with a method of "smb". This string can take 
+	a number of forms:</para>
+
+	<itemizedlist>
+		<listitem><para>smb://server/printer</para></listitem>
+		<listitem><para>smb://workgroup/server/printer</para></listitem>
+		<listitem><para>smb://username:password@server/printer</para>
+		</listitem>
+		<listitem><para>smb://username:password@workgroup/server/printer
+		</para></listitem>
+	</itemizedlist>
+
+	<para>smbspool tries to get the URI from argv[0]. If argv[0] 
+	contains the name of the program then it looks in the <parameter>
+	DEVICE_URI</parameter> environment variable.</para>
+
+	<para>Programs using the <command>exec(2)</command> functions can 
+	pass the URI in argv[0], while shell scripts must set the 
+	<parameter>DEVICE_URI</parameter> environment variable prior to
+	running smbspool.</para>
+</refsect1>
+
+<refsect1>
+	<title>OPTIONS</title>
+
+	<itemizedlist>
+		<listitem><para>The job argument (argv[1]) contains the 
+		job ID number and is presently not used by smbspool.
+		</para></listitem>
+
+		<listitem><para>The user argument (argv[2]) contains the 
+		print user's name and is presently not used by smbspool.
+		</para></listitem>
+
+		<listitem><para>The title argument (argv[3]) contains the 
+		job title string and is passed as the remote file name 
+		when sending the print job.</para></listitem>
+
+		<listitem><para>The copies argument (argv[4]) contains 
+		the number of copies to be printed of the named file. If 
+		no filename is provided than this argument is not used by 
+		smbspool.</para></listitem>
+
+		<listitem><para>The options argument (argv[5]) contains 
+		the print options in a single string and is presently 
+		not used by smbspool.</para></listitem>
+
+		<listitem><para>The filename argument (argv[6]) contains the 
+		name of the file to print. If this argument is not specified 
+		then the print file is read from the standard input.</para>
+		</listitem>
+	</itemizedlist>
+</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="nmbd.8.html"><command>nmbd(8)</command></ulink>, 
+	<ulink url="samba.7.html">samba(7)</ulink>, and	<ulink 
+	url="smb.conf.5.html">smb.conf(5)</ulink>
+	</para>
+</refsect1>
+
+<refsect1>
+	<title>AUTHOR</title>
+
+	<para><command>smbspool</command> was written by Michael Sweet 
+	at Easy Software Products.</para>
+	
+	<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/smbspool.8.html b/docs/htmldocs/smbspool.8.html
index e9f489b376..1a8a2e4497 100644
--- a/docs/htmldocs/smbspool.8.html
+++ b/docs/htmldocs/smbspool.8.html
@@ -1,88 +1,231 @@
-
-
- 
-
-
-
-<html><head><title>smbspool (1)</title>
-
-<link rev="made" href="mailto:samba@samba.org">
-</head>
-<body>
-
-<hr>
-
-<h1>smbspool (1)</h1>
-<h2>Samba</h2>
-<h2>11 October 1999</h2>
-
-
-    
-<p><a name="NAME"></a>
-<h2>NAME</h2>
-    smbspool - send print file to an SMB printer
-<p><a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-    
-<strong>smbspool</strong> job user title copies options [filename]
-<p><a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-    
-<p>This program is part of the Samba suite.
-<p>smbspool is a very small print spooling program that sends a print
-file to an SMB printer. The command-line arguments are position-dependent for
-compatibility with the Common UNIX Printing System, but you can use
-smbspool with any printing system or from a program or script.
-<p><h2>DEVICE URI</h2>
-    
-<p>smbspool specifies the destination using a Uniform Resource Identifier
-("URI") with a method of "smb". This string can take a number of
-forms:
-<p><dl>
-<li > smb://server/printer
-<p><li > smb://workgroup/server/printer
-<p><li > smb://username:password@server/printer
-<p><li > smb://username:password@workgroup/server/printer
-<p></dl>
-<p>smbspool tries to get the URI from argv[0]. If argv[0] contains the
-name of the program then it looks in the DEVICE_URI environment variable.
-<p>Programs using the exec(2) functions can pass the URI in argv[0],
-while shell scripts must set the DEVICE_URI environment variable prior to
-running smbspool.
-<p><h2>OPTIONS</h2>
-    
-<p>The job argument (argv[1]) contains the job ID number and is presently
-not used by smbspool.
-<p>The user argument (argv[2]) contains the print user's name and is
-presently not used by smbspool.
-<p>The title argument (argv[3]) contains the job title string and is
-passed as the remote file name when sending the print job.
-<p>The copies argument (argv[4]) contains the number of copies to be
-printed of the named file. If no filename is provided than this argument is
-not used by smbspool.
-<p>The options argument (argv[5]) contains the print options in a single
-string and is presently not used by smbspool.
-<p>The filename argument (argv[6]) contains the name of the file to print.
-If this argument is not specified then the print file is read from the
-standard input.
-<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>
-    
-<a href="smbd.8.html"><strong>smbd (8)</strong></a>
-<p><a name="AUTHOR"></a>
-<h2>AUTHOR</h2>
-    
-<p>smbspool was written by Michael Sweet at Easy Software Products.
-<p>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.
-<p>See samba (7) 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
+>smbspool</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"
+>smbspool</A
+></H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN5"
+></A
+><H2
+>Name</H2
+>nmblookup&nbsp;--&nbsp;send print file to an SMB printer</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN8"
+></A
+><H2
+>Synopsis</H2
+><P
+><B
+CLASS="COMMAND"
+>smbspool</B
+>  [job] [user] [title] [copies] [options] [filename]</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN17"
+></A
+><H2
+>DESCRIPTION</H2
+><P
+>This tool is part of the <A
+HREF="samba.7.html"
+TARGET="_top"
+>	Samba</A
+> suite.</P
+><P
+>smbspool is a very small print spooling program that 
+	sends a print file to an SMB printer. The command-line arguments 
+	are position-dependent for compatibility with the Common UNIX 
+	Printing System, but you can use smbspool with any printing system 
+	or from a program or script.</P
+><P
+><I
+CLASS="EMPHASIS"
+>DEVICE URI</I
+></P
+><P
+>smbspool specifies the destination using a Uniform Resource 
+	Identifier ("URI") with a method of "smb". This string can take 
+	a number of forms:</P
+><P
+></P
+><UL
+><LI
+><P
+>smb://server/printer</P
+></LI
+><LI
+><P
+>smb://workgroup/server/printer</P
+></LI
+><LI
+><P
+>smb://username:password@server/printer</P
+></LI
+><LI
+><P
+>smb://username:password@workgroup/server/printer
+		</P
+></LI
+></UL
+><P
+>smbspool tries to get the URI from argv[0]. If argv[0] 
+	contains the name of the program then it looks in the <TT
+CLASS="PARAMETER"
+><I
+>	DEVICE_URI</I
+></TT
+> environment variable.</P
+><P
+>Programs using the <B
+CLASS="COMMAND"
+>exec(2)</B
+> functions can 
+	pass the URI in argv[0], while shell scripts must set the 
+	<TT
+CLASS="PARAMETER"
+><I
+>DEVICE_URI</I
+></TT
+> environment variable prior to
+	running smbspool.</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN39"
+></A
+><H2
+>OPTIONS</H2
+><P
+></P
+><UL
+><LI
+><P
+>The job argument (argv[1]) contains the 
+		job ID number and is presently not used by smbspool.
+		</P
+></LI
+><LI
+><P
+>The user argument (argv[2]) contains the 
+		print user's name and is presently not used by smbspool.
+		</P
+></LI
+><LI
+><P
+>The title argument (argv[3]) contains the 
+		job title string and is passed as the remote file name 
+		when sending the print job.</P
+></LI
+><LI
+><P
+>The copies argument (argv[4]) contains 
+		the number of copies to be printed of the named file. If 
+		no filename is provided than this argument is not used by 
+		smbspool.</P
+></LI
+><LI
+><P
+>The options argument (argv[5]) contains 
+		the print options in a single string and is presently 
+		not used by smbspool.</P
+></LI
+><LI
+><P
+>The filename argument (argv[6]) contains the 
+		name of the file to print. If this argument is not specified 
+		then the print file is read from the standard input.</P
+></LI
+></UL
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN54"
+></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="AEN57"
+></A
+><H2
+>SEE ALSO</H2
+><P
+><A
+HREF="nmbd.8.html"
+TARGET="_top"
+><B
+CLASS="COMMAND"
+>nmbd(8)</B
+></A
+>, 
+	<A
+HREF="samba.7.html"
+TARGET="_top"
+>samba(7)</A
+>, and	<A
+HREF="smb.conf.5.html"
+TARGET="_top"
+>smb.conf(5)</A
+>
+	</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN64"
+></A
+><H2
+>AUTHOR</H2
+><P
+><B
+CLASS="COMMAND"
+>smbspool</B
+> was written by Michael Sweet 
+	at Easy Software Products.</P
+><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/smbspool.8 b/docs/manpages/smbspool.8
index 053f11b5a0..c94c2d12af 100644
--- a/docs/manpages/smbspool.8
+++ b/docs/manpages/smbspool.8
@@ -1,84 +1,102 @@
-.TH "smbspool " "1" "11 October 1999" "Samba" "SAMBA" 
-.PP 
-.SH "NAME" 
-smbspool \- send print file to an SMB printer
-.PP 
-.SH "SYNOPSIS" 
-\fBsmbspool\fP job user title copies options [filename]
-.PP 
-.SH "DESCRIPTION" 
-.PP 
-This program is part of the Samba suite\&.
-.PP 
-smbspool is a very small print spooling program that sends a print
-file to an SMB printer\&. The command-line arguments are position-dependent for
-compatibility with the Common UNIX Printing System, but you can use
-smbspool with any printing system or from a program or script\&.
-.PP 
-.SH "DEVICE URI" 
-.PP 
-smbspool specifies the destination using a Uniform Resource Identifier
-("URI") with a method of "smb"\&. This string can take a number of
-forms:
-.PP 
-.IP o 
+.\" 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 "SMBSPOOL" "8" "22 February 2001" "" ""
+.SH NAME
+nmblookup \- send print file to an SMB printer
+.SH SYNOPSIS
+.sp
+\fBsmbspool\fR [ \fBjob\fR ]  [ \fBuser\fR ]  [ \fBtitle\fR ]  [ \fBcopies\fR ]  [ \fBoptions\fR ]  [ \fBfilename\fR ] 
+.SH "DESCRIPTION"
+.PP
+This tool is part of the  Samba <URL:samba.7.html> suite.
+.PP
+smbspool is a very small print spooling program that 
+sends a print file to an SMB printer. The command-line arguments 
+are position-dependent for compatibility with the Common UNIX 
+Printing System, but you can use smbspool with any printing system 
+or from a program or script.
+.PP
+\fBDEVICE URI\fR
+.PP
+smbspool specifies the destination using a Uniform Resource 
+Identifier ("URI") with a method of "smb". This string can take 
+a number of forms:
+.TP 0.2i
+\(bu
 smb://server/printer
-.IP 
-.IP o 
+.TP 0.2i
+\(bu
 smb://workgroup/server/printer
-.IP 
-.IP o 
+.TP 0.2i
+\(bu
 smb://username:password@server/printer
-.IP 
-.IP o 
+.TP 0.2i
+\(bu
 smb://username:password@workgroup/server/printer
-.IP 
-.PP 
-smbspool tries to get the URI from argv[0]\&. If argv[0] contains the
-name of the program then it looks in the DEVICE_URI environment variable\&.
-.PP 
-Programs using the exec(2) functions can pass the URI in argv[0],
-while shell scripts must set the DEVICE_URI environment variable prior to
-running smbspool\&.
-.PP 
-.SH "OPTIONS" 
-.PP 
-The job argument (argv[1]) contains the job ID number and is presently
-not used by smbspool\&.
-.PP 
-The user argument (argv[2]) contains the print user\'s name and is
-presently not used by smbspool\&.
-.PP 
-The title argument (argv[3]) contains the job title string and is
-passed as the remote file name when sending the print job\&.
-.PP 
-The copies argument (argv[4]) contains the number of copies to be
-printed of the named file\&. If no filename is provided than this argument is
-not used by smbspool\&.
-.PP 
-The options argument (argv[5]) contains the print options in a single
-string and is presently not used by smbspool\&.
-.PP 
-The filename argument (argv[6]) contains the name of the file to print\&.
-If this argument is not specified then the print file is read from the
-standard input\&.
-.PP 
-.SH "VERSION" 
-.PP 
-This man page is correct for version 2\&.0 of the Samba suite\&.
-.PP 
-.SH "SEE ALSO" 
-\fBsmbd (8)\fP
-.PP 
-.SH "AUTHOR" 
-.PP 
-smbspool was written by Michael Sweet at Easy Software Products\&.
-.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 
-See samba (7) to find out how to get a full
-list of contributors and details on how to submit bug reports,
-comments etc\&.
+.PP
+smbspool tries to get the URI from argv[0]. If argv[0] 
+contains the name of the program then it looks in the \fI DEVICE_URI\fR environment variable.
+.PP
+.PP
+Programs using the \fBexec(2)\fR functions can 
+pass the URI in argv[0], while shell scripts must set the 
+\fIDEVICE_URI\fR environment variable prior to
+running smbspool.
+.PP
+.SH "OPTIONS"
+.TP 0.2i
+\(bu
+The job argument (argv[1]) contains the 
+job ID number and is presently not used by smbspool.
+.TP 0.2i
+\(bu
+The user argument (argv[2]) contains the 
+print user's name and is presently not used by smbspool.
+.TP 0.2i
+\(bu
+The title argument (argv[3]) contains the 
+job title string and is passed as the remote file name 
+when sending the print job.
+.TP 0.2i
+\(bu
+The copies argument (argv[4]) contains 
+the number of copies to be printed of the named file. If 
+no filename is provided than this argument is not used by 
+smbspool.
+.TP 0.2i
+\(bu
+The options argument (argv[5]) contains 
+the print options in a single string and is presently 
+not used by smbspool.
+.TP 0.2i
+\(bu
+The filename argument (argv[6]) contains the 
+name of the file to print. If this argument is not specified 
+then the print file is read from the standard input.
+.SH "VERSION"
+.PP
+This man page is correct for version 2.2 of 
+the Samba suite.
+.SH "SEE ALSO"
+.PP
+\fBnmbd(8)\fR <URL:nmbd.8.html>, 
+samba(7) <URL:samba.7.html>, and smb.conf(5) <URL:smb.conf.5.html>
+.SH "AUTHOR"
+.PP
+\fBsmbspool\fR was written by Michael Sweet 
+at Easy Software Products.
+.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