Minor fixes including those from ITS#1283

diff --git a/doc/guide/admin/install.sdf b/doc/guide/admin/install.sdf
index ebb7bc42c4bc21151b76d9625abce7a116fc92a2..9c301a26d72bb62b01189de89a52c6f11310b909 100644 (file)
--- a/doc/guide/admin/install.sdf
+++ b/doc/guide/admin/install.sdf
@@ -118,14 +118,14 @@ 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.
 
-Your operating system may provide one of these two packages in
-the base system or as an optional software component.  You may
-need may need to obtain the software and install it yourself.
+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
 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.1, is recommended. 
+the latest release, version 3.3, is recommended. 
 
 {{PRD:GDBM}} is available from {{ORG:FSF}}'s download site
 {{URL: ftp://ftp.gnu.org/pub/gnu/gdbm/}}.

diff --git a/doc/guide/admin/schema.sdf b/doc/guide/admin/schema.sdf
index 5927c5ee4eccf098e69df6f82f53853553407a2d..62e9e9b32af1a841ed74e8134830b02fef88bbbb 100644 (file)
--- a/doc/guide/admin/schema.sdf
+++ b/doc/guide/admin/schema.sdf
@@ -37,7 +37,7 @@ openldap.schema               OpenLDAP Project (experimental)
 !endblock
 
 To use any of these schema files, you only need to include the
-the desired file in the global definitions portion of your
+desired file in the global definitions portion of your
 {{slapd.conf}}(5) file.  For example:
 
 >      # include schema

diff --git a/doc/guide/admin/slapdconfig.sdf b/doc/guide/admin/slapdconfig.sdf
index c502f45cbe84f19306f0350fb39d81fd68b1b92c..4ea4f212b7ffe18ac93821f25fa1f4fa9105b5fd 100644 (file)
--- a/doc/guide/admin/slapdconfig.sdf
+++ b/doc/guide/admin/slapdconfig.sdf
@@ -475,7 +475,6 @@ This directive specifies the indexes to maintain for the given
 attribute. If only an {{EX:<attrlist>}} is given, the default
 indexes are maintained.
 
-
 \Example:
 
 >      index default pres,eq
@@ -491,6 +490,13 @@ be maintained for {{EX:cn}} and {{EX:sn}} attribute types.  The
 fourth line causes an equality index for the {{EX:objectClass}}
 attribute type.
 
+By default, no indices are maintained.  It is generally advised
+that minimally an equality index upon objectClass be maintained.
+
+>      index objectClass eq
+
+
+
 H4: mode <integer>
 
 This directive specifies the file protection mode that newly
@@ -861,12 +867,12 @@ Lines 9 and 10 identify the database "super user" entry and associated
 password. This entry is not subject to access control or size or
 time limit restrictions.
 
-Lines 11 through 18 are for replication. Line 11 specifies the
+Lines 11 through 18 are for replication. Line 12 specifies the
 replication log file (where changes to the database are logged \-
-this file is written by slapd and read by slurpd). Lines 12 through
-14 specify the hostname and port for a replicated host, the DN to
+this file is written by slapd and read by slurpd). Lines 13 through
+15 specify the hostname and port for a replicated host, the DN to
 bind as when performing updates, the bind method (simple) and the
-credentials (password) for the binddn. Lines 15 through 18 specify
+credentials (password) for the binddn. Lines 16 through 18 specify
 a second replication site.  See the {{SECT:Replication with slurpd}}
 chapter for more information on these directives.
 
@@ -884,13 +890,14 @@ entry, but may be read by all users (authenticated or not).
 
 The next section of the example configuration file defines another
 LDBM database. This one handles queries involving the
-{{EX:dc=example,dc=net}} subtree.  Note that without line 38, the
-read access would be allowed due to the global access rule at line
-4.
+{{EX:dc=example,dc=net}} subtree but is managed by the same entity
+as the first database.  Note that without line 39, the read access
+would be allowed due to the global access rule at line 4.
 
 E: 33. # ldbm definition for example.net
 E: 34. database ldbm
 E: 35. suffix "dc=example,dc=net"
 E: 36. directory /usr/local/var/ldbm-example-net
 E: 37. rootdn "cn=Manager,dc=example,dc=com"
-E: 38. access to * by users read
+E: 38. index objectClass eq
+E: 39. access to * by users read