sync with HEAD

diff --git a/doc/devel/todo b/doc/devel/todo
index a2cd3978dd5b1966b5c480dae12c7e0bbc3c1de6..cd1cd0774deeceae78a2b776a04d42f44d594f11 100644 (file)
--- a/doc/devel/todo
+++ b/doc/devel/todo
@@ -1,5 +1,5 @@
-OpenLDAP To Do List
--------------------
+OpenLDAP Software To Do List
+----------------------------
 
 This is a list of projects that need getting done.  They are defined
 by scale of the effort as opposed to priority.  Contribute to
@@ -32,7 +32,7 @@ Large projects
 --------------
 Redesign slapd memory allocation fault handling
 Update to latest autoconf and friends
-Implement localization
+Localize slapd
 
 
 Medium projects
@@ -41,17 +41,15 @@ Implement LDAP Transactions extension
 Implement Proxy Authorization Control extension
 Implement LDAP Cancel extension
 Implement authPassword (RFC 3112)
-Populate matchingRuleUse attribute in the subschema
+Localize tools
 
 
 Small projects
 --------------
-Add dumpasn1 logging support
-Add LDIFv1 control support
 Implement -V version options
+Add dumpasn1 logging support
 Add tests to test suite (ACI, moddn, manageDSAit, etc.)
 Recode linked-list structs to use <ldap_queue.h> macros
-Create ldapbind(1) to support bind operations
 Convert utfconv.txt into man page(s).
 Update any manual page
 
@@ -63,6 +61,5 @@ For additional TODO items, see:
 JLDAP TODO items, see:
   http://www.openldap.org/devel/cvsweb.cgi/~checkout~/design/todo.txt?rev=1&cvsroot=JLDAP
 
-
 ---
 $OpenLDAP$

diff --git a/doc/man/man5/slapd-sql.5 b/doc/man/man5/slapd-sql.5
index c0b55fc623fad76d06003582f4190e2095da9d11..f2545af7c4608f23a3cc96ca8ebb0d29cbbe8d3f 100644 (file)
--- a/doc/man/man5/slapd-sql.5
+++ b/doc/man/man5/slapd-sql.5
@@ -69,7 +69,13 @@ is currently ignored).
 .RE
 .TP
 .B subtree_cond <SQL expression>
-Specifies a where-clause template used to form a subtree search condition.
+Specifies a where-clause template used to form a subtree search condition
+(dn=".*<dn>").
+It may differ from one SQL dialect to another (see samples).
+.TP
+.B children_cond <SQL expression>
+Specifies a where-clause template used to form a children search condition
+(dn="\.+,<dn>").
 It may differ from one SQL dialect to another (see samples).
 .TP
 .B oc_query <SQL expression>
@@ -167,7 +173,7 @@ and may change in future releases.
 .LP
 Almost everything mentioned later is illustrated in examples located
 in the
-.B slapd/back-sql/rdbms_depend/
+.B servers/slapd/back-sql/rdbms_depend/
 directory in the OpenLDAP source tree, and contains scripts for
 generating sample database for Oracle, MS SQL Server, mySQL and more
 (including PostgreSQL and IBM db2).