18 files changed, 81 insertions, 43 deletions
diff --git a/usr/src/man/man3ext/NOTE.3ext b/usr/src/man/man3ext/NOTE.3ext
index acf8c8234b..c49a404bf7 100644
--- a/usr/src/man/man3ext/NOTE.3ext
+++ b/usr/src/man/man3ext/NOTE.3ext
@@ -145,7 +145,7 @@ be compatible with an ANSI C tokenizer and that unquoted parentheses be
 balanced (so that the end of the annotation can be determined without intimate
 knowledge of any particular annotation).
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -159,4 +159,5 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-\fBnote\fR(4), \fBattributes\fR(5)
+.BR note (5),
+.BR attributes (7)
diff --git a/usr/src/man/man3ext/SUNW_C_GetMechSession.3ext b/usr/src/man/man3ext/SUNW_C_GetMechSession.3ext
index 17f15d8794..8aa79acffb 100644
--- a/usr/src/man/man3ext/SUNW_C_GetMechSession.3ext
+++ b/usr/src/man/man3ext/SUNW_C_GetMechSession.3ext
@@ -165,7 +165,7 @@ not likely to exist on non-Solaris systems. They are provided as a convenience
 to application programmers. Use of these functions will make the application
 non-portable to other systems.
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -181,7 +181,8 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-\fBlibpkcs11\fR(3LIB), \fBattributes\fR(5)
+.BR libpkcs11 (3LIB),
+.BR attributes (7)
 .sp
 .LP
 http://www.rsasecurity.com
diff --git a/usr/src/man/man3ext/crypt.3ext b/usr/src/man/man3ext/crypt.3ext
index c308815a69..2b8c15ed47 100644
--- a/usr/src/man/man3ext/crypt.3ext
+++ b/usr/src/man/man3ext/crypt.3ext
@@ -137,7 +137,7 @@ to \fBENOSYS\fR to indicate that the functionality is not available.
 .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
@@ -153,8 +153,13 @@ MT-Level	Unsafe
 .SH SEE ALSO
 .sp
 .LP
-\fBed\fR(1), \fBlogin\fR(1), \fBpasswd\fR(1), \fBvi\fR(1), \fBgetpass\fR(3C),
-\fBpasswd\fR(4), \fBattributes\fR(5)
+.BR ed (1),
+.BR login (1),
+.BR passwd (1),
+.BR vi (1),
+.BR getpass (3C),
+.BR passwd (5),
+.BR attributes (7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man3ext/ecb_crypt.3ext b/usr/src/man/man3ext/ecb_crypt.3ext
index 63a099f75a..8b44740dcc 100644
--- a/usr/src/man/man3ext/ecb_crypt.3ext
+++ b/usr/src/man/man3ext/ecb_crypt.3ext
@@ -104,7 +104,7 @@ Bad parameter to routine.
 .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,7 +120,8 @@ MT-Level	MT-Safe
 .SH SEE ALSO
 .sp
 .LP
-\fBcrypt\fR(3C), \fBattributes\fR(5)
+.BR crypt (3C),
+.BR attributes (7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man3ext/efi_alloc_and_init.3ext b/usr/src/man/man3ext/efi_alloc_and_init.3ext
index ad4c21a543..79f9500688 100644
--- a/usr/src/man/man3ext/efi_alloc_and_init.3ext
+++ b/usr/src/man/man3ext/efi_alloc_and_init.3ext
@@ -227,7 +227,7 @@ used on smaller disks. The application should attempt the \fBread_vtoc()\fR or
 \fBwrite_vtoc()\fR call, check for an error of \fBVT_ENOTSUP\fR, then call the
 analogous EFI function.
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -243,6 +243,12 @@ MT-Level	Unsafe
 .TE
 
 .SH SEE ALSO
-\fBfmthard\fR(1M), \fBformat\fR(1M), \fBprtvtoc\fR(1M), \fBioctl\fR(2),
-\fBopen\fR(2), \fBlibefi\fR(3LIB), \fBread_vtoc\fR(3EXT), \fBattributes\fR(5),
-\fBdkio\fR(7I)
+.BR ioctl (2),
+.BR open (2),
+.BR read_vtoc (3EXT),
+.BR libefi (3LIB),
+.BR dkio (4I),
+.BR attributes (7),
+.BR fmthard (8),
+.BR format (8),
+.BR prtvtoc (8)
diff --git a/usr/src/man/man3ext/ld_support.3ext b/usr/src/man/man3ext/ld_support.3ext
index b242682b50..754f57b2e1 100644
--- a/usr/src/man/man3ext/ld_support.3ext
+++ b/usr/src/man/man3ext/ld_support.3ext
@@ -100,7 +100,7 @@ mechanism.
 .SH SEE ALSO
 .sp
 .LP
-\fBld\fR(1)
+.BR ld (1)
 .sp
 .LP
 \fILinker and Libraries Guide\fR
diff --git a/usr/src/man/man3ext/md4.3ext b/usr/src/man/man3ext/md4.3ext
index 8f9c8e1ccb..fb61aa21fc 100644
--- a/usr/src/man/man3ext/md4.3ext
+++ b/usr/src/man/man3ext/md4.3ext
@@ -113,7 +113,7 @@ AuthenticateMsg(unsigned char *auth_buffer, struct iovec
 .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
@@ -131,7 +131,7 @@ MT-Level	MT-Safe
 .SH SEE ALSO
 .sp
 .LP
-\fBlibmd\fR(3LIB)
+.BR libmd (3LIB)
 .sp
 .LP
 RFC 1320
diff --git a/usr/src/man/man3ext/md5.3ext b/usr/src/man/man3ext/md5.3ext
index aea7c65c64..5339e274e5 100644
--- a/usr/src/man/man3ext/md5.3ext
+++ b/usr/src/man/man3ext/md5.3ext
@@ -138,7 +138,7 @@ int AuthenticateMsg(unsigned char *auth_buffer, unsigned
 .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
@@ -156,7 +156,7 @@ MT-Level	MT-Safe
 .SH SEE ALSO
 .sp
 .LP
-\fBlibmd5\fR(3LIB)
+.BR libmd5 (3LIB)
 .sp
 .LP
 Rivest, R., The MD5 Message-Digest Algorithm, RFC 1321, April 1992.
diff --git a/usr/src/man/man3ext/read_vtoc.3ext b/usr/src/man/man3ext/read_vtoc.3ext
index ee55b325f8..2349f42124 100644
--- a/usr/src/man/man3ext/read_vtoc.3ext
+++ b/usr/src/man/man3ext/read_vtoc.3ext
@@ -143,7 +143,7 @@ the fields in the data 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
@@ -159,10 +159,15 @@ MT-Level	Unsafe
 .SH SEE ALSO
 .sp
 .LP
-\fBfmthard\fR(1M), \fBformat\fR(1M), \fBprtvtoc\fR(1M), \fBioctl\fR(2),
-\fBefi_alloc_and_init\fR(3EXT), \fBattributes\fR(5), \fBdkio\fR(7I)
+.BR ioctl (2),
+.BR efi_alloc_and_init (3EXT),
+.BR dkio (4I),
+.BR attributes (7),
+.BR fmthard (8),
+.BR format (8),
+.BR prtvtoc (8)
 .SH BUGS
 .sp
 .LP
 The \fBwrite_vtoc()\fR function cannot write a  \fBVTOC\fR on an unlabeled
-disk. Use \fBformat\fR(1M) for this purpose.
+disk. Use \fBformat\fR(8) for this purpose.
diff --git a/usr/src/man/man3ext/rtld_audit.3ext b/usr/src/man/man3ext/rtld_audit.3ext
index 82751d0d95..83da89e579 100644
--- a/usr/src/man/man3ext/rtld_audit.3ext
+++ b/usr/src/man/man3ext/rtld_audit.3ext
@@ -103,7 +103,7 @@ for a full description of the link auditing mechanism.
 .SH SEE ALSO
 .sp
 .LP
-\fBld.so.1\fR(1)
+.BR ld.so.1 (1)
 .sp
 .LP
 \fILinker and Libraries Guide\fR
diff --git a/usr/src/man/man3ext/rtld_db.3ext b/usr/src/man/man3ext/rtld_db.3ext
index 676bf88c23..7ef8a280c1 100644
--- a/usr/src/man/man3ext/rtld_db.3ext
+++ b/usr/src/man/man3ext/rtld_db.3ext
@@ -100,7 +100,7 @@ documented in \fBps_pread\fR(3PROC) and \fBproc_service\fR(3PROC).
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for description of the following attributes:
+See \fBattributes\fR(7) for description of the following attributes:
 .sp
 
 .sp
@@ -118,8 +118,12 @@ MT-Level	Safe
 .SH SEE ALSO
 .sp
 .LP
-\fBld.so.1\fR(1), \fBlibc_db\fR(3LIB), \fBlibrtld_db\fR(3LIB),
-\fBproc_service\fR(3PROC), \fBps_pread\fR(3PROC), \fBattributes\fR(5)
+.BR ld.so.1 (1),
+.BR libc_db (3LIB),
+.BR librtld_db (3LIB),
+.BR proc_service (3PROC),
+.BR ps_pread (3PROC),
+.BR attributes (7)
 .sp
 .LP
 \fILinker and Libraries Guide\fR
diff --git a/usr/src/man/man3ext/sendfile.3ext b/usr/src/man/man3ext/sendfile.3ext
index 38f974987e..cc8d416ac9 100644
--- a/usr/src/man/man3ext/sendfile.3ext
+++ b/usr/src/man/man3ext/sendfile.3ext
@@ -142,7 +142,7 @@ A signal was caught during the write operation and no data was transferred.
 .SH USAGE
 .LP
 The \fBsendfile()\fR function has a transitional interface for 64-bit file
-offsets. See \fBlf64\fR(5).
+offsets. See \fBlf64\fR(7).
 .SH EXAMPLES
 .LP
 \fBExample 1 \fRSending a Buffer Over a Socket
@@ -250,7 +250,7 @@ while (len > 0) {
 
 .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
@@ -267,5 +267,9 @@ MT-Level	MT-Safe
 
 .SH SEE ALSO
 .LP
-\fBopen\fR(2), \fBlibsendfile\fR(3LIB), \fBsendfilev\fR(3EXT),
-\fBsocket\fR(3SOCKET), \fBattributes\fR(5), \fBlf64\fR(5)
+.BR open (2),
+.BR sendfilev (3EXT),
+.BR libsendfile (3LIB),
+.BR socket (3SOCKET),
+.BR attributes (7),
+.BR lf64 (7)
diff --git a/usr/src/man/man3ext/sendfilev.3ext b/usr/src/man/man3ext/sendfilev.3ext
index 37678b67c3..6679356d05 100644
--- a/usr/src/man/man3ext/sendfilev.3ext
+++ b/usr/src/man/man3ext/sendfilev.3ext
@@ -222,7 +222,7 @@ The socket type is not supported.
 .SH USAGE
 .LP
 The \fBsendfilev()\fR function has a transitional interface for 64-bit file
-offsets. See \fBlf64\fR(5).
+offsets. See \fBlf64\fR(7).
 .SH EXAMPLES
 .LP
 The following example sends 2 vectors, one of HEADER data and a file of length
@@ -263,7 +263,7 @@ main (int argc, char *argv[]){
 
 .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
@@ -280,5 +280,9 @@ MT-Level	MT-Safe
 
 .SH SEE ALSO
 .LP
-\fBopen\fR(2), \fBwritev\fR(2), \fBlibsendfile\fR(3LIB), \fBsendfile\fR(3EXT),
-\fBsocket\fR(3SOCKET), \fBattributes\fR(5)
+.BR open (2),
+.BR writev (2),
+.BR sendfile (3EXT),
+.BR libsendfile (3LIB),
+.BR socket (3SOCKET),
+.BR attributes (7)
diff --git a/usr/src/man/man3ext/sha1.3ext b/usr/src/man/man3ext/sha1.3ext
index a8ef472123..73fd624465 100644
--- a/usr/src/man/man3ext/sha1.3ext
+++ b/usr/src/man/man3ext/sha1.3ext
@@ -117,7 +117,7 @@ AuthenticateMsg(unsigned char *auth_buffer, struct iovec
 .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
@@ -135,7 +135,8 @@ MT-Level	MT-Safe
 .SH SEE ALSO
 .sp
 .LP
-\fBsha2\fR(3EXT), \fBlibmd\fR(3LIB)
+.BR sha2 (3EXT),
+.BR libmd (3LIB)
 .sp
 .LP
 RFC 1374
diff --git a/usr/src/man/man3ext/sha2.3ext b/usr/src/man/man3ext/sha2.3ext
index ae49257dc1..49ba7c269e 100644
--- a/usr/src/man/man3ext/sha2.3ext
+++ b/usr/src/man/man3ext/sha2.3ext
@@ -212,7 +212,7 @@ AuthenticateMsg(unsigned char *auth_buffer, struct iovec
 
 .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
@@ -229,7 +229,7 @@ MT-Level	MT-Safe
 
 .SH SEE ALSO
 .LP
-\fBlibmd\fR(3LIB)
+.BR libmd (3LIB)
 .sp
 .LP
 FIPS 180-2
diff --git a/usr/src/man/man3ext/stdarg.3ext b/usr/src/man/man3ext/stdarg.3ext
index 7ebafdeaab..3bb8b67cbe 100644
--- a/usr/src/man/man3ext/stdarg.3ext
+++ b/usr/src/man/man3ext/stdarg.3ext
@@ -134,7 +134,7 @@ declaration such as
 .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
@@ -150,7 +150,9 @@ Interface Stability	Standard
 .SH SEE ALSO
 .sp
 .LP
-\fBvprintf\fR(3C), \fBattributes\fR(5), \fBstandards\fR(5)
+.BR vprintf (3C),
+.BR attributes (7),
+.BR standards (7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man3ext/tsalarm_get.3ext b/usr/src/man/man3ext/tsalarm_get.3ext
index 7a6768aad0..642e293d9d 100644
--- a/usr/src/man/man3ext/tsalarm_get.3ext
+++ b/usr/src/man/man3ext/tsalarm_get.3ext
@@ -298,7 +298,7 @@ int main(int argc, char **argv) {
 .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
@@ -316,4 +316,5 @@ MT-Level	Safe
 .SH SEE ALSO
 .sp
 .LP
-\fBlibtsalarm\fR(3LIB), \fBattributes\fR(5)
+.BR libtsalarm (3LIB),
+.BR attributes (7)
diff --git a/usr/src/man/man3ext/varargs.3ext b/usr/src/man/man3ext/varargs.3ext
index 733d1e695d..532185d9ce 100644
--- a/usr/src/man/man3ext/varargs.3ext
+++ b/usr/src/man/man3ext/varargs.3ext
@@ -98,7 +98,10 @@ va_dcl
 .SH SEE ALSO
 .sp
 .LP
-\fBexec\fR(2), \fBprintf\fR(3C), \fBvprintf\fR(3C), \fBstdarg\fR(3EXT)
+.BR exec (2),
+.BR printf (3C),
+.BR vprintf (3C),
+.BR stdarg (3EXT)
 .SH NOTES
 .sp
 .LP