syncing docs with HEAD

(This used to be commit d8fe70c3b4be548244e9d7b7ea533e64232df001)

4 files changed, 13 insertions, 7 deletions

diff --git a/docs/docbook/projdoc/Diagnosis.sgml b/docs/docbook/projdoc/Diagnosis.sgml
index 8c407375ed..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.1.2.3 2002/11/22 00:32:23 tpot Exp $</pubdate>
+	<pubdate>Wed Jan 15</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 a66df0c767..f294ddd1ff 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-2_2-howto.html">Samba-PDC-LDAP-HOWTO</ulink>
+	<listitem><para>The <ulink url="http://www.unav.es/cti/ldap-smb/ldap-smb-3-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 05262ebe10..59a134a15f 100644
--- a/docs/docbook/projdoc/pdb_mysql.sgml
+++ b/docs/docbook/projdoc/pdb_mysql.sgml
@@ -54,6 +54,14 @@ 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 286749289c..79cf6b20d2 100644
--- a/docs/docbook/projdoc/samba-doc.sgml
+++ b/docs/docbook/projdoc/samba-doc.sgml
@@ -22,7 +22,6 @@
 <!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">
@@ -43,7 +42,7 @@
 <title>Abstract</title>
 
 <para>
-<emphasis>Last Update</emphasis> : $Date: 2002/11/22 00:32:23 $
+<emphasis>Last Update</emphasis> : $Date: 2003/01/15 22:29:21 $
 </para>
 
 <para>
@@ -80,7 +79,6 @@ PLEASE read this.</para>
 </partintro>
 &UNIX-INSTALL;
 &BROWSING;
-&oplocks;
 &BROWSING-Quick;
 &ENCRYPTION;
 </part>