Sync with HEAD

diff --git a/INSTALL b/INSTALL
index 92311143cfb7da3cd9cbc89f1c84f003ee5fac85..51bd3c56129fca37b8c909b32510ebedd3aa41e3 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -38,7 +38,7 @@ Making and Installing the OpenLDAP Distribution
         Variable        Description     Example
         CC              C compiler      gcc
         CFLAGS          C flags         -O -g
-        CPPFLAGS        cpp flags       -I/path/include -Ddef
+        CPPFLAGS        cpp flags       -I/path/include -DFOO=42
         LDFLAGS         ld flags        -L/usr/local/lib
         LIBS            libraries       -llib
         PATH            command path    /usr/local/bin:/usr/bin:/bin

diff --git a/doc/devel/todo b/doc/devel/todo
index 1e205a22755da08ea4630c575c15cf5edbea4cb7..9227c36a0f3347461c287ce10cd794bb69471b81 100644 (file)
--- a/doc/devel/todo
+++ b/doc/devel/todo
@@ -40,7 +40,6 @@ Medium projects
 ---------------
 Implement authPassword (RFC 3112)
 Implement DIT Structure Rules and Name Forms
-Implement LDAP Cancel extension
 Implement LDAP Transactions extension
 Redesign slapd memory allocation fault handling
 Localize tools
@@ -49,7 +48,7 @@ Localize tools
 Small projects
 --------------
 Add dumpasn1 logging support
-Add tests to test suite (ACI, moddn, manageDSAit, etc.)
+Add tests to test suite
 Convert utfconv.txt into man page(s).
 Recode linked-list structs to use <ldap_queue.h> macros
 Update any manual page