11 files changed, 49 insertions, 26 deletions
diff --git a/usr/src/man/man3gen/bgets.3gen b/usr/src/man/man3gen/bgets.3gen
index 81a3f8f368..325ba864fe 100644
--- a/usr/src/man/man3gen/bgets.3gen
+++ b/usr/src/man/man3gen/bgets.3gen
@@ -88,7 +88,7 @@ int main()
 .in -2
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -102,7 +102,8 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-\fBgets\fR(3C), \fBattributes\fR(5)
+.BR gets (3C),
+.BR attributes (7)
 .SH NOTES
 When compiling multithread applications, the \fB_REENTRANT\fR flag must be
 defined on the compile line.  This flag should only be used in multithreaded
diff --git a/usr/src/man/man3gen/bufsplit.3gen b/usr/src/man/man3gen/bufsplit.3gen
index 0328d79076..33dbd0d995 100644
--- a/usr/src/man/man3gen/bufsplit.3gen
+++ b/usr/src/man/man3gen/bufsplit.3gen
@@ -63,7 +63,7 @@ applications.
 .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
@@ -79,4 +79,4 @@ MT-Level	MT-Safe
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5)
+.BR attributes (7)
diff --git a/usr/src/man/man3gen/copylist.3gen b/usr/src/man/man3gen/copylist.3gen
index 3545bcda0e..19d15e26f0 100644
--- a/usr/src/man/man3gen/copylist.3gen
+++ b/usr/src/man/man3gen/copylist.3gen
@@ -31,7 +31,7 @@ Otherwise it returns NULL if it has trouble finding the file, calling
 .sp
 .LP
 The \fBcopylist()\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 \fRExample of \fBcopylist()\fR function.
@@ -59,7 +59,7 @@ if (buf) {
 .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
@@ -75,7 +75,9 @@ MT-Level	MT-Safe
 .SH SEE ALSO
 .sp
 .LP
-\fBmalloc\fR(3C), \fBattributes\fR(5), \fBlf64\fR(5)
+.BR malloc (3C),
+.BR attributes (7),
+.BR lf64 (7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man3gen/gmatch.3gen b/usr/src/man/man3gen/gmatch.3gen
index 15dd15cf6c..7400daa464 100644
--- a/usr/src/man/man3gen/gmatch.3gen
+++ b/usr/src/man/man3gen/gmatch.3gen
@@ -46,7 +46,7 @@ gmatch (s, "*[a\e-]" )
 .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
@@ -62,7 +62,8 @@ MT-Level	MT-Safe
 .SH SEE ALSO
 .sp
 .LP
-\fBsh\fR(1), \fBattributes\fR(5)
+.BR sh (1),
+.BR attributes (7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man3gen/isencrypt.3gen b/usr/src/man/man3gen/isencrypt.3gen
index 144acf38fb..a854720192 100644
--- a/usr/src/man/man3gen/isencrypt.3gen
+++ b/usr/src/man/man3gen/isencrypt.3gen
@@ -42,7 +42,7 @@ buffer is encrypted.
 .SH RETURN VALUES
 If the buffer is encrypted, \fB1\fR is returned; otherwise, zero is returned.
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -56,7 +56,8 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-\fBsetlocale\fR(3C), \fBattributes\fR(5)
+.BR setlocale (3C),
+.BR attributes (7)
 .SH NOTES
 When compiling multithreaded applications, the \fB_REENTRANT\fR flag must be
 defined on the compile line.  This flag should only be used in multithreaded
diff --git a/usr/src/man/man3gen/mkdirp.3gen b/usr/src/man/man3gen/mkdirp.3gen
index a972901510..38ee1657e3 100644
--- a/usr/src/man/man3gen/mkdirp.3gen
+++ b/usr/src/man/man3gen/mkdirp.3gen
@@ -71,7 +71,7 @@ rmdirp("sub1/sub2/sub3");
 .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
@@ -87,8 +87,11 @@ MT-Level	MT-Safe
 .SH SEE ALSO
 .sp
 .LP
-\fBchmod\fR(2), \fBmkdir\fR(2), \fBrmdir\fR(2), \fBmalloc\fR(3C),
-\fBattributes\fR(5)
+.BR chmod (2),
+.BR mkdir (2),
+.BR rmdir (2),
+.BR malloc (3C),
+.BR attributes (7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man3gen/p2open.3gen b/usr/src/man/man3gen/p2open.3gen
index 8d5164efe5..2f21286218 100644
--- a/usr/src/man/man3gen/p2open.3gen
+++ b/usr/src/man/man3gen/p2open.3gen
@@ -80,7 +80,7 @@ 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
@@ -96,7 +96,10 @@ MT-Level	Unsafe
 .SH SEE ALSO
 .sp
 .LP
-\fBfclose\fR(3C), \fBpopen\fR(3C), \fBsetbuf\fR(3C), \fBattributes\fR(5)
+.BR fclose (3C),
+.BR popen (3C),
+.BR setbuf (3C),
+.BR attributes (7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man3gen/pathfind.3gen b/usr/src/man/man3gen/pathfind.3gen
index 11404b7008..c295395bae 100644
--- a/usr/src/man/man3gen/pathfind.3gen
+++ b/usr/src/man/man3gen/pathfind.3gen
@@ -100,7 +100,7 @@ If no match is found, \fBpathname()\fR returns a null pointer, \fB((char *)
 .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
@@ -116,8 +116,13 @@ MT-Level	MT-Safe
 .SH SEE ALSO
 .sp
 .LP
-\fBsh\fR(1), \fBtest\fR(1), \fBaccess\fR(2), \fBmknod\fR(2), \fBstat\fR(2),
-\fBgetenv\fR(3C), \fBattributes\fR(5)
+.BR sh (1),
+.BR test (1),
+.BR access (2),
+.BR mknod (2),
+.BR stat (2),
+.BR getenv (3C),
+.BR attributes (7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man3gen/regexpr.3gen b/usr/src/man/man3gen/regexpr.3gen
index 1e348b6173..1e46bb78be 100644
--- a/usr/src/man/man3gen/regexpr.3gen
+++ b/usr/src/man/man3gen/regexpr.3gen
@@ -177,7 +177,7 @@ ERROR	MEANING
 .TE
 
 .SH ATTRIBUTES
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -191,8 +191,12 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-\fBed\fR(1), \fBgrep\fR(1), \fBsed\fR(1), \fBmalloc\fR(3C),
-\fBattributes\fR(5), \fBregexp\fR(5)
+.BR ed (1),
+.BR grep (1),
+.BR sed (1),
+.BR malloc (3C),
+.BR attributes (7),
+.BR regexp (7)
 .SH NOTES
 When compiling multi-threaded applications, the \fB_REENTRANT\fR flag must be
 defined on the compile line.  This flag should only be used in multi-threaded
diff --git a/usr/src/man/man3gen/strccpy.3gen b/usr/src/man/man3gen/strccpy.3gen
index 3aaedfec4c..ea97370fcf 100644
--- a/usr/src/man/man3gen/strccpy.3gen
+++ b/usr/src/man/man3gen/strccpy.3gen
@@ -79,7 +79,7 @@ cp = strcadd( cp, input3 );
 .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
@@ -95,7 +95,9 @@ MT-Level	MT-Safe
 .SH SEE ALSO
 .sp
 .LP
-\fBstring\fR(3C), \fBstrfind\fR(3GEN), \fBattributes\fR(5)
+.BR string (3C),
+.BR strfind (3GEN),
+.BR attributes (7)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man3gen/strfind.3gen b/usr/src/man/man3gen/strfind.3gen
index 08276d5a85..38c6f36576 100644
--- a/usr/src/man/man3gen/strfind.3gen
+++ b/usr/src/man/man3gen/strfind.3gen
@@ -73,7 +73,7 @@ s2 = strtrns(s1, a1, a2, s2);\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
@@ -89,4 +89,5 @@ MT-Level	MT-Safe
 .SH SEE ALSO
 .sp
 .LP
-\fBstring\fR(3C), \fBattributes\fR(5)
+.BR string (3C),
+.BR attributes (7)