* 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)

3 files changed, 51 insertions, 10 deletions

diff --git a/docs/manpages/findsmb.1 b/docs/manpages/findsmb.1
index 7bd2e53a72..bb07292623 100644
--- a/docs/manpages/findsmb.1
+++ b/docs/manpages/findsmb.1
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "FINDSMB" "1" "05 November 2002" "" ""
+.TH "FINDSMB" "1" "15 January 2003" "" ""
 .SH NAME
 findsmb \- list info about machines that respond to SMB  name queries on a subnet
 .SH SYNOPSIS
@@ -20,6 +20,14 @@ on a subnet that respond to SMB  name query requests.
 It uses \fB nmblookup(1)\fR to obtain this information.
 .SH "OPTIONS"
 .TP
+\fB-r\fR
+Controls whether \fBfindsmb\fR 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, \fBnmblookup\fR
+will be called with -B option.
+.TP
 \fBsubnet broadcast address\fR
 Without this option, \fBfindsmb
 \fR will probe the subnet of the machine where 
@@ -41,14 +49,16 @@ Machines that are running Windows, Windows 95 or Windows 98 will
 not show any information about the operating system or server 
 version.
 .PP
-The command must be run on a system without \fBnmbd\fR running. 
+The command with -r option
+must be run on a system without \fBnmbd\fR running. 
 If \fBnmbd\fR 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. 
+the command must be run as root and with -r
+option on a machine without \fBnmbd\fR running.
 .PP
-For example, running \fBfindsmb\fR on a machine 
-without \fBnmbd\fR running would yield output similar
+For example, running \fBfindsmb\fR without 
+-r option set would yield output similar
 to the following
 
 .nf
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index a5330e50b6..8010871d66 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMB.CONF" "5" "29 December 2002" "" ""
+.TH "SMB.CONF" "5" "15 January 2003" "" ""
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
 .SH "SYNOPSIS"
@@ -673,6 +673,12 @@ each parameter for details.  Note that some are synonyms.
 \fIldap filter\fR
 .TP 0.2i
 \(bu
+\fIldap port\fR
+.TP 0.2i
+\(bu
+\fIldap server\fR
+.TP 0.2i
+\(bu
 \fIldap ssl\fR
 .TP 0.2i
 \(bu
@@ -3388,6 +3394,31 @@ objectclass.  Note that this filter should only return one entry.
 
 Default : \fBldap filter = (&(uid=%u)(objectclass=sambaAccount))\fR
 .TP
+\fBldap port (G)\fR
+This parameter is only available if Samba has been
+configure to include the \fB--with-ldapsam\fR option
+at compile time.
+
+This option is used to control the tcp port number used to contact
+the \fIldap server\fR.
+The default is to use the stand LDAPS port 636.
+
+See Also: ldap ssl
+
+Default : \fBldap port = 636 ; if ldap ssl = on\fR
+
+Default : \fBldap port = 389 ; if ldap ssl = off\fR
+.TP
+\fBldap server (G)\fR
+This parameter is only available if Samba has been
+configure to include the \fB--with-ldapsam\fR option
+at compile time.
+
+This parameter should contain the FQDN of the ldap directory
+server which should be queried to locate user account information.
+
+Default : \fBldap server = localhost\fR
+.TP
 \fBldap ssl (G)\fR
 This option is used to define whether or not Samba should
 use SSL when connecting to the ldap server
@@ -4725,9 +4756,9 @@ This is a boolean option that controls whether
 connections with usernames not in the \fIuser\fR 
 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 \fIuser\fR list and is only really
-useful in shave level
+useful in share level
 security.
 
 Note that this also means Samba won't try to deduce 
diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8
index 811bb60575..3e0f1d83cc 100644
--- a/docs/manpages/smbd.8
+++ b/docs/manpages/smbd.8
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBD" "8" "03 January 2003" "" ""
+.TH "SMBD" "8" "15 January 2003" "" ""
 .SH NAME
 smbd \- server to provide SMB/CIFS services to clients
 .SH SYNOPSIS
@@ -84,7 +84,7 @@ server is executed on the command line of a shell. Setting this
 parameter negates the implicit deamon mode when run from the
 command line. \fBsmbd\fR also logs to standard
 output, as if the \fB-S\fR parameter had been
-given. 
+given.
 .TP
 \fB-h\fR
 Prints the help information (usage)