syncing docs with HEAD

(This used to be commit d8fe70c3b4be548244e9d7b7ea533e64232df001)

6 files changed, 83 insertions, 11 deletions

diff --git a/docs/docbook/global.ent b/docs/docbook/global.ent
index d88c489a4a..46745c2773 100644
--- a/docs/docbook/global.ent
+++ b/docs/docbook/global.ent
@@ -31,3 +31,58 @@
 <!-- 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/findsmb.1.sgml b/docs/docbook/manpages/findsmb.1.sgml
index fb953b9f25..a246b162b1 100644
--- a/docs/docbook/manpages/findsmb.1.sgml
+++ b/docs/docbook/manpages/findsmb.1.sgml
@@ -40,6 +40,15 @@
 
 	<variablelist>
 		<varlistentry>
+		<term>-r</term>
+		<listitem><para>Controls whether <command>findsmb</command> takes
+		bugs in Windows95 into account when trying to find a Netbios name
+		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>
+		</varlistentry>
+		<varlistentry>
 		<term>subnet broadcast address</term>
 		<listitem><para>Without this option, <command>findsmb
 		</command> will probe the subnet of the machine where 
@@ -66,15 +75,17 @@
 	not show any information about the operating system or server 
 	version.</para>
 
-	<para>The command must be run on a system without <ulink
+	<para>The command with <constant>-r</constant> option
+	must be run on a system without <ulink
 	url="nmbd.8.html"><command>nmbd</command></ulink> running. 
 	If <command>nmbd</command> is running on the system, you will 
 	only  get the IP address and the DNS name of the machine. To 
 	get proper responses  from Windows 95 and Windows 98 machines, 
-	the command must be run as root. </para>
+	the command must be run as root and with <constant>-r</constant>
+	option on a machine without <command>nmbd</command> running.</para>
 
-	<para>For example, running <command>findsmb</command> on a machine 
-	without <command>nmbd</command> running would yield output similar
+	<para>For example, running <command>findsmb</command> without 
+	<constant>-r</constant> option set would yield output similar
 	to the following</para>
 
 	<screen><computeroutput>
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>