Misc updates from HEAD

doc/devel/args

@@ -9,7 +9,7 @@ ldapwhoami       * DE**HI*   *O QR  UVWXYZ   def*h**  *n*p*    vwxy
 
 
 * reserved
-	BFGJNgijmoq01235789
+	BFGJgijmoq01235789
 
 * General flags:
 	-C Chase Referrals
@@ -24,6 +24,7 @@ ldapwhoami       * DE**HI*   *O QR  UVWXYZ   def*h**  *n*p*    vwxy
 	-d debug
 	-h host
 	-n no-op
+	-N no (SASLprep) normalization of simple bind password
 	-p port
 	-v verbose
 	-V version

doc/devel/todo

@@ -52,14 +52,14 @@ Add BSD kqueue(2) support to slapd(8)
 Add DSML capabilities to command line tools
 Add LDIFv2 (XML) support to command line tools
 Implement authPassword (RFC 3112)
-Implement SASLprep
+Implement SASLprep (RFC 4013) for LDAP (draft-ietf-ldapbis-*)
 Implement additional matching rules (RFC 3698)
 Add dumpasn1 logging support
 Add tests to test suite
 Add jail(2) support
 Recode linked-list structs to use <ldap_queue.h> macros
 Convert utfconv.txt into man page(s).
-Update any manual page
+Update manual pages as needed.
 
 
 For additional TODO items, see: