14443 resection manual pages per IPD4

Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Reviewed by: Andy Fiddaman <andy@omnios.org>
Approved by: Dan McDonald <danmcd@joyent.com>

41 files changed, 207 insertions, 121 deletions

diff --git a/usr/src/man/man3ldap/ber_decode.3ldap b/usr/src/man/man3ldap/ber_decode.3ldap
index e749de772f..deb8984fcb 100644
--- a/usr/src/man/man3ldap/ber_decode.3ldap
+++ b/usr/src/man/man3ldap/ber_decode.3ldap
@@ -463,7 +463,7 @@ application.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -479,7 +479,8 @@ Interface Stability	Committed
 .SH SEE ALSO
 .sp
 .LP
-\fBber_encode\fR(3LDAP), \fBattributes\fR(5)
+.BR ber_encode (3LDAP),
+.BR attributes (7)
 .sp
 .LP
 Yeong, W., Howes, T., and Hardcastle-Kille, S., "Lightweight Directory Access
diff --git a/usr/src/man/man3ldap/ber_encode.3ldap b/usr/src/man/man3ldap/ber_encode.3ldap
index ae7eb4a825..b9ca19e637 100644
--- a/usr/src/man/man3ldap/ber_encode.3ldap
+++ b/usr/src/man/man3ldap/ber_encode.3ldap
@@ -332,7 +332,7 @@ functions generally return \fB\(mi1\fR\&.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -348,7 +348,8 @@ Interface Stability	Committed
 .SH SEE ALSO
 .sp
 .LP
-\fBber_decode\fR(3LDAP), \fBattributes\fR(5)
+.BR ber_decode (3LDAP),
+.BR attributes (7)
 .sp
 .LP
 Yeong, W., Howes, T., and Hardcastle-Kille, S., "Lightweight Directory Access
diff --git a/usr/src/man/man3ldap/cldap_close.3ldap b/usr/src/man/man3ldap/cldap_close.3ldap
index fe28374299..b1222c1676 100644
--- a/usr/src/man/man3ldap/cldap_close.3ldap
+++ b/usr/src/man/man3ldap/cldap_close.3ldap
@@ -36,7 +36,7 @@ The LDAP pointer returned by a previous call to \fBcldap_open\fR(3LDAP).
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -51,5 +51,7 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBcldap_open\fR(3LDAP), \fBcldap_search_s\fR(3LDAP),
-\fBcldap_setretryinfo\fR(3LDAP)
+.BR cldap_open (3LDAP),
+.BR cldap_search_s (3LDAP),
+.BR cldap_setretryinfo (3LDAP),
+.BR ldap (3LDAP)
diff --git a/usr/src/man/man3ldap/cldap_open.3ldap b/usr/src/man/man3ldap/cldap_open.3ldap
index 127d3818eb..3f9bb8d37c 100644
--- a/usr/src/man/man3ldap/cldap_open.3ldap
+++ b/usr/src/man/man3ldap/cldap_open.3ldap
@@ -40,7 +40,7 @@ The port number to connect.
 .sp
 .LP
 The \fBcldap_open()\fR function is called to prepare for connectionless LDAP
-communication (over \fBudp\fR(7P)). It allocates an LDAP structure which is
+communication (over \fBudp\fR(4P)). It allocates an LDAP structure which is
 passed to future search requests.
 .sp
 .LP
@@ -60,7 +60,7 @@ will be set appropriately.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -75,5 +75,8 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP) \fBcldap_search_s\fR(3LDAP), \fBcldap_setretryinfo\fR(3LDAP),
-\fBcldap_close\fR(3LDAP), \fBattributes\fR(5), \fBudp\fR(7P)
+\fBldap\fR(3LDAP) \fBcldap_close\fR(3LDAP),
+.BR cldap_search_s (3LDAP),
+.BR cldap_setretryinfo (3LDAP),
+.BR udp (4P),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/cldap_search_s.3ldap b/usr/src/man/man3ldap/cldap_search_s.3ldap
index 2e52782884..d7f863d310 100644
--- a/usr/src/man/man3ldap/cldap_search_s.3ldap
+++ b/usr/src/man/man3ldap/cldap_search_s.3ldap
@@ -33,7 +33,7 @@ by \fIRFC 1779, A String Representation of Distinguished Names\fR.
 .SS "Retransmission Algorithm"
 .sp
 .LP
-\fBcldap_search_s()\fR operates using the CLDAP protocol over \fBudp\fR(7P).
+\fBcldap_search_s()\fR operates using the CLDAP protocol over \fBudp\fR(4P).
 Since UDP is a non-reliable protocol, a retry mechanism is used to increase
 reliability. The \fBcldap_setretryinfo\fR(3LDAP) function can be used to set
 two retry parameters:  \fItries\fR, a count of the number of times to send a
@@ -126,7 +126,7 @@ more information.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -141,6 +141,11 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBldap_error\fR(3LDAP), \fBldap_search_s\fR(3LDAP),
-\fBcldap_open\fR(3LDAP), \fBcldap_setretryinfo\fR(3LDAP),
-\fBcldap_close\fR(3LDAP), \fBattributes\fR(5), \fBudp\fR(7P)
+.BR cldap_close (3LDAP),
+.BR cldap_open (3LDAP),
+.BR cldap_setretryinfo (3LDAP),
+.BR ldap (3LDAP),
+.BR ldap_error (3LDAP),
+.BR ldap_search_s (3LDAP),
+.BR udp (4P),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/cldap_setretryinfo.3ldap b/usr/src/man/man3ldap/cldap_setretryinfo.3ldap
index 97a9e55e9f..50f7c83ac0 100644
--- a/usr/src/man/man3ldap/cldap_setretryinfo.3ldap
+++ b/usr/src/man/man3ldap/cldap_setretryinfo.3ldap
@@ -56,7 +56,7 @@ the retransmission algorithm used.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -71,5 +71,8 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBcldap_open\fR(3LDAP), \fBcldap_search_s\fR(3LDAP),
-\fBcldap_close\fR(3LDAP), \fBattributes\fR(5)
+.BR cldap_close (3LDAP),
+.BR cldap_open (3LDAP),
+.BR cldap_search_s (3LDAP),
+.BR ldap (3LDAP),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap.3ldap b/usr/src/man/man3ldap/ldap.3ldap
index 6644b3c6bf..d504bcc272 100644
--- a/usr/src/man/man3ldap/ldap.3ldap
+++ b/usr/src/man/man3ldap/ldap.3ldap
@@ -81,7 +81,9 @@ Use \fBldap_modify_ext\fR(3LDAP) and \fBldap_modify_ext_s\fR(3LDAP) to modify
 an existing entry in a LDAP server that supports for LDAPv3 server and client
 controls. Similarly, use \fBldap_rename\fR(3LDAP) and
 \fBldap_rename_s\fR(3LDAP) to change the name of an LDAP entry. The
-\fBldap_modrdn\fR(3LDAP), \fBldap_modrdn_s\fR(3LDAP), \fBldap_modrdn2\fR(3LDAP)
+.BR ldap_modrdn (3LDAP),
+.BR ldap_modrdn2 (3LDAP),
+.BR ldap_modrdn_s (3LDAP)
 and \fBldap_modrdn2_s\fR(3LDAP) interfaces are deprecated.
 .SS "Obtaining Results"
 .LP
@@ -150,7 +152,7 @@ strings in the LDAP protocol.
 Make calls to \fBldap_init_getfilter\fR(3LDAP) and \fBldap_search\fR(3LDAP) to
 generate filters to be used in \fBldap_search\fR(3LDAP) and
 \fBldap_search_s\fR(3LDAP). \fBldap_init_getfilter()\fR reads
-\fBldapfilter.conf\fR(4), the LDAP configuration file, while
+\fBldapfilter.conf\fR(5), the LDAP configuration file, while
 \fBldap_init_getfilter_buf()\fR reads the configuration information from
 \fIbuf\fR of length \fIbuflen\fR. \fBldap_getfilter_free\fR(3LDAP) frees memory
 that has been allocated by means of \fBldap_init_getfilter()\fR.
@@ -1575,7 +1577,7 @@ Free memory allocated by LDAP API functions.
 
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -1590,4 +1592,4 @@ Stability Level	Evolving
 
 .SH SEE ALSO
 .LP
-\fBattributes\fR(5)
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_abandon.3ldap b/usr/src/man/man3ldap/ldap_abandon.3ldap
index 2a5d87bd08..345b7dbb06 100644
--- a/usr/src/man/man3ldap/ldap_abandon.3ldap
+++ b/usr/src/man/man3ldap/ldap_abandon.3ldap
@@ -38,7 +38,7 @@ returned from a future call to \fBldap_result\fR(3LDAP).
 setting \fIld_errno\fR appropriately. See \fBldap_error\fR(3LDAP) for details.
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -52,5 +52,7 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBldap\fR(3LDAP), \fBldap_result\fR(3LDAP), \fBldap_error\fR(3LDAP),
-\fBattributes\fR(5)
+.BR ldap (3LDAP),
+.BR ldap_error (3LDAP),
+.BR ldap_result (3LDAP),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_add.3ldap b/usr/src/man/man3ldap/ldap_add.3ldap
index d094d6df44..04d42db89b 100644
--- a/usr/src/man/man3ldap/ldap_add.3ldap
+++ b/usr/src/man/man3ldap/ldap_add.3ldap
@@ -77,7 +77,7 @@ error. \fBldap_add_s()\fR will return an LDAP error code directly.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -92,5 +92,7 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBldap_error\fR(3LDAP), \fBldap_modify\fR(3LDAP),
-\fBattributes\fR(5)
+.BR ldap (3LDAP),
+.BR ldap_error (3LDAP),
+.BR ldap_modify (3LDAP),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_ber_free.3ldap b/usr/src/man/man3ldap/ldap_ber_free.3ldap
index e36328eabb..2f20e55ec1 100644
--- a/usr/src/man/man3ldap/ldap_ber_free.3ldap
+++ b/usr/src/man/man3ldap/ldap_ber_free.3ldap
@@ -38,7 +38,7 @@ This function is deprecated . Use the \fBber_free()\fR function instead.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5)  for descriptions of the following attributes:
+See \fBattributes\fR(7)  for descriptions of the following attributes:
 .sp
 
 .sp
@@ -54,5 +54,7 @@ Interface Stability	Obsolete
 .SH SEE ALSO
 .sp
 .LP
-\fBber_free\fR(3LDAP), \fBldap_first_attribute\fR(3LDAP),
-\fBldap_next_attribute\fR(3LDAP), \fBattributes\fR(5)
+.BR ber_free (3LDAP),
+.BR ldap_first_attribute (3LDAP),
+.BR ldap_next_attribute (3LDAP),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_bind.3ldap b/usr/src/man/man3ldap/ldap_bind.3ldap
index b30b427007..c4e28bb8d8 100644
--- a/usr/src/man/man3ldap/ldap_bind.3ldap
+++ b/usr/src/man/man3ldap/ldap_bind.3ldap
@@ -222,7 +222,7 @@ credentials are returned, the result parameter is set to \fINULL\fR.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -240,5 +240,9 @@ MT-Level	Safe
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBldap_error\fR(3LDAP), \fBldap_open\fR(3LDAP),
-\fBldap_result\fR(3LDAP), \fBlibsasl\fR(3LIB), \fBattributes\fR(5)
+.BR ldap (3LDAP),
+.BR ldap_error (3LDAP),
+.BR ldap_open (3LDAP),
+.BR ldap_result (3LDAP),
+.BR libsasl (3LIB),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_charset.3ldap b/usr/src/man/man3ldap/ldap_charset.3ldap
index 171e330658..d54e0eacc8 100644
--- a/usr/src/man/man3ldap/ldap_charset.3ldap
+++ b/usr/src/man/man3ldap/ldap_charset.3ldap
@@ -108,7 +108,7 @@ not want to translate a binary attributes such as \fBjpegPhoto\fR.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -123,4 +123,5 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBattributes\fR(5)
+.BR ldap (3LDAP),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_compare.3ldap b/usr/src/man/man3ldap/ldap_compare.3ldap
index a4944f7fab..b05e268fe7 100644
--- a/usr/src/man/man3ldap/ldap_compare.3ldap
+++ b/usr/src/man/man3ldap/ldap_compare.3ldap
@@ -75,7 +75,7 @@ the non-negative message id of the request if it was successful.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -90,7 +90,9 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBldap_error\fR(3LDAP), \fBattributes\fR(5)
+.BR ldap (3LDAP),
+.BR ldap_error (3LDAP),
+.BR attributes (7)
 .SH BUGS
 .sp
 .LP
diff --git a/usr/src/man/man3ldap/ldap_control_free.3ldap b/usr/src/man/man3ldap/ldap_control_free.3ldap
index 15a68d3a42..32ac80665d 100644
--- a/usr/src/man/man3ldap/ldap_control_free.3ldap
+++ b/usr/src/man/man3ldap/ldap_control_free.3ldap
@@ -39,7 +39,7 @@ No errors are defined for these functions.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -54,4 +54,6 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap_error\fR(3LDAP), \fBldap_result\fR(3LDAP), \fBattributes\fR(5)
+.BR ldap_error (3LDAP),
+.BR ldap_result (3LDAP),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_delete.3ldap b/usr/src/man/man3ldap/ldap_delete.3ldap
index 34d265a5e4..ab4df67216 100644
--- a/usr/src/man/man3ldap/ldap_delete.3ldap
+++ b/usr/src/man/man3ldap/ldap_delete.3ldap
@@ -69,7 +69,7 @@ non-negative message id of the request if things were successful.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -84,4 +84,6 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBldap_error\fR(3LDAP), \fBattributes\fR(5)
+.BR ldap (3LDAP),
+.BR ldap_error (3LDAP),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_disptmpl.3ldap b/usr/src/man/man3ldap/ldap_disptmpl.3ldap
index aa9c22c88c..dff1b9efa9 100644
--- a/usr/src/man/man3ldap/ldap_disptmpl.3ldap
+++ b/usr/src/man/man3ldap/ldap_disptmpl.3ldap
@@ -92,7 +92,7 @@ Entry display templates provide a standard way for LDAP applications to display
 directory entries.  The general idea is that it is possible to map the list of
 object class values present in an entry to an appropriate display template.
 Display templates are defined in a configuration file. See
-\fBldaptemplates.conf\fR(4). Each display template contains a pre-determined
+\fBldaptemplates.conf\fR(5). Each display template contains a pre-determined
 list of items, where each item generally corresponds to an attribute to be
 displayed.  The items contain information and flags that the caller can use to
 display the attribute and values in a reasonable fashion.  Each item has a
@@ -102,7 +102,7 @@ produce text output.
 .sp
 .LP
 \fBldap_init_templates()\fR reads a sequence of templates from a valid LDAP
-template configuration file (see  \fBldaptemplates.conf\fR(4)). Upon success,
+template configuration file (see  \fBldaptemplates.conf\fR(5)). Upon success,
 \fB0\fR is returned, and \fItmpllistp\fR is set to point to a list of
 templates.  Each member of the list is an \fBldap_disptmpl\fR structure
 (defined below in the DISPTMPL Structure Elements section).
@@ -111,7 +111,7 @@ templates.  Each member of the list is an \fBldap_disptmpl\fR structure
 \fBldap_init_templates_buf()\fR reads a sequence of templates from \fIbuf\fR
 (whose size is \fIbuflen).\fR \fIbuf\fR should point to the data in the format
 defined for an LDAP template configuration file (see
-\fBldaptemplates.conf\fR(4)). Upon success,  \fB0\fR is returned, and
+\fBldaptemplates.conf\fR(5)). Upon success,  \fB0\fR is returned, and
 \fItmpllistp\fR is set to point to a list of templates.
 .sp
 .LP
@@ -430,7 +430,7 @@ cannot be read.   Other functions generally return \fINULL\fR upon error.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -445,5 +445,7 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBldap_entry2text\fR(3LDAP), \fBldaptemplates.conf\fR(4),
-\fBattributes\fR(5)
+.BR ldap (3LDAP),
+.BR ldap_entry2text (3LDAP),
+.BR ldaptemplates.conf (5),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_entry2text.3ldap b/usr/src/man/man3ldap/ldap_entry2text.3ldap
index bc67cfb587..45f1e8da97 100644
--- a/usr/src/man/man3ldap/ldap_entry2text.3ldap
+++ b/usr/src/man/man3ldap/ldap_entry2text.3ldap
@@ -78,7 +78,7 @@ cc[ \fIflag\fR... ] \fIfile\fR... -lldap[ \fIlibrary\fR... ]
 
 .SH DESCRIPTION
 These functions use the LDAP display template functions (see
-\fBldap_disptmpl\fR(3LDAP) and \fBldaptemplates.conf\fR(4)) to produce a
+\fBldap_disptmpl\fR(3LDAP) and \fBldaptemplates.conf\fR(5)) to produce a
 plain text or an HyperText Markup Language (HTML) display of an entry or a set
 of values.  Typical plain text output produced for an entry might look like:
 .sp
@@ -205,7 +205,7 @@ field of the \fIld\fR parameter is also set to indicate the error.
 .SH FILES
 \fBETCDIR/ldaptemplates.conf\fR
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -218,5 +218,5 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-\fBldap\fR(3LDAP), \fBldap_disptmpl\fR(3LDAP), \fBldaptemplates.conf\fR(4) ,
-\fBattributes\fR(5)
+\fBldap\fR(3LDAP), \fBldap_disptmpl\fR(3LDAP), \fBldaptemplates.conf\fR(5) ,
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_error.3ldap b/usr/src/man/man3ldap/ldap_error.3ldap
index 071291ec42..f381c661b2 100644
--- a/usr/src/man/man3ldap/ldap_error.3ldap
+++ b/usr/src/man/man3ldap/ldap_error.3ldap
@@ -581,7 +581,7 @@ servers that the client can hop through to retrieve data.
 .RE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -599,4 +599,4 @@ Interface Stability	Committed
 \fBldap_result\fR(3LDAP), \fBldap_parse_extended_result\fR(3LDAP),
 \fBldap_parse_result\fR(3LDAP), \fBldap_parse_sasl_bind_result\fR(3LDAP),
 \fBldap_search\fR(3LDAP), \fBmalloc\fR(3C), \fBperror\fR(3C) ,
-\fBattributes\fR(5)
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_first_attribute.3ldap b/usr/src/man/man3ldap/ldap_first_attribute.3ldap
index 2b90dfcf10..0c0f76bcb0 100644
--- a/usr/src/man/man3ldap/ldap_first_attribute.3ldap
+++ b/usr/src/man/man3ldap/ldap_first_attribute.3ldap
@@ -50,7 +50,7 @@ If an error occurs, \fINULL\fR is returned and the \fBld_errno\fR field in the
 for a description of possible error codes.
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -65,8 +65,11 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBldap\fR(3LDAP), \fBldap_first_entry\fR(3LDAP), \fBldap_get_values\fR(3LDAP),
-\fBldap_error\fR(3LDAP), \fBattributes\fR(5)
+.BR ldap (3LDAP),
+.BR ldap_error (3LDAP),
+.BR ldap_first_entry (3LDAP),
+.BR ldap_get_values (3LDAP),
+.BR attributes (7)
 .SH NOTES
 .LP
 The \fBldap_first_attribute()\fR function alllocates memory that might need to
diff --git a/usr/src/man/man3ldap/ldap_first_entry.3ldap b/usr/src/man/man3ldap/ldap_first_entry.3ldap
index 8370b82eb6..00e6e596ae 100644
--- a/usr/src/man/man3ldap/ldap_first_entry.3ldap
+++ b/usr/src/man/man3ldap/ldap_first_entry.3ldap
@@ -90,7 +90,7 @@ codes.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -105,6 +105,10 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBldap_result\fR(3LDAP), \fBldap_search\fR(3LDAP),
-\fBldap_first_attribute\fR(3LDAP), \fBldap_get_values\fR(3LDAP),
-\fBldap_get_dn\fR(3LDAP), \fBattributes\fR(5)
+.BR ldap (3LDAP),
+.BR ldap_first_attribute (3LDAP),
+.BR ldap_get_dn (3LDAP),
+.BR ldap_get_values (3LDAP),
+.BR ldap_result (3LDAP),
+.BR ldap_search (3LDAP),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_first_message.3ldap b/usr/src/man/man3ldap/ldap_first_message.3ldap
index a7881ccdd4..78999116cc 100644
--- a/usr/src/man/man3ldap/ldap_first_message.3ldap
+++ b/usr/src/man/man3ldap/ldap_first_message.3ldap
@@ -69,7 +69,7 @@ session handle  \fIld\fR will be set to indicate the error.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -84,4 +84,6 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap_error\fR(3LDAP), \fBldap_result\fR(3LDAP), \fBattributes\fR(5)
+.BR ldap_error (3LDAP),
+.BR ldap_result (3LDAP),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_friendly.3ldap b/usr/src/man/man3ldap/ldap_friendly.3ldap
index 3339fc42a2..e9644c71a0 100644
--- a/usr/src/man/man3ldap/ldap_friendly.3ldap
+++ b/usr/src/man/man3ldap/ldap_friendly.3ldap
@@ -72,7 +72,7 @@ parameter is \fINULL\fR.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -87,4 +87,5 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBattributes\fR(5)
+.BR ldap (3LDAP),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_get_dn.3ldap b/usr/src/man/man3ldap/ldap_get_dn.3ldap
index 5de6e000d3..bec4e3edea 100644
--- a/usr/src/man/man3ldap/ldap_get_dn.3ldap
+++ b/usr/src/man/man3ldap/ldap_get_dn.3ldap
@@ -107,7 +107,7 @@ caller should free the returned string if it is non-zero.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -122,8 +122,10 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBldap_first_entry\fR(3LDAP), \fBldap_error\fR(3LDAP),
-\fBldap_value_free\fR(3LDAP)
+.BR ldap (3LDAP),
+.BR ldap_error (3LDAP),
+.BR ldap_first_entry (3LDAP),
+.BR ldap_value_free (3LDAP)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man3ldap/ldap_get_entry_controls.3ldap b/usr/src/man/man3ldap/ldap_get_entry_controls.3ldap
index 55f0f67cb7..b10928e7dd 100644
--- a/usr/src/man/man3ldap/ldap_get_entry_controls.3ldap
+++ b/usr/src/man/man3ldap/ldap_get_entry_controls.3ldap
@@ -76,7 +76,7 @@ Memory cannot be allocated.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5)  for descriptions of the following attributes:
+See \fBattributes\fR(7)  for descriptions of the following attributes:
 .sp
 
 .sp
@@ -92,4 +92,6 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap_error\fR(3LDAP), \fBldap_parse_result\fR(3LDAP), \fBattributes\fR(5)
+.BR ldap_error (3LDAP),
+.BR ldap_parse_result (3LDAP),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_get_lang_values.3ldap b/usr/src/man/man3ldap/ldap_get_lang_values.3ldap
index e8c759d283..1d08fcf0ee 100644
--- a/usr/src/man/man3ldap/ldap_get_lang_values.3ldap
+++ b/usr/src/man/man3ldap/ldap_get_lang_values.3ldap
@@ -72,7 +72,7 @@ the appropriate error code in the LDAP structure.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5)  for descriptions of the following attributes:
+See \fBattributes\fR(7)  for descriptions of the following attributes:
 .sp
 
 .sp
@@ -88,6 +88,9 @@ Interface Stability	Obsolete
 .SH SEE ALSO
 .sp
 .LP
-\fBldap_first_attribute\fR(3LDAP), \fBldap_first_attribute\fR(3LDAP),
-\fBldap_get_values\fR(3LDAP), \fBldap_result\fR(3LDAP),
-\fBldap_search\fR(3LDAP), \fBattributes\fR(5)
+.BR ldap_first_attribute (3LDAP),
+.BR ldap_first_attribute (3LDAP),
+.BR ldap_get_values (3LDAP),
+.BR ldap_result (3LDAP),
+.BR ldap_search (3LDAP),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_get_option.3ldap b/usr/src/man/man3ldap/ldap_get_option.3ldap
index 66808e19bb..1dedb0cd1f 100644
--- a/usr/src/man/man3ldap/ldap_get_option.3ldap
+++ b/usr/src/man/man3ldap/ldap_get_option.3ldap
@@ -527,7 +527,7 @@ If unsuccessful
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -545,7 +545,9 @@ MT-Level	Safe
 .SH SEE ALSO
 .sp
 .LP
-\fBldap_init\fR(3LDAP), \fBsasl_setprop\fR(3SASL), \fBattributes\fR(5)
+.BR ldap_init (3LDAP),
+.BR sasl_setprop (3SASL),
+.BR attributes (7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man3ldap/ldap_get_values.3ldap b/usr/src/man/man3ldap/ldap_get_values.3ldap
index 088e6ea646..d7b0138155 100644
--- a/usr/src/man/man3ldap/ldap_get_values.3ldap
+++ b/usr/src/man/man3ldap/ldap_get_values.3ldap
@@ -82,7 +82,7 @@ possible error codes.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -97,8 +97,11 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBldap_first_entry\fR(3LDAP),
-\fBldap_first_attribute\fR(3LDAP), \fBldap_error\fR(3LDAP), \fBattributes\fR(5)
+.BR ldap (3LDAP),
+.BR ldap_error (3LDAP),
+.BR ldap_first_attribute (3LDAP),
+.BR ldap_first_entry (3LDAP),
+.BR attributes (7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man3ldap/ldap_getfilter.3ldap b/usr/src/man/man3ldap/ldap_getfilter.3ldap
index c8e961a216..bdfa515eb2 100644
--- a/usr/src/man/man3ldap/ldap_getfilter.3ldap
+++ b/usr/src/man/man3ldap/ldap_getfilter.3ldap
@@ -65,7 +65,7 @@ to calling any of the other functions except  \fBldap_build_filter\fR.
 .LP
 \fBldap_init_getfilter()\fR takes a file name as its only argument.  The
 contents of the file must be a valid LDAP filter configuration file (see
-\fBldapfilter.conf\fR(4)). If the file is successfully read, a pointer to an
+\fBldapfilter.conf\fR(5)). If the file is successfully read, a pointer to an
 \fBLDAPFiltDesc\fR is returned.  This is an opaque object that is passed in
 subsequent get filter calls.
 .sp
@@ -73,7 +73,7 @@ subsequent get filter calls.
 \fBldap_init_getfilter_buf()\fR reads from \fIbuf\fR, whose length is
 \fIbuflen\fR, the LDAP filter configuration information. \fIbuf\fR must point
 to the contents of a valid LDAP filter configuration file. See
-\fBldapfilter.conf\fR(4). If the filter configuration information is
+\fBldapfilter.conf\fR(5). If the filter configuration information is
 successfully read, a pointer to an  \fBLDAPFiltDesc\fR is returned.  This is an
 opaque object that is passed in subsequent get filter calls.
 .sp
@@ -111,7 +111,7 @@ A pattern for the desired filter is passed in \fIpattern.\fR Where the string
 %a appears in the pattern it is replaced with \fIattr.\fR \fIprefix\fR is
 pre-pended to the resulting filter, and \fIsuffix\fR is appended.  Either can
 be NULL , in which case they are not used. \fIvalue\fR and \fIvalwords\fR are
-used when the string %v appears in \fIpattern.\fR See  \fBldapfilter.conf\fR(4)
+used when the string %v appears in \fIpattern.\fR See  \fBldapfilter.conf\fR(5)
 for a description of how %v is handled.
 .SH ERRORS
 .sp
@@ -133,7 +133,7 @@ LDAP filtering routine configuration file.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -148,7 +148,9 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBldapfilter.conf\fR(4), \fBattributes\fR(5)
+.BR ldap (3LDAP),
+.BR ldapfilter.conf (5),
+.BR attributes (7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man3ldap/ldap_memcache.3ldap b/usr/src/man/man3ldap/ldap_memcache.3ldap
index 8a72c74c0e..12b56b8caf 100644
--- a/usr/src/man/man3ldap/ldap_memcache.3ldap
+++ b/usr/src/man/man3ldap/ldap_memcache.3ldap
@@ -219,7 +219,7 @@ the operation was successful. Otherwise, they return another LDAP error code.
 See \fBldap_error\fR(3LDAP) for a list of the LDAP error codes.
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -234,5 +234,7 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBldap_error\fR(3LDAP), \fBldap_open\fR(3LDAP), \fBldap_search\fR(3LDAP),
-\fBattributes\fR(5)
+.BR ldap_error (3LDAP),
+.BR ldap_open (3LDAP),
+.BR ldap_search (3LDAP),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_memfree.3ldap b/usr/src/man/man3ldap/ldap_memfree.3ldap
index c31753611f..1b5541a167 100644
--- a/usr/src/man/man3ldap/ldap_memfree.3ldap
+++ b/usr/src/man/man3ldap/ldap_memfree.3ldap
@@ -45,7 +45,7 @@ There are no return values for the \fBldap_memfree()\fR function.
 No errors are defined for the \fBldap_memfree()\fR function.
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -60,5 +60,8 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBldap\fR(3LDAP), \fBldap_first_attribute\fR(3LDAP), \fBldap_get_dn\fR(3LDAP),
-\fBldap_next_attribute\fR(3LDAP), \fBattributes\fR(5)
+.BR ldap (3LDAP),
+.BR ldap_first_attribute (3LDAP),
+.BR ldap_get_dn (3LDAP),
+.BR ldap_next_attribute (3LDAP),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_modify.3ldap b/usr/src/man/man3ldap/ldap_modify.3ldap
index d79ad4bbe2..3cb1492ac0 100644
--- a/usr/src/man/man3ldap/ldap_modify.3ldap
+++ b/usr/src/man/man3ldap/ldap_modify.3ldap
@@ -127,7 +127,7 @@ an error. See \fBldap_error\fR(3LDAP).
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -142,5 +142,8 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBldap_add\fR(3LDAP), \fBldap_error\fR(3LDAP),
-\fBldap_get_option\fR(3LDAP), \fBattributes\fR(5)
+.BR ldap (3LDAP),
+.BR ldap_add (3LDAP),
+.BR ldap_error (3LDAP),
+.BR ldap_get_option (3LDAP),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_modrdn.3ldap b/usr/src/man/man3ldap/ldap_modrdn.3ldap
index 0f60ac8a3c..d771af5024 100644
--- a/usr/src/man/man3ldap/ldap_modrdn.3ldap
+++ b/usr/src/man/man3ldap/ldap_modrdn.3ldap
@@ -93,7 +93,7 @@ result.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes of the
+See \fBattributes\fR(7) for a description of the following attributes of the
 \fBldap_modrdn()\fR, \fBldap_modrdn_s()\fR, \fBldap_modrdn2()\fR and
 \fBldap_modrdn2_s()\fR functions:
 .sp
@@ -126,4 +126,4 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBldap_error\fR(3LDAP) , \fBattributes\fR(5)
+\fBldap\fR(3LDAP), \fBldap_error\fR(3LDAP) , \fBattributes\fR(7)
diff --git a/usr/src/man/man3ldap/ldap_open.3ldap b/usr/src/man/man3ldap/ldap_open.3ldap
index fd6c8ec587..f73563afc8 100644
--- a/usr/src/man/man3ldap/ldap_open.3ldap
+++ b/usr/src/man/man3ldap/ldap_open.3ldap
@@ -102,7 +102,7 @@ ldap_init("[fec0::114:a00:20ff:ab3d:83ed]", 389)
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -120,5 +120,9 @@ MT-Level	Safe
 .SH SEE ALSO
 .sp
 .LP
-\fBerrno\fR(3C), \fBldap\fR(3LDAP), \fBldap_bind\fR(3LDAP),
-\fBldap_get_option\fR(3LDAP), \fBldap_set_option\fR(3LDAP), \fBattributes\fR(5)
+.BR errno (3C),
+.BR ldap (3LDAP),
+.BR ldap_bind (3LDAP),
+.BR ldap_get_option (3LDAP),
+.BR ldap_set_option (3LDAP),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_parse_result.3ldap b/usr/src/man/man3ldap/ldap_parse_result.3ldap
index 945a923979..c723d19348 100644
--- a/usr/src/man/man3ldap/ldap_parse_result.3ldap
+++ b/usr/src/man/man3ldap/ldap_parse_result.3ldap
@@ -47,7 +47,7 @@ LDAP error code if not (see \fBldap_error\fR(3LDAP)).
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -62,4 +62,6 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap_error\fR(3LDAP), \fBldap_result\fR(3LDAP), \fBattributes\fR(5)
+.BR ldap_error (3LDAP),
+.BR ldap_result (3LDAP),
+.BR attributes (7)
diff --git a/usr/src/man/man3ldap/ldap_result.3ldap b/usr/src/man/man3ldap/ldap_result.3ldap
index 186d066218..805d3b43c7 100644
--- a/usr/src/man/man3ldap/ldap_result.3ldap
+++ b/usr/src/man/man3ldap/ldap_result.3ldap
@@ -96,7 +96,7 @@ specified timeout was exceeded.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -112,7 +112,7 @@ Interface Stability	Committed
 .sp
 .LP
 \fBselect\fR(1), \fBldap\fR(3LDAP), \fBldap_search\fR(3LDAP) ,
-\fBattributes\fR(5)
+.BR attributes (7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man3ldap/ldap_search.3ldap b/usr/src/man/man3ldap/ldap_search.3ldap
index 092ca22a01..8becc7f261 100644
--- a/usr/src/man/man3ldap/ldap_search.3ldap
+++ b/usr/src/man/man3ldap/ldap_search.3ldap
@@ -141,7 +141,7 @@ terminates unsuccessfully.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -157,7 +157,7 @@ Interface Stability	Evolving
 .sp
 .LP
 \fBldap\fR(3LDAP), \fBldap_result\fR(3LDAP), \fBldap_getfilter\fR(3LDAP),
-\fBldap_error\fR(3LDAP) , \fBattributes\fR(5)
+\fBldap_error\fR(3LDAP) , \fBattributes\fR(7)
 .sp
 .LP
 Howes, T., Kille, S., Yeong, W., Robbins, C., Wenn, J. \fIRFC 1778, The String
diff --git a/usr/src/man/man3ldap/ldap_searchprefs.3ldap b/usr/src/man/man3ldap/ldap_searchprefs.3ldap
index b5301647ae..195d7e9fbe 100644
--- a/usr/src/man/man3ldap/ldap_searchprefs.3ldap
+++ b/usr/src/man/man3ldap/ldap_searchprefs.3ldap
@@ -57,14 +57,14 @@ specify the type of search to be performed.
 .LP
 \fBldap_init_searchprefs()\fR reads a sequence of search preference
 configurations from a valid LDAP  searchpref configuration file. See
-\fBldapsearchprefs.conf\fR(4). Upon success, \fB0\fR is returned and
+\fBldapsearchprefs.conf\fR(5). Upon success, \fB0\fR is returned and
 \fIsolistp\fR is set to point to a list of search preference data structures.
 .sp
 .LP
 \fBldap_init_searchprefs_buf()\fR reads a sequence of search preference
 configurations from \fIbuf\fR, whose size is \fIbuflen.\fR \fIbuf\fR should
 point to the data in the format defined for an LDAP search preference
-configuration file. See  \fBldapsearchprefs.conf\fR(4). Upon success, \fB0\fR
+configuration file. See  \fBldapsearchprefs.conf\fR(5). Upon success, \fB0\fR
 is returned and \fIsolistp\fR is set to point to a list of search preference
 data structures.
 .sp
@@ -108,7 +108,7 @@ Memory allocation problem.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -123,7 +123,9 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBldapsearchprefs.conf\fR(4), \fBattributes\fR(5)
+.BR ldap (3LDAP),
+.BR ldapsearchprefs.conf (5),
+.BR attributes (7)
 .sp
 .LP
 Yeong, W., Howes, T., and Hardcastle-Kille, S., "Lightweight Directory Access
diff --git a/usr/src/man/man3ldap/ldap_sort.3ldap b/usr/src/man/man3ldap/ldap_sort.3ldap
index e6a623a8f8..46e6a9d55e 100644
--- a/usr/src/man/man3ldap/ldap_sort.3ldap
+++ b/usr/src/man/man3ldap/ldap_sort.3ldap
@@ -76,7 +76,7 @@ For example:
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -91,8 +91,11 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBldap_search\fR(3LDAP), \fBldap_result\fR(3LDAP),
-\fBqsort\fR(3C), \fBattributes\fR(5)
+.BR qsort (3C),
+.BR ldap (3LDAP),
+.BR ldap_result (3LDAP),
+.BR ldap_search (3LDAP),
+.BR attributes (7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man3ldap/ldap_ufn.3ldap b/usr/src/man/man3ldap/ldap_ufn.3ldap
index 81ec34b3c2..f387ee7f1d 100644
--- a/usr/src/man/man3ldap/ldap_ufn.3ldap
+++ b/usr/src/man/man3ldap/ldap_ufn.3ldap
@@ -79,7 +79,7 @@ first", "ufn intermediate", and "ufn last".
 .sp
 .LP
 The \fBldap_ufn_setfilter()\fR function is used to set the
-\fBldapfilter.conf\fR(4) file for use with the \fBldap_init_getfilter\fR(3LDAP)
+\fBldapfilter.conf\fR(5) file for use with the \fBldap_init_getfilter\fR(3LDAP)
 function to \fIfname\fR.
 .sp
 .LP
@@ -98,7 +98,7 @@ actually be a pointer to a struct timeval. This is so \fBldap_ufn_timeout()\fR
 can be used as a cancelproc in the above functions.
 .SH ATTRIBUTES
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -112,9 +112,13 @@ Interface Stability	Evolving
 
 .SH SEE ALSO
 .LP
-\fBgettimeofday\fR(3C), \fBldap\fR(3LDAP), \fBldap_search\fR(3LDAP),
-\fBldap_getfilter\fR(3LDAP), \fBldapfilter.conf\fR(4), \fBldap_error\fR(3LDAP),
-\fBattributes\fR(5)
+.BR gettimeofday (3C),
+.BR ldap (3LDAP),
+.BR ldap_error (3LDAP),
+.BR ldap_getfilter (3LDAP),
+.BR ldap_search (3LDAP),
+.BR ldapfilter.conf (5),
+.BR attributes (7)
 .SH NOTES
 .LP
 These functions may allocates memory.  Return values are contained in
diff --git a/usr/src/man/man3ldap/ldap_url.3ldap b/usr/src/man/man3ldap/ldap_url.3ldap
index 77c95b8482..09edf7c4e3 100644
--- a/usr/src/man/man3ldap/ldap_url.3ldap
+++ b/usr/src/man/man3ldap/ldap_url.3ldap
@@ -250,7 +250,7 @@ URL doesn't begin with \fBldap://\fR.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for a description of the following attributes:
+See \fBattributes\fR(7) for a description of the following attributes:
 .sp
 
 .sp
@@ -265,7 +265,9 @@ Interface Stability	Evolving
 .SH SEE ALSO
 .sp
 .LP
-\fBldap\fR(3LDAP), \fBldap_search\fR(3LDAP), \fBattributes\fR(5)
+.BR ldap (3LDAP),
+.BR ldap_search (3LDAP),
+.BR attributes (7)
 .sp
 .LP
 \fBAn\fR \fBLDAP\fR \fBURL\fR \fBFormat,\fR Tim Howes and Mark Smith, December
diff --git a/usr/src/man/man3ldap/ldap_version.3ldap b/usr/src/man/man3ldap/ldap_version.3ldap
index dab60cb873..a1a2685b2f 100644
--- a/usr/src/man/man3ldap/ldap_version.3ldap
+++ b/usr/src/man/man3ldap/ldap_version.3ldap
@@ -33,7 +33,7 @@ the function returns \fB100\fR.
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -49,4 +49,5 @@ Interface Stability	Obsolete
 .SH SEE ALSO
 .sp
 .LP
-\fBldap_get_option\fR(3LDAP), \fBattributes\fR(5)
+.BR ldap_get_option (3LDAP),
+.BR attributes (7)