diff --git a/share/man/man3/pthread_affinity_np.3 b/share/man/man3/pthread_affinity_np.3
index b08720c3e9ab..a04ba97b4838 100644
--- a/share/man/man3/pthread_affinity_np.3
+++ b/share/man/man3/pthread_affinity_np.3
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 8, 2010
+.Dd January 12, 2010
 .Dt PTHREAD_AFFINITY_NP 3
 .Os
 .Sh NAME
@@ -44,17 +44,17 @@
 .Fn pthread_getaffinity_np
 and
 .Fn pthread_setaffinity_np
-allow the manipulation of sets of CPUs available to specified thread.
+allow the manipulation of sets of CPUs available to the specified thread.
 .Pp
 Masks of type
 .Ft cpuset_t
 are composed using the
-.Xr CPU_SET 2
+.Xr CPU_SET 3
 macros.
 The kernel tolerates large sets as long as all CPUs specified
 in the set exist.
 Sets smaller than the kernel uses generate an error on calls to
-.Fn  pthread_getaffinity_np
+.Fn pthread_getaffinity_np
 even if the result set would fit within the user supplied set.
 Calls to
 .Fn pthread_setaffinity_np
@@ -75,14 +75,13 @@ retrieves the
 mask from the thread specified by
 .Fa td ,
 and stores it in the space provided by
-.Fa cpumaskp .
+.Fa cpusetp .
 .Pp
 .Fn pthread_setaffinity_np
 attempts to set the mask for the thread specified by
 .Fa td
 to the value in
-.Fa cpumaskp .
-.Pp
+.Fa cpusetp .
 .Sh RETURN VALUES
 If successful, the
 .Fn pthread_getaffinity_np
@@ -105,7 +104,7 @@ call would leave a thread without a valid CPU to run on because the set
 does not overlap with the thread's anonymous mask.
 .It Bq Er EFAULT
 The
-.Fa cpumaskp
+.Fa cpusetp
 pointer passed was invalid.
 .It Bq Er ESRCH
 The thread specified by the
@@ -127,7 +126,7 @@ operation.
 .Xr CPU_SET 3 ,
 .Xr pthread 3 ,
 .Xr pthread_attr_get_affinity_np 3 ,
-.Xr pthread_attr_set_affinity_np 3 .
+.Xr pthread_attr_set_affinity_np 3
 .Sh STANDARDS
 The
 .Nm pthread_getaffinity_np
diff --git a/share/man/man3/pthread_attr_affinity_np.3 b/share/man/man3/pthread_attr_affinity_np.3
index ea3879183f95..c61f69988fb7 100644
--- a/share/man/man3/pthread_attr_affinity_np.3
+++ b/share/man/man3/pthread_attr_affinity_np.3
@@ -31,7 +31,7 @@
 .Sh NAME
 .Nm pthread_attr_getaffinity_np ,
 .Nm pthread_attr_setaffinity_np
-.Nd manage CPU affinity in thread attribute object
+.Nd manage CPU affinity in thread attribute objects
 .Sh LIBRARY
 .Lb libpthread
 .Sh SYNOPSIS
@@ -41,20 +41,21 @@
 .Ft int
 .Fn pthread_attr_setaffinity_np "pthread_attr_t *pattr" "size_t cpusetsize" "const cpuset_t *cpusetp"
 .Sh DESCRIPTION
+The
 .Fn pthread_attr_getaffinity_np
 and
 .Fn pthread_attr_setaffinity_np
-allow the manipulation of sets of CPUs available to specified thread attribute object.
+functions allow the manipulation of sets of CPUs available to the specified thread attribute object.
 .Pp
 Masks of type
 .Ft cpuset_t
 are composed using the
-.Xr CPU_SET 2
+.Xr CPU_SET 3
 macros.
 The kernel tolerates large sets as long as all CPUs specified
 in the set exist.
 Sets smaller than the kernel uses generate an error on calls to
-.Fn  pthread_attr_getaffinity_np
+.Fn pthread_attr_getaffinity_np
 even if the result set would fit within the user supplied set.
 Calls to
 .Fn pthread_attr_setaffinity_np
@@ -75,14 +76,13 @@ retrieves the
 mask from the thread attribute object specified by
 .Fa pattr ,
 and stores it in the space provided by
-.Fa cpumaskp .
+.Fa cpusetp .
 .Pp
 .Fn pthread_attr_setaffinity_np
-set the mask for the thread attribute object specified by
+sets the mask for the thread attribute object specified by
 .Fa pattr
 to the value in
-.Fa cpumaskp .
-.Pp
+.Fa cpusetp .
 .Sh RETURN VALUES
 If successful, the
 .Fn pthread_attr_getaffinity_np
@@ -101,7 +101,8 @@ functions will fail if:
 .It Bq Er EINVAL
 The
 .Fa pattr
-or the attribute specified by it is NULL.
+or the attribute specified by it is
+.Dv NULL .
 .El
 .Pp
 The
@@ -111,7 +112,8 @@ function will fail if:
 .It Bq Er EINVAL
 The
 .Fa pattr
-or the attribute specified by it is NULL.
+or the attribute specified by it is
+.Dv NULL .
 .It Bq Er ENOMEM
 Insufficient memory exists to store the cpuset mask.
 .El
@@ -122,7 +124,7 @@ Insufficient memory exists to store the cpuset mask.
 .Xr cpuset_setid 2 ,
 .Xr CPU_SET 3 ,
 .Xr pthread_get_affinity_np 3 ,
-.Xr pthread_set_affinity_np 3 .
+.Xr pthread_set_affinity_np 3
 .Sh STANDARDS
 The
 .Nm pthread_attr_getaffinity_np