more updates.....

(This used to be commit ffe442b6b3fdf158863aead6611b554f68fcaa6f)

3 files changed, 410 insertions, 184 deletions

diff --git a/docs/docbook/manpages/lmhosts.5.sgml b/docs/docbook/manpages/lmhosts.5.sgml
new file mode 100644
index 0000000000..a003569698
--- /dev/null
+++ b/docs/docbook/manpages/lmhosts.5.sgml
@@ -0,0 +1,114 @@
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="findsmb">
+
+<refmeta>
+	<refentrytitle>lmhosts</refentrytitle>
+	<manvolnum>5</manvolnum>
+</refmeta>
+
+
+<refnamediv>
+	<refname>lmhosts</refname>
+	<refpurpose>The Samba NetBIOS hosts file</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<para><filename>lmhosts</filename> is the <ulink url="samba.7.html">
+	Samba</ulink> NetBIOS name to IP address mapping file.</para> 
+</refsynopsisdiv>
+
+<refsect1>
+	<title>DESCRIPTION</title>
+	
+	<para>This file is part of the <<ulink url="samba.7.html">
+	Samba</ulink> suite.</para>
+
+	<para><filename>lmhosts</filename> is the <emphasis>Samba
+	</emphasis> NetBIOS name to IP address mapping file.  It 
+	is very similar to the <filename>/etc/hosts</filename> file 
+	format, except that the hostname component must correspond 
+	to the NetBIOS naming format.</para>
+</refsect1>
+
+<refsect1>
+	<title>FILE FORMAT</title>
+	<para>It is an ASCII file containing one line for NetBIOS name. 
+	The two fields on each line are separated from each other by 
+	white space. Any entry beginning with '#' is ignored. Each line 
+	in the lmhosts file contains the following information :</para>
+
+	<itemizedlist>
+		<listitem><para>IP Address - in dotted decimal format.</para>
+		</listitem>
+
+		<listitem><para>NetBIOS Name - This name format is a 
+		maximum fifteen character host name, with an optional 
+		trailing '#' character followed by the NetBIOS name type 
+		as two hexadecimal digits.</para>
+
+		<para>If the trailing '#' is omitted then the given IP 
+		address will be returned for all names that match the given 
+		name, whatever the NetBIOS name type in the lookup.</para>
+		</listitem>
+	</itemizedlist>
+
+	<para>An example follows :</para>
+	
+	<para><programlisting>
+#
+#Sample Samba lmhosts file.
+#
+192.9.200.1	TESTPC
+192.9.200.20	NTSERVER#20
+192.9.200.21	SAMBASERVER
+	</programlisting></para>
+	
+	<para>Contains three IP to NetBIOS name mappings. The first 
+	and third will be returned for any queries for the names "TESTPC" 
+	and "SAMBASERVER" respectively, whatever the type component of 
+	the NetBIOS name requested.</para>
+
+	<para>The second mapping will be returned only when the "0x20" name 
+	type for a name "NTSERVER" is queried. Any other name type will not 
+	be resolved.</para>
+
+	<para>The default location of the <filename>lmhosts</filename> file 
+	is in the same directory as the <ulink url="smb.conf.5.html"> 		
+	smb.conf(5)></ulink> file.</para>
+	
+</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="smbclient.1.html"><command>smbclient(1)
+	</command></ulink>, <ulink url="smb.conf.5.html#NAMERESOLVEORDER">
+	smb.conf(5)</ulink>, and <ulink url="smbpasswd.8.html"><command>
+	smbpasswd(8)</command></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/lmhosts.5.html b/docs/htmldocs/lmhosts.5.html
index af88b4aded..4d66e95b7a 100644
--- a/docs/htmldocs/lmhosts.5.html
+++ b/docs/htmldocs/lmhosts.5.html
@@ -1,94 +1,206 @@
-
-
-
-
-
-
-<html><head><title>lmhosts (5)</title>
-
-<link rev="made" href="mailto:samba@samba.org">
-</head>
-<body>
-
-<hr>
-
-<h1>lmhosts (5)</h1>
-<h2>Samba</h2>
-<h2>23 Oct 1998</h2>
-
-
-    
-<p><a name="NAME"></a>
-<h2>NAME</h2>
-    lmhosts - The Samba NetBIOS hosts file
-<p><a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-     
-<p>lmhosts is the <strong>Samba</strong> NetBIOS name to IP address mapping file.
-<p><a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-    
-<p>This file is part of the <strong>Samba</strong> suite.
-<p><strong>lmhosts</strong> is the <strong>Samba</strong> NetBIOS name to IP address mapping file.  It
-is very similar to the <strong>/etc/hosts</strong> file format, except that the
-hostname component must correspond to the NetBIOS naming format.
-<p><a name="FILEFORMAT"></a>
-<h2>FILE FORMAT</h2>
-    
-<p>It is an ASCII file containing one line for NetBIOS name. The two
-fields on each line are separated from each other by white space. Any
-entry beginning with # is ignored. Each line in the lmhosts file
-contains the following information :
-<p><dl>
-<p><li > <strong>IP Address</strong> - in dotted decimal format.
-<p><li > <strong>NetBIOS Name</strong> - This name format is a maximum fifteen
-character host name, with an optional trailing <code>'#'</code> character
-followed by the NetBIOS name type as two hexadecimal digits.
-<p>If the trailing <code>'#'</code> is omitted then the given IP address will be
-returned for all names that match the given name, whatever the NetBIOS
-name type in the lookup.
-<p></dl>
-<p>An example follows :
-<p># <br>
-# Sample Samba lmhosts file. <br>
-# <br>
-192.9.200.1	TESTPC <br>
-192.9.200.20	NTSERVER#20 <br>
-192.9.200.21	SAMBASERVER <br>
-<p>Contains three IP to NetBIOS name mappings. The first and third will
-be returned for any queries for the names <code>"TESTPC"</code> and
-<code>"SAMBASERVER"</code> respectively, whatever the type component of the
-NetBIOS name requested.
-<p>The second mapping will be returned only when the <code>"0x20"</code> name type
-for a name <code>"NTSERVER"</code> is queried. Any other name type will not be
-resolved.
-<p>The default location of the <strong>lmhosts</strong> file is in the same directory
-as the <a href="smb.conf.html"><strong>smb.conf</strong></a> file.
-<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#nameresolveorder"><strong>smb.conf (5)</strong></a>,
-<a href="smbclient.1.html#minusR"><strong>smbclient (1)</strong></a>,
-<a href="smbpasswd.8.html#minusR"><strong>smbpasswd (8)</strong></a>, <a href="samba.7.html"><strong>samba (7)</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
+>lmhosts</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"
+>lmhosts</A
+></H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN5"
+></A
+><H2
+>Name</H2
+>lmhosts&nbsp;--&nbsp;The Samba NetBIOS hosts file</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN8"
+></A
+><H2
+>Synopsis</H2
+><P
+><TT
+CLASS="FILENAME"
+>lmhosts</TT
+> is the <A
+HREF="samba.7.html"
+TARGET="_top"
+>	Samba</A
+> NetBIOS name to IP address mapping file.</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN12"
+></A
+><H2
+>DESCRIPTION</H2
+><P
+>This file is part of the &#60;<A
+HREF="samba.7.html"
+TARGET="_top"
+>	Samba</A
+> suite.</P
+><P
+><TT
+CLASS="FILENAME"
+>lmhosts</TT
+> is the <I
+CLASS="EMPHASIS"
+>Samba
+	</I
+> NetBIOS name to IP address mapping file.  It 
+	is very similar to the <TT
+CLASS="FILENAME"
+>/etc/hosts</TT
+> file 
+	format, except that the hostname component must correspond 
+	to the NetBIOS naming format.</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN20"
+></A
+><H2
+>FILE FORMAT</H2
+><P
+>It is an ASCII file containing one line for NetBIOS name. 
+	The two fields on each line are separated from each other by 
+	white space. Any entry beginning with '#' is ignored. Each line 
+	in the lmhosts file contains the following information :</P
+><P
+></P
+><UL
+><LI
+><P
+>IP Address - in dotted decimal format.</P
+></LI
+><LI
+><P
+>NetBIOS Name - This name format is a 
+		maximum fifteen character host name, with an optional 
+		trailing '#' character followed by the NetBIOS name type 
+		as two hexadecimal digits.</P
+><P
+>If the trailing '#' is omitted then the given IP 
+		address will be returned for all names that match the given 
+		name, whatever the NetBIOS name type in the lookup.</P
+></LI
+></UL
+><P
+>An example follows :</P
+><P
+><PRE
+CLASS="PROGRAMLISTING"
+>#
+#Sample Samba lmhosts file.
+#
+192.9.200.1	TESTPC
+192.9.200.20	NTSERVER#20
+192.9.200.21	SAMBASERVER
+	</PRE
+></P
+><P
+>Contains three IP to NetBIOS name mappings. The first 
+	and third will be returned for any queries for the names "TESTPC" 
+	and "SAMBASERVER" respectively, whatever the type component of 
+	the NetBIOS name requested.</P
+><P
+>The second mapping will be returned only when the "0x20" name 
+	type for a name "NTSERVER" is queried. Any other name type will not 
+	be resolved.</P
+><P
+>The default location of the <TT
+CLASS="FILENAME"
+>lmhosts</TT
+> file 
+	is in the same directory as the <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+> 		
+	smb.conf(5)&#62;</A
+> file.</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN37"
+></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="AEN40"
+></A
+><H2
+>SEE ALSO</H2
+><P
+><A
+HREF="smbclient.1.html"
+TARGET="_top"
+><B
+CLASS="COMMAND"
+>smbclient(1)
+	</B
+></A
+>, <A
+HREF="smb.conf.5.html#NAMERESOLVEORDER"
+TARGET="_top"
+>	smb.conf(5)</A
+>, and <A
+HREF="smbpasswd.8.html"
+TARGET="_top"
+><B
+CLASS="COMMAND"
+>	smbpasswd(8)</B
+></A
+>
+	</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN48"
+></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/lmhosts.5 b/docs/manpages/lmhosts.5
index 3609ca256f..23a0ea3316 100644
--- a/docs/manpages/lmhosts.5
+++ b/docs/manpages/lmhosts.5
@@ -1,92 +1,92 @@
-.TH "lmhosts " "5" "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 "LMHOSTS" "5" "22 February 2001" "" ""
+.SH NAME
 lmhosts \- The Samba NetBIOS hosts file
-.PP 
-.SH "SYNOPSIS" 
-.PP 
-lmhosts is the \fBSamba\fP NetBIOS name to IP address mapping file\&.
-.PP 
-.SH "DESCRIPTION" 
-.PP 
-This file is part of the \fBSamba\fP suite\&.
-.PP 
-\fBlmhosts\fP is the \fBSamba\fP NetBIOS name to IP address mapping file\&.  It
-is very similar to the \fB/etc/hosts\fP file format, except that the
-hostname component must correspond to the NetBIOS naming format\&.
-.PP 
-.SH "FILE FORMAT" 
-.PP 
-It is an ASCII file containing one line for NetBIOS name\&. The two
-fields on each line are separated from each other by white space\&. Any
-entry beginning with # is ignored\&. Each line in the lmhosts file
-contains the following information :
-.PP 
-.IP 
-.IP o 
-\fBIP Address\fP - in dotted decimal format\&.
-.IP 
-.IP o 
-\fBNetBIOS Name\fP - This name format is a maximum fifteen
-character host name, with an optional trailing \f(CW\'#\'\fP character
-followed by the NetBIOS name type as two hexadecimal digits\&.
-.IP 
-If the trailing \f(CW\'#\'\fP is omitted then the given IP address will be
-returned for all names that match the given name, whatever the NetBIOS
-name type in the lookup\&.
-.IP 
-.PP 
+.SH SYNOPSIS
+.PP
+\fIlmhosts\fR is the  Samba <URL:samba.7.html> NetBIOS name to IP address mapping file.
+.SH "DESCRIPTION"
+.PP
+This file is part of the < Samba <URL:samba.7.html> suite.
+.PP
+\fIlmhosts\fR is the \fBSamba
+\fRNetBIOS name to IP address mapping file. It 
+is very similar to the \fI/etc/hosts\fR file 
+format, except that the hostname component must correspond 
+to the NetBIOS naming format.
+.SH "FILE FORMAT"
+.PP
+It is an ASCII file containing one line for NetBIOS name. 
+The two fields on each line are separated from each other by 
+white space. Any entry beginning with '#' is ignored. Each line 
+in the lmhosts file contains the following information :
+.TP 0.2i
+\(bu
+IP Address - in dotted decimal format.
+.TP 0.2i
+\(bu
+NetBIOS Name - This name format is a 
+maximum fifteen character host name, with an optional 
+trailing '#' character followed by the NetBIOS name type 
+as two hexadecimal digits.
+
+If the trailing '#' is omitted then the given IP 
+address will be returned for all names that match the given 
+name, whatever the NetBIOS name type in the lookup.
+.PP
 An example follows :
-.PP 
-# 
-.br 
-# Sample Samba lmhosts file\&. 
-.br 
-# 
-.br 
-192\&.9\&.200\&.1	TESTPC 
-.br 
-192\&.9\&.200\&.20	NTSERVER#20 
-.br 
-192\&.9\&.200\&.21	SAMBASERVER 
-.br 
-.PP 
-Contains three IP to NetBIOS name mappings\&. The first and third will
-be returned for any queries for the names \f(CW"TESTPC"\fP and
-\f(CW"SAMBASERVER"\fP respectively, whatever the type component of the
-NetBIOS name requested\&.
-.PP 
-The second mapping will be returned only when the \f(CW"0x20"\fP name type
-for a name \f(CW"NTSERVER"\fP is queried\&. Any other name type will not be
-resolved\&.
-.PP 
-The default location of the \fBlmhosts\fP file is in the same directory
-as the \fBsmb\&.conf\fP file\&.
-.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,
-\fBsmbclient (1)\fP,
-\fBsmbpasswd (8)\fP, \fBsamba (7)\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\&.
+.PP
+.PP
+.sp
+.nf
+#
+#Sample Samba lmhosts file.
+#
+192.9.200.1	TESTPC
+192.9.200.20	NTSERVER#20
+192.9.200.21	SAMBASERVER
+	
+.sp
+.fi
+.PP
+.PP
+Contains three IP to NetBIOS name mappings. The first 
+and third will be returned for any queries for the names "TESTPC" 
+and "SAMBASERVER" respectively, whatever the type component of 
+the NetBIOS name requested.
+.PP
+.PP
+The second mapping will be returned only when the "0x20" name 
+type for a name "NTSERVER" is queried. Any other name type will not 
+be resolved.
+.PP
+.PP
+The default location of the \fIlmhosts\fR file 
+is in the same directory as the  
+smb.conf(5)> <URL:smb.conf.5.html> file.
+.PP
+.SH "VERSION"
+.PP
+This man page is correct for version 2.2 of 
+the Samba suite.
+.SH "SEE ALSO"
+.PP
+\fBsmbclient(1)
+\fR <URL:smbclient.1.html>,  smb.conf(5) <URL:smb.conf.5.html#NAMERESOLVEORDER>, and \fB smbpasswd(8)\fR <URL:smbpasswd.8.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