Misc fixes, namely to indexing codes

diff --git a/doc/guide/admin/dbtools.sdf b/doc/guide/admin/dbtools.sdf
index 3ab47896e6c4eaf9fe71026063fa52bcdbfd8764..8776d57dd52efb90153aa12f593edc2a2a030897 100644 (file)
--- a/doc/guide/admin/dbtools.sdf
+++ b/doc/guide/admin/dbtools.sdf
@@ -83,6 +83,7 @@ could be used:
 >      index cn,sn,uid
 >      index objectClass pres,eq
 
+Note that not all index types are available with all attribute types.
 See {{SECT:The slapd Configuration File}} section for more details on
 this option. Once you have configured things to your liking, start up
 slapd, connect with your LDAP client, and start adding entries.  For
@@ -149,10 +150,10 @@ is done by one or more index options.
 
 For example:
 
->      index cn,sn,uid pres,eq,approx
+>      index cn,sn,uid pres,eq,sub
 >      index objectClass eq
 
-This would create presence, equality and approximate indexes for
+This would create presence, equality and substring indexes for
 the {{EX:cn}}, {{EX:sn}}, and {{EX:uid}} attributes and an equality
 index for the {{EX:objectClass}} attribute. See the configuration
 file section for more information on this option.

diff --git a/doc/guide/admin/referrals.sdf b/doc/guide/admin/referrals.sdf
index 855fbf4ce82f02b6b8f32076f436d22cbffb676f..9387e811935200a77dbe3b5f43e368d4842b94c6 100644 (file)
--- a/doc/guide/admin/referrals.sdf
+++ b/doc/guide/admin/referrals.sdf
@@ -44,7 +44,7 @@ object would be added to {{EX:a.example.net}}:
 >      objectClass: referral
 >      objectClass: extensibleObject
 >      dc: subtree
->      ref: ldap://b.example.net/dc=subtree,dc=example,dc=net/
+>      ref: ldap://b.example.net/dc=subtree,dc=example,dc=net
 
 The server uses this information to generate referrals and
 search continuations to subordinate servers.

diff --git a/doc/guide/admin/slapdconfig.sdf b/doc/guide/admin/slapdconfig.sdf
index c34f63ba2ca09ac1acd1cb467a8f9693e88c140a..c502f45cbe84f19306f0350fb39d81fd68b1b92c 100644 (file)
--- a/doc/guide/admin/slapdconfig.sdf
+++ b/doc/guide/admin/slapdconfig.sdf
@@ -479,14 +479,17 @@ indexes are maintained.
 \Example:
 
 >      index default pres,eq
->      index objectClass,uid
->      index cn,sn eq,sub,approx
-
-The first line sets the default set of indices to maintain to present
-and equality.  The second line causes the default (pres,eq) set
-of indices to be maintained for {{EX:objectClass}} and {{EX:uid}} attribute
-types.  The third line causes equality, substring, and approximate
-indices to be maintained for {{EX:cn}} and {{EX:sn}} attribute types.
+>      index uid
+>      index cn,sn pres,eq,sub
+>      index objectClass eq
+
+The first line sets the default set of indices to maintain to
+present and equality.  The second line causes the default (pres,eq)
+set of indices to be maintained for the {{EX:uid}} attribute type.
+The third line causes present, equality, and substring indices to
+be maintained for {{EX:cn}} and {{EX:sn}} attribute types.  The
+fourth line causes an equality index for the {{EX:objectClass}}
+attribute type.
 
 H4: mode <integer>
 
@@ -877,7 +880,7 @@ all applicable entries, the {{EX:userPassword}} attribute is writable
 by the entry itself and by the "admin" entry.  It may be used for
 authentication/authorization purposes, but is otherwise not readable.
 All other attributes are writable by the entry and the "admin"
-entry, but may be read by authenticated users.
+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