6 files changed, 9 insertions, 70 deletions
diff --git a/docs/docbook/global.ent b/docs/docbook/global.ent
index 46745c2773..d88c489a4a 100644
--- a/docs/docbook/global.ent
+++ b/docs/docbook/global.ent
@@ -31,58 +31,3 @@
 <!-- Misc -->
 <!ENTITY samba.pub.cvshost 'pserver.samba.org'>
 
-<!ENTITY stdarg.debuglevel '
-<varlistentry>
-<term>-d|--debug=debuglevel</term>
-<listitem>
-<para><replaceable>debuglevel</replaceable> is an integer 
-from 0 to 10.  The default value if this parameter is 
-not specified is zero.</para>
-
-<para>The higher this value, the more detail will be 
-logged to the log files about the activities of the 
-server. At level 0, only critical errors and serious 
-warnings will be logged. Level 1 is a reasonable level for
-day to day running - it generates a small amount of 
-information about operations carried out.</para>
-
-<para>Levels above 1 will generate considerable 
-amounts of log data, and should only be used when 
-investigating a problem. Levels above 3 are designed for 
-use only by developers and generate HUGE amounts of log
-data, most of which is extremely cryptic.</para>
-
-<para>Note that specifying this parameter here will 
-override the <ulink url="smb.conf.5.html#loglevel">log
-level</ulink> parameter in the <ulink url="smb.conf.5.html">
-<filename>smb.conf(5)</filename></ulink> file.</para>
-</listitem>
-</varlistentry>'>
-
-<!ENTITY stdarg.help '
-<varlistentry>
-<term>-h|--help</term>
-<listitem><para>Print a summary of command line options.
-</para></listitem>
-</varlistentry>'>
-
-<!ENTITY stdarg.configfile '
-<varlistentry>
-<term>-s &lt;configuration file&gt;</term>
-<listitem><para>The file specified contains the 
-configuration details required by the server.  The 
-information in this file includes server-specific
-information such as what printcap file to use, as well 
-as descriptions of all the services that the server is 
-to provide. See <ulink url="smb.conf.5.html"><filename>
-smb.conf(5)</filename></ulink> for more information.
-The default configuration file name is determined at 
-compile time.</para></listitem>
-</varlistentry>'>
-
-<!ENTITY stdarg.version '
-<varlistentry>
-<term>-v</term>
-<listitem><para>Prints the version number for 
-<command>smbd</command>.</para></listitem>
-</varlistentry>'>
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 17a1ddf77e..252378733f 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -5145,9 +5145,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/projdoc/Diagnosis.sgml b/docs/docbook/projdoc/Diagnosis.sgml
index b2d7abb656..8c407375ed 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>$Id: Diagnosis.sgml,v 1.1.2.3 2002/11/22 00:32:23 tpot Exp $</pubdate>
 </chapterinfo>
 
 <title>Diagnosing your samba server</title>
diff --git a/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml b/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
index f294ddd1ff..a66df0c767 100644
--- a/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
+++ b/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
@@ -2,12 +2,12 @@
 
 <chapterinfo>
 	<author>
-		<firstname>Gerald (Jerry)</firstname><surname>Carter</surname>
+		<firstname>Gerald (Jerry)></firstname><surname>Carter</surname>
 		<affiliation>
 			<orgname>Samba Team</orgname>
 			<address><email>jerry@samba.org</email></address>
 		</affiliation>
-		<firstname>Olivier (lem)</firstname><surname>Lemaire</surname>
+		<firstname>Olivier (lem)></firstname><surname>Lemaire</surname>
 		<affiliation>
 			<orgname>IDEALX</orgname>
 			<address><email>olem@IDEALX.org</email></address>
@@ -47,7 +47,7 @@ Two additional Samba resources which may prove to be helpful are
 </para>
 
 <itemizedlist>
-	<listitem><para>The <ulink url="http://www.unav.es/cti/ldap-smb/ldap-smb-3-howto.html">Samba-PDC-LDAP-HOWTO</ulink>
+	<listitem><para>The <ulink url="http://www.unav.es/cti/ldap-smb/ldap-smb-2_2-howto.html">Samba-PDC-LDAP-HOWTO</ulink>
 	maintained by Ignacio Coupeau.</para></listitem>
 
 	<listitem><para>The NT migration scripts from <ulink url="http://samba.idealx.org/">IDEALX</ulink> that are
diff --git a/docs/docbook/projdoc/pdb_mysql.sgml b/docs/docbook/projdoc/pdb_mysql.sgml
index 59a134a15f..05262ebe10 100644
--- a/docs/docbook/projdoc/pdb_mysql.sgml
+++ b/docs/docbook/projdoc/pdb_mysql.sgml
@@ -54,14 +54,6 @@ identifier:mysql port                     - defaults to 3306
 identifier:table                          - Name of the table containing users
 </programlisting></para>
 
-<para>
-<emphasis>
-WARNING: since the password for the mysql user is stored in the 
-smb.conf file, you should make the the smb.conf file 
-readable only to the user that runs samba. This is considered a security 
-bug and will be fixed soon.</emphasis>
-</para>
-
 <para>Names of the columns in this table(I've added column types those columns should have first):</para>
 
 <para><programlisting>
diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.sgml
index c4360c0b39..286749289c 100644
--- a/docs/docbook/projdoc/samba-doc.sgml
+++ b/docs/docbook/projdoc/samba-doc.sgml
@@ -22,6 +22,7 @@
 <!ENTITY Portability SYSTEM "Portability.sgml">
 <!ENTITY Other-Clients SYSTEM "Other-Clients.sgml">
 <!ENTITY ADS-HOWTO SYSTEM "ADS-HOWTO.sgml">
+<!ENTITY oplocks SYSTEM "oplocks.sgml">
 <!ENTITY pdb-mysql SYSTEM "pdb_mysql.sgml">
 <!ENTITY pdb-xml SYSTEM "pdb_xml.sgml">
 <!ENTITY VFS SYSTEM "VFS.sgml">
@@ -42,7 +43,7 @@
 <title>Abstract</title>
 
 <para>
-<emphasis>Last Update</emphasis> : $Date: 2002/12/24 01:41:10 $
+<emphasis>Last Update</emphasis> : $Date: 2002/11/22 00:32:23 $
 </para>
 
 <para>
@@ -79,6 +80,7 @@ PLEASE read this.</para>
 </partintro>
 &UNIX-INSTALL;
 &BROWSING;
+&oplocks;
 &BROWSING-Quick;
 &ENCRYPTION;
 </part>