From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 16 Jun 2004 01:13:57 +0000 (+0000)
Subject: Merge from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_2_14~10
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a846702bb50bd0fe2e6bc9d899059b826db56faf;p=openldap

Merge from HEAD
---

diff --git a/doc/devel/todo b/doc/devel/todo
index 91f8e9f318..97f6563cde 100644
--- a/doc/devel/todo
+++ b/doc/devel/todo
@@ -32,7 +32,6 @@ Large projects
 --------------
 Implement character string localization 
 Implement X.500 administrative models (e.g. subentries (RFC 3672), etc.)
-Implement LDAP component matching (RFC 3687)
 Implement LDAP sorted search results control (RFC 2891)
 
 
@@ -50,6 +49,7 @@ Localize tools
 
 Small projects
 --------------
+Add LDIFv2 (XML) support to command line tools
 Implement LDAPprep and SASLprep
 Implement additional matching rules (RFC 3698)
 Add dumpasn1 logging support