* merge fixes for SGML syntax errors (does no one ever regenerate the docs?)

* regenerate the docs
* add some files from SAMBA_3_0
(This used to be commit 1af74785f334bd84b2d62e7fc2975f9477386acb)

6 files changed, 9 insertions, 6 deletions

diff --git a/docs/docbook/manpages/findsmb.1.sgml b/docs/docbook/manpages/findsmb.1.sgml
index a246b162b1..0b3bbca017 100644
--- a/docs/docbook/manpages/findsmb.1.sgml
+++ b/docs/docbook/manpages/findsmb.1.sgml
@@ -46,7 +46,7 @@
 		registered of the remote machine. This option is disabled by default
 		because it is specific to Windows 95 and Windows 95 machines only. 
 		If set, <ulink url="nmblookup.1.html"><command>nmblookup</command></ulink>
-		will be called with <constant>-B<constant> option.</para></listitem>
+		will be called with <constant>-B</constant> option.</para></listitem>
 		</varlistentry>
 		<varlistentry>
 		<term>subnet broadcast address</term>
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 8bafafd8b2..01f767d256 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -5186,9 +5186,9 @@
 		connections with usernames not in the <parameter>user</parameter> 
 		list will be allowed. By default this option is disabled so that a 
 		client can supply a username to be used by the server.  Enabling
-		this parameter will force the server to only user the login 
+		this parameter will force the server to only use the login 
 		names from the <parameter>user</parameter> list and is only really
-		useful in <link linkend="SECURITYEQUALSSHARE">shave level</link>
+		useful in <link linkend="SECURITYEQUALSSHARE">share level</link>
 		security.</para>
 
 		<para>Note that this also means Samba won't try to deduce 
diff --git a/docs/docbook/manpages/smbd.8.sgml b/docs/docbook/manpages/smbd.8.sgml
index a679af6718..9fb80901be 100644
--- a/docs/docbook/manpages/smbd.8.sgml
+++ b/docs/docbook/manpages/smbd.8.sgml
@@ -118,7 +118,7 @@
 		parameter negates the implicit deamon mode when run from the
 		command line. <command>smbd</command> also logs to standard
 		output, as if the <command>-S</command> parameter had been
-		given. 
+		given.
 		</para></listitem>
 		</varlistentry>
 		
diff --git a/docs/docbook/projdoc/Browsing-Quickguide.sgml b/docs/docbook/projdoc/Browsing-Quickguide.sgml
index deb431020d..8ecc795966 100644
--- a/docs/docbook/projdoc/Browsing-Quickguide.sgml
+++ b/docs/docbook/projdoc/Browsing-Quickguide.sgml
@@ -108,8 +108,9 @@ NetBIOS machine names will end up looking like
 they belong to that workgroup, this may cause
 name resolution problems and should be avoided.
 </para></listitem>
-
+</varlistentry>
 </variablelist>
+</para>
 
 </sect1>
 
@@ -276,5 +277,6 @@ The default is:
 where "host" refers the the native methods used by the Unix system
 to implement the gethostbyname() function call. This is normally
 controlled by <filename>/etc/host.conf</filename>, <filename>/etc/nsswitch.conf</filename> and <filename>/etc/resolv.conf</filename>.
+</para>
 </sect1>
 </chapter>
diff --git a/docs/docbook/projdoc/Diagnosis.sgml b/docs/docbook/projdoc/Diagnosis.sgml
index b2d7abb656..8c1b784433 100644
--- a/docs/docbook/projdoc/Diagnosis.sgml
+++ b/docs/docbook/projdoc/Diagnosis.sgml
@@ -14,7 +14,7 @@
 			<address><email>jelmer@samba.org</email></address>
 		</affiliation>
 	</author>
-	<pubdate>$Id: Diagnosis.sgml,v 1.3 2002/11/02 00:20:29 jelmer Exp $</pubdate>
+	<pubdate>Wed Jan 15</pubdate>
 </chapterinfo>
 
 <title>Diagnosing your samba server</title>
diff --git a/docs/docbook/projdoc/Portability.sgml b/docs/docbook/projdoc/Portability.sgml
index 0ae720af53..afafacc5e4 100644
--- a/docs/docbook/projdoc/Portability.sgml
+++ b/docs/docbook/projdoc/Portability.sgml
@@ -174,4 +174,5 @@ is the master browse list holder and who is the master browser.
 Corrective Action:	Delete the entry after the word loopback
 	in the line starting 127.0.0.1
 </para>
+</sect1>
 </chapter>