Resync with HEAD

diff --git a/doc/man/man1/ldappasswd.1 b/doc/man/man1/ldappasswd.1
index d2083637aceda69d9abcbdb200450ef0ce0ae5ee..01ddbe750aad1b13ae4e81914486aca32dc0d15f 100644 (file)
--- a/doc/man/man1/ldappasswd.1
+++ b/doc/man/man1/ldappasswd.1
@@ -53,6 +53,8 @@ ldappasswd \- change the password of an LDAP entry
 .SH DESCRIPTION
 .B ldappasswd
 is a tool to set the password of an LDAP user.
+.B ldappasswd
+uses the LDAPv3 Password Modify (RFC 3062) extended operation.
 .LP
 .B ldappasswd
 sets the password of associated with the user [or an optionally
@@ -153,7 +155,7 @@ the command will require the operation to be successful
 .SH SEE ALSO
 .BR ldap_sasl_bind (3)
 .BR ldap_extended_operation (3)
-.BR ldap_start_tls (3)
+.BR ldap_start_tls_s (3)
 .SH AUTHOR
 The OpenLDAP Project <http://www.openldap.org/>
 .SH ACKNOWLEDGEMENTS