- Patch from John to update PDC-HOWTO, add ServerType and CUPS (not finished yet)

- Regenerate docs
- Update docs-status
(This used to be commit adbb714ade8ab6f4e9b5d80f0f85041746c0edf1)

1 files changed, 11 insertions, 3 deletions

diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 23dfcbd50f..ced5057fcd 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" "18 March 2003" "" ""
+.TH "SMB.CONF" "5" "24 March 2003" "" ""
 
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
@@ -661,6 +661,9 @@ each parameter for details.  Note that some are synonyms.
 \fIldap admin dn\fR
 .TP 0.2i
 \(bu
+\fIldap del only sam attr\fR
+.TP 0.2i
+\(bu
 \fIldap filter\fR
 .TP 0.2i
 \(bu
@@ -3344,8 +3347,13 @@ admin dn\fR is used in conjunction with the admin dn password
 stored in the \fIprivate/secrets.tdb\fR file.  See the
 \fBsmbpasswd\fR(8) man page for more information on how 
 to accmplish this.
+.TP
+\fB>ldap del only sam attr (G)\fR
+This parameter specifies whether a delete
+operation in the ldapsam deletes only the Samba-specific
+attributes or the complete LDAP entry.
 
-Default : \fBnone\fR
+Default : \fBldap del only sam attr = yes\fR
 .TP
 \fB>ldap filter (G)\fR
 This parameter specifies the RFC 2254 compliant LDAP search filter.
@@ -5119,7 +5127,7 @@ parameter \fIname
 resolve order\fR and so may resolved
 by any method and order described in that parameter.
 
-The password server much be a machine capable of using 
+The password server must be a machine capable of using 
 the "LM1.2X002" or the "NT LM 0.12" protocol, and it must be in 
 user level security mode.