*** empty log message ***

diff --git a/doc/guide/admin/install.sdf b/doc/guide/admin/install.sdf
index 766cab9f2d3d562516c8c5cf95ac893858bc95fb..515b94e627f2b39a8b6afe65d51225bb7c4ded2a 100644 (file)
--- a/doc/guide/admin/install.sdf
+++ b/doc/guide/admin/install.sdf
@@ -113,19 +113,20 @@ H3: Database Software
 
 OpenLDAP's {{slapd}}(8) primary database backend, {{TERM:LDBM}},
 requires a compatible database package for entry storage.  LDBM
-is compatible with {{ORG[expand]Sleepy}}'s {{PRD:BerkeleyDB}} (recommended)
+is compatible with {{ORG[expand]Sleepycat}}'s {{PRD:BerkeleyDB}} (recommended)
 or the {{ORG[expand]FSF}}'s {{PRD:GNU}} Database Manager ({{PRD:GDBM}}).
 If neither of these packages are available at configure time,
-you will not be able build {{slapd}}(8) with primary database backend.
+you will not be able build {{slapd}}(8) with a primary database backend.
 
 Your operating system may provide one or both of these packages in
 the base system or as an optional software component.  If not,
 you'll have to obtain and install one of these packages yourself.
 
-{{PRD:BerkeleyDB}} is available from {{ORG[expand]Sleepy}}'s
+{{PRD:BerkeleyDB}} is available from {{ORG[expand]Sleepycat}}'s
 download page {{URL: http://www.sleepycat.com/download.html}}.
 There are several versions available.  At the time of this writing,
-the latest release, version 3.3, is recommended. 
+the latest release, version 4.0, is recommended. This package
+is required if you wish to use the {{TERM:BDB}} database backend.
 
 {{PRD:GDBM}} is available from {{ORG:FSF}}'s download site
 {{URL: ftp://ftp.gnu.org/pub/gnu/gdbm/}}.

diff --git a/doc/guide/admin/intro.sdf b/doc/guide/admin/intro.sdf
index a62e91af1d8fa25b4e2182f69256ef3f9d130ed2..d5e9589da8ec6fe9bd042b79bcd015b2c1bde2a7 100644 (file)
--- a/doc/guide/admin/intro.sdf
+++ b/doc/guide/admin/intro.sdf
@@ -188,7 +188,7 @@ with slurpd}} chapter of this document for information regarding
 replication.
 
 
-H2: What the difference between LDAPv2 and LDAPv3?
+H2: What is the difference between LDAPv2 and LDAPv3?
 
 LDAPv3 was developed in late 1990's to replace LDAPv2.
 LDAPv3 adds the following features to LDAP:
@@ -245,7 +245,9 @@ different backend databases you can choose from. They include
 {{TERM:LDBM}}, a high-performance disk-based embedded database;
 SHELL, a database interface to arbitrary shell scripts; and PASSWD,
 a simple password file database.  LDBM utilizes either {{PRD:BerkeleyDB}}
-or {{PRD:GDBM}}.
+or {{PRD:GDBM}}. There is also a new {{TERM:BDB}} backend database
+which uses BerkeleyDB directly, instead of the generic API that
+LDBM uses, and delivers even greater performance.
 
 {{B:Multiple database instances}}: {{slapd}} can be configured to
 serve multiple databases at the same time. This means that a single

diff --git a/doc/guide/admin/schema.sdf b/doc/guide/admin/schema.sdf
index 1a6a81767c058f4ec03217cafc5f600b5bb40c34..7028cafbb2b1254864303c8bc8e69ca8752da36a 100644 (file)
--- a/doc/guide/admin/schema.sdf
+++ b/doc/guide/admin/schema.sdf
@@ -477,9 +477,9 @@ E:  objectIdentifier <name> { <oid> | <name>[:<suffix>] }
 The following demonstrates definition of a set of OID macros
 and their use in defining schema elements:
 
->      objectIdentifier myOID  1.1
->      objectIdentifier mySNMP myOrgOID:1
->      objectIdentifier myLDAP myOrgOID:2
+>      objectIdentifier myOrgOID       1.1
+>      objectIdentifier myOrgSNMP      myOrgOID:1
+>      objectIdentifier myOrgLDAP      myOrgOID:2
 >      objectIdentifier myAttributeType        myOrgLDAP:1
 >      objectIdentifier myObjectClass  myOrgLDAP:2
 >      attributetype ( myAttributeType:3 NAME 'myPhotoURI'
@@ -488,5 +488,5 @@ and their use in defining schema elements:
 >      objectclass ( myObjectClass:1 NAME 'myPhotoObject'
 >              DESC 'mixin myPhoto'
 >              AUXILIARY
->              MAY myPhoto )
+>              MAY myPhotoURI )
 

diff --git a/doc/guide/admin/tls.sdf b/doc/guide/admin/tls.sdf
index 62686d3d9e0138c5e1ae2b43ee85ed166a2fff23..51d5c84906b3b794386d0ccf0cf03692f8812cc8 100644 (file)
--- a/doc/guide/admin/tls.sdf
+++ b/doc/guide/admin/tls.sdf
@@ -8,3 +8,10 @@ Transport Layer Security {{TERM:TLS}} framework to provide
 integrity and confidentiality protections and to support
 LDAP authentication via SASL EXTERNAL. 
 
+TLS uses {{TERM:X.509}} certificates to carry client and server
+identities. All servers are required to have valid certificates,
+whereas client certificates are optional. Clients must have a
+valid certificate in order to authenticate using the SASL EXTERNAL
+mechanism.
+
+