diff --git a/doc/man/man3/ldap.3 b/doc/man/man3/ldap.3
index e9954b7ba41a9908f2324da8ed495a69d69b71e6..48879e500c2a6a8f4076d67823d0d3582ec066e0 100644
--- a/doc/man/man3/ldap.3
+++ b/doc/man/man3/ldap.3
@@ -159,7 +159,7 @@ synchronously unbind from the LDAP server and close the connection
 equivalent to
 .BR ldap_unbind (3)
 .TP
-.SM ldap_memfree (3)
+.SM ldap_memfree(3)
 dispose of memory allocated by LDAP routines.
 .TP
 .SM ldap_enable_cache(3)
diff --git a/doc/man/man3/ldap_parse_reference.3 b/doc/man/man3/ldap_parse_reference.3
index 61b83433ef16ec56166a85871caf59db21e736e1..bba42e0d4d8c3b1b68d998f24482f9ef87df42e3 100644
--- a/doc/man/man3/ldap_parse_reference.3
+++ b/doc/man/man3/ldap_parse_reference.3
@@ -37,7 +37,7 @@ If no referrals were returned, \fI*referralsp\fP is set to NULL.
 .LP
 The \fIserverctrlsp\fP parameter will be filled in with an allocated array of
 controls copied from the parsed message. The array should be freed by calling
-.BR ldap_controls_free (3) .
+.BR ldap_controls_free (3).
 If \fIserverctrlsp\fP is NULL, no controls are returned.
 If no controls were returned, \fI*serverctrlsp\fP is set to NULL.
 .LP
diff --git a/doc/man/man5/slapd-meta.5 b/doc/man/man5/slapd-meta.5
index d953d09dcd317ac932d27f82249765a29ddb23c1..2c5ced7cd13735bdbbdad3992f8b6934a1f7bc3c 100644
--- a/doc/man/man5/slapd-meta.5
+++ b/doc/man/man5/slapd-meta.5
@@ -99,9 +99,10 @@ Target specification starts with a "uri" directive:
 .B uri <protocol>://[<host>[:<port>]]/<naming context>
 The "server" directive that was allowed in the LDAP backend (although
 deprecated) has been discarded in the Meta backend.
-The <protocol> part can be anything ldap_initialize(3) accepts
-({ldap|ldaps|ldapi} and variants); <host> and <port> may be omitted,
-defaulting to whatever is set in /etc/ldap.conf.
+The <protocol> part can be anything
+.BR ldap_initialize (3)
+accepts ({ldap|ldaps|ldapi} and variants); <host> and <port> may be
+omitted, defaulting to whatever is set in /etc/ldap.conf.
 The <naming context> part is mandatory.
 It must end with one of the naming contexts defined for the backend,
 e.g.:
diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 722cb179aa2f058f1671b4ea5b663cb16172e92d..e7e27f7bc3547be63f7e645747327a2d7fe36a82 100644
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -1140,7 +1140,7 @@ default slapd configuration file
 .BR slapadd (8),
 .BR slapcat (8),
 .BR slapindex (8),
-.BR slappassword (8),
+.BR slappasswd (8),
 .BR slurpd (8),
 .LP
 "OpenLDAP Administrator's Guide" (http://www.OpenLDAP.org/doc/admin/)