diff --git a/man2/_exit.2 b/man2/_exit.2
index e121d095d..9cb68707f 100644
--- a/man2/_exit.2
+++ b/man2/_exit.2
@@ -62,7 +62,7 @@ is equivalent to
 .SH "RETURN VALUE"
 These functions do not return.
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX, X/OPEN, 4.3BSD.
+SVr4, POSIX.1-2001, 4.3BSD.
 The function \fB_Exit\fP() was introduced by C99.
 .SH NOTES
 For a discussion on the effects of an exit, the transmission of
diff --git a/man2/accept.2 b/man2/accept.2
index 7cf6df85c..5cc7a0d4e 100644
--- a/man2/accept.2
+++ b/man2/accept.2
@@ -250,9 +250,10 @@ SVr4, 4.4BSD
 first appeared in 4.2BSD).
 The BSD man page documents five possible error returns
 (EBADF, ENOTSOCK, EOPNOTSUPP, EWOULDBLOCK, EFAULT).
-SUSv3 documents errors EAGAIN, EBADF, ECONNABORTED, EINTR, EINVAL, EMFILE,
-ENFILE, ENOBUFS, ENOMEM, ENOTSOCK, EOPNOTSUPP, EPROTO, EWOULDBLOCK. In
-addition, SUSv2 documents EFAULT and ENOSR.
+POSIX.1-2001 documents errors 
+EAGAIN, EBADF, ECONNABORTED, EINTR, EINVAL, EMFILE,
+ENFILE, ENOBUFS, ENOMEM, ENOTSOCK, EOPNOTSUPP, EPROTO, EWOULDBLOCK. 
+In addition, SUSv2 documents EFAULT and ENOSR.
 .LP
 On Linux, the new socket returned by
 .BR accept () 
@@ -272,7 +273,7 @@ the socket returned from
 The third argument of
 .BR accept ()
 was originally declared as an `int *' (and is that under libc4 and libc5
-and on many other systems like 4.x BSD, SunOS 4, SGI); a POSIX 1003.1g draft
+and on many other systems like 4.x BSD, SunOS 4, SGI); a POSIX.1g draft
 standard wanted to change it into a `size_t *', and that is what it is
 for SunOS 5.
 Later POSIX drafts have `socklen_t *', and so do the Single Unix Specification
diff --git a/man2/access.2 b/man2/access.2
index a27d6e19d..3d56a24e7 100644
--- a/man2/access.2
+++ b/man2/access.2
@@ -171,7 +171,7 @@ doing so using
 creates a security hole, because the user might exploit the short time
 interval between checking and opening the file to manipulate it.
 .SH "CONFORMING TO"
-SVID, AT&T, POSIX, X/OPEN, 4.3BSD
+SVr4, POSIX.1-2001, 4.3BSD
 .SH "SEE ALSO"
 .BR chmod (2),
 .BR chown (2),
diff --git a/man2/acct.2 b/man2/acct.2
index 35357cbd3..118e4f443 100644
--- a/man2/acct.2
+++ b/man2/acct.2
@@ -115,11 +115,12 @@ refers to a file on a read-only file system.
 .B EUSERS
 There are no more free file structures or we ran out of memory.
 .SH "CONFORMING TO"
-SVr4 (but not POSIX).  SVr4 documents an EBUSY error condition,
-but no EISDIR or ENOSYS. Also AIX and HPUX document EBUSY (attempt is made
-to enable accounting when it is already enabled), as does Solaris
-(attempt is made to enable accounting using the same file that is
-currently being used).
+SVr4 (but not POSIX).  
+.\" SVr4 documents an EBUSY error condition, but no EISDIR or ENOSYS. 
+.\" Also AIX and HP-UX document EBUSY (attempt is made
+.\" to enable accounting when it is already enabled), as does Solaris
+.\" (attempt is made to enable accounting using the same file that is
+.\" currently being used).
 .SH NOTES
 No accounting is produced for programs running when a crash occurs.  In
 particular, nonterminating processes are never accounted for.
diff --git a/man2/alarm.2 b/man2/alarm.2
index f558cd97a..f062d41f2 100644
--- a/man2/alarm.2
+++ b/man2/alarm.2
@@ -77,7 +77,7 @@ is a bad idea.
 Scheduling delays can, as ever, cause the execution of the process to
 be delayed by an arbitrary amount of time.
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX, X/OPEN, 4.3BSD
+SVr4, POSIX.1-2001, 4.3BSD
 .SH "SEE ALSO"
 .BR gettimeofday (2),
 .BR pause (2),
diff --git a/man2/arch_prctl.2 b/man2/arch_prctl.2
index d5161b65c..0526db9da 100644
--- a/man2/arch_prctl.2
+++ b/man2/arch_prctl.2
@@ -117,9 +117,10 @@ is not a valid subcommand.
 is outside the process address space.
 .SH AUTHOR
 Man page written by Andi Kleen.
-.SH CONFORMANCE
+.SH "CONFORMING TO"
 .BR arch_prctl ()
-is a Linux/x86-64 extension and should not be used in programs intended to be portable.
+is a Linux/x86-64 extension and should not be used in programs intended 
+to be portable.
 .SH "SEE ALSO"
 .BR mmap (2),
 .BR modify_ldt (2),
diff --git a/man2/brk.2 b/man2/brk.2
index 56099e1a6..3d744fd2d 100644
--- a/man2/brk.2
+++ b/man2/brk.2
@@ -65,7 +65,7 @@ and
 is set to
 .BR ENOMEM .
 .SH "CONFORMING TO"
-4.3BSD
+4.3BSD; SUSv1, marked LEGACY in SUSv2, removed in POSIX.1-2001.
 
 .BR brk ()
 and 
@@ -82,7 +82,6 @@ Common are \fIint\fP, \fIssize_t\fP, \fIptrdiff_t\fP, \fIintptr_t\fP.
 .\" \fIptrdiff_t\fP (libc4, libc5, ulibc, glibc2.0, 2.1),
 .\" \fIintptr_t\fP (e.g. XPGv5, AIX, SunOS 5.8, 5.9, FreeBSD 4.7, NetBSD 1.6,
 .\" Tru64 5.1, glibc2.2).
-XPGv6 obsoletes this function.
 .SH "SEE ALSO"
 .BR execve (2),
 .BR getrlimit (2),
diff --git a/man2/chdir.2 b/man2/chdir.2
index ddbc037f4..cd8151234 100644
--- a/man2/chdir.2
+++ b/man2/chdir.2
@@ -116,19 +116,7 @@ is only available if
 .B _BSD_SOURCE
 is defined.
 .SH "CONFORMING TO"
-The 
-.BR chdir ()
-call is compatible with SVr4, SVID, POSIX, X/OPEN, 4.4BSD.  
-SVr4 documents
-additional EINTR, ENOLINK, and EMULTIHOP error conditions but has
-no ENOMEM.  POSIX.1 does not have ENOMEM or ELOOP error conditions.
-X/OPEN does not have EFAULT, ENOMEM or EIO error conditions.
-
-The
-.BR fchdir ()
-call is compatible with SVr4, 4.4BSD and X/OPEN.
-SVr4 documents additional EIO, EINTR, and ENOLINK error conditions.
-X/OPEN documents additional EINTR and EIO error conditions.
+SVr4, 4.4BSD, POSIX.1-2001.
 .SH "SEE ALSO"
 .BR chroot (2),
 .BR path_resolution (2),
diff --git a/man2/chmod.2 b/man2/chmod.2
index 41efa3142..000f90300 100644
--- a/man2/chmod.2
+++ b/man2/chmod.2
@@ -185,25 +185,7 @@ See above.
 .B EROFS
 See above.
 .SH "CONFORMING TO"
-The
-.BR chmod ()
-call conforms to SVr4, SVID, POSIX, X/OPEN, 4.4BSD.
-SVr4 documents EINTR, ENOLINK and EMULTIHOP returns, but no
-ENOMEM.  POSIX.1 does not document EFAULT, ENOMEM, or EIO error
-conditions.
-.PP
-The 
-.BR fchmod ()
-call conforms to 4.4BSD and SVr4.
-SVr4 documents additional EINTR and ENOLINK error conditions.
-POSIX requires the
-.BR fchmod ()
-function if at least one of
-.B _POSIX_MAPPED_FILES
-and
-.B _POSIX_SHARED_MEMORY_OBJECTS
-is defined, and documents additional ENOSYS and EINVAL error
-conditions, but does not document EIO.
+4.4BSD, SVr4, POSIX.1-2001.
 .SH "SEE ALSO"
 .BR chown (2),
 .BR execve (2),
diff --git a/man2/chown.2 b/man2/chown.2
index b79345b6b..5a8e849ff 100644
--- a/man2/chown.2
+++ b/man2/chown.2
@@ -158,17 +158,16 @@ is only available if
 .B _BSD_SOURCE
 is defined.
 .SH "CONFORMING TO"
-The
-.BR chown ()
-call conforms to SVr4, SVID, POSIX, X/OPEN.  The 4.4BSD version can only be
+4.4BSD, SVr4, POSIX.1-2001.
+
+The 4.4BSD version can only be
 used by the superuser (that is, ordinary users cannot give away files).
-SVr4 documents EINVAL, EINTR, ENOLINK and EMULTIHOP returns, but no
-ENOMEM.  POSIX.1 does not document ENOMEM or ELOOP error conditions.
-.PP
-The 
-.BR fchown ()
-call conforms to 4.4BSD and SVr4.
-SVr4 documents additional EINVAL, EIO, EINTR, and ENOLINK error conditions.
+.\" chown():
+.\" SVr4 documents EINVAL, EINTR, ENOLINK and EMULTIHOP returns, but no
+.\" ENOMEM.  POSIX.1 does not document ENOMEM or ELOOP error conditions.
+.\" fchown():
+.\" SVr4 documents additional EINVAL, EIO, EINTR, and ENOLINK 
+.\" error conditions.
 .SH RESTRICTIONS
 The \fBchown\fP() semantics are deliberately violated on NFS file systems
 which have UID mapping enabled.  Additionally, the semantics of all system
diff --git a/man2/chroot.2 b/man2/chroot.2
index 7c7d7964e..37738d653 100644
--- a/man2/chroot.2
+++ b/man2/chroot.2
@@ -103,10 +103,10 @@ is not a directory.
 .B EPERM
 The caller has insufficient privilege.
 .SH "CONFORMING TO"
-SVr4, SVID, 4.4BSD, X/OPEN.  This function is not part of POSIX.1.
-SVr4 documents additional EINTR, ENOLINK and EMULTIHOP error conditions.
-X/OPEN does not document EIO, ENOMEM or EFAULT error conditions.
-This interface is marked as legacy by X/OPEN.
+SVr4, 4.4BSD, SUSv2 (marked LEGACY).  
+This function is not part of POSIX.1-2001.
+.\" SVr4 documents additional EINTR, ENOLINK and EMULTIHOP error conditions.
+.\" X/OPEN does not document EIO, ENOMEM or EFAULT error conditions.
 .SH NOTES
 A child process created via
 .BR fork (2)
diff --git a/man2/close.2 b/man2/close.2
index 4beed205b..084d40d14 100644
--- a/man2/close.2
+++ b/man2/close.2
@@ -79,10 +79,12 @@ call was interrupted by a signal.
 .B EIO
 An I/O error occurred.
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX, X/OPEN, 4.3BSD.  SVr4 documents an additional
-ENOLINK error condition.
+SVr4, 4.3BSD, POSIX.1-2001.  
+.\" SVr4 documents an additional ENOLINK error condition.
 .SH NOTES
-Not checking the return value of close is a common but nevertheless
+Not checking the return value of 
+.BR close ()
+is a common but nevertheless
 serious programming error.  It is quite possible that errors on a
 previous
 .BR write (2)
diff --git a/man2/dup.2 b/man2/dup.2
index 42e14d66d..a16fe7376 100644
--- a/man2/dup.2
+++ b/man2/dup.2
@@ -124,9 +124,10 @@ without closing
 .I newfd
 first.
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX, X/OPEN, 4.3BSD. SVr4 documents additional
-EINTR and ENOLINK error conditions.  POSIX.1 adds EINTR.
-The EBUSY return is Linux-specific.
+SVr4, 4.3BSD, POSIX.1-2001. 
+.\" SVr4 documents additional
+.\" EINTR and ENOLINK error conditions.  POSIX.1 adds EINTR.
+.\" The EBUSY return is Linux-specific.
 .SH "SEE ALSO"
 .BR close (2),
 .BR fcntl (2),
diff --git a/man2/execve.2 b/man2/execve.2
index 706062d27..0a6a7957c 100644
--- a/man2/execve.2
+++ b/man2/execve.2
@@ -185,11 +185,13 @@ file has an SUID or SGID bit set.
 .B ETXTBSY
 Executable was open for writing by one or more processes.
 .SH "CONFORMING TO"
-SVr4, SVID, X/OPEN, 4.3BSD.  POSIX does not document the #!  behavior
-but is otherwise compatible.  SVr4 documents additional error
-conditions EAGAIN, EINTR, ELIBACC, ENOLINK, EMULTIHOP; POSIX does not
-document ETXTBSY, EPERM, EFAULT, ELOOP, EIO, ENFILE, EMFILE, EINVAL,
-EISDIR or ELIBBAD error conditions.
+SVr4, 4.3BSD, POSIX.1-2001.  
+POSIX.1 does not document the #!  behavior
+but is otherwise compatible.  
+.\" SVr4 documents additional error
+.\" conditions EAGAIN, EINTR, ELIBACC, ENOLINK, EMULTIHOP; POSIX does not
+.\" document ETXTBSY, EPERM, EFAULT, ELOOP, EIO, ENFILE, EMFILE, EINVAL,
+.\" EISDIR or ELIBBAD error conditions.
 .SH NOTES
 SUID and SGID processes can not be \fBptrace\fP()d.
 
diff --git a/man2/fcntl.2 b/man2/fcntl.2
index 44585cc2e..78a947fb1 100644
--- a/man2/fcntl.2
+++ b/man2/fcntl.2
@@ -150,7 +150,7 @@ On Linux this command can only change the
 and 
 .BR O_NONBLOCK 
 flags.
-.\" FIXME According to SUSv3, O_SYNC should also be modifiable
+.\" FIXME According to POSIX.1-2001, O_SYNC should also be modifiable
 .\" via fcntl(2), but currently Linux does not permit this
 .\" See http://bugzilla.kernel.org/show_bug.cgi?id=5994
 .P
@@ -877,7 +877,7 @@ placed by
 and
 .BR fcntl (2).
 
-POSIX 1003.1-2001 allows
+POSIX.1-2001 allows
 .I l_len
 to be negative. (And if it is, the interval described by the lock
 covers bytes
@@ -930,19 +930,16 @@ has permission to send signals to.
 Despite this error return, the file descriptor owner is set,
 and signals will be sent to the owner.
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX, X/OPEN, 4.3BSD.  Only the operations F_DUPFD,
+SVr4, 4.3BSD, POSIX.1-2001.  
+Only the operations F_DUPFD,
 F_GETFD, F_SETFD, F_GETFL, F_SETFL, F_GETLK, F_SETLK, F_SETLKW, 
 F_GETOWN, and F_SETOWN are specified in POSIX.1.
+
 F_GETSIG, F_SETSIG, F_NOTIFY, F_GETLEASE, and F_SETLEASE
 are Linux specific.
 (Define the _GNU_SOURCE macro to obtain these definitions.)
-The flags legal for F_GETFL/F_SETFL are those supported by
-.BR open (2)
-and vary between these systems; O_APPEND, O_NONBLOCK, O_RDONLY,
-and O_RDWR are specified in POSIX.1.  SVr4 supports several other
-options and flags not documented here.
-.PP
-SVr4 documents additional EIO, ENOLINK and EOVERFLOW error conditions.
+.\" .PP
+.\" SVr4 documents additional EIO, ENOLINK and EOVERFLOW error conditions.
 .SH "SEE ALSO"
 .BR dup2 (2),
 .BR flock (2),
diff --git a/man2/fdatasync.2 b/man2/fdatasync.2
index 5e6ce36f1..cc56b8462 100644
--- a/man2/fdatasync.2
+++ b/man2/fdatasync.2
@@ -82,11 +82,11 @@ is available,
 .B _POSIX_SYNCHRONIZED_IO
 is defined in <unistd.h> to a value greater than 0. (See also
 .BR sysconf (3).)
-.\" POSIX 1003.1-2001: It shall be defined to -1 or 0 or 200112L.
+.\" POSIX.1-2001: It shall be defined to -1 or 0 or 200112L.
 .\" -1: unavailable, 0: ask using sysconf().
 .\" glibc defines them to 1.
 .SH "CONFORMING TO"
-POSIX.1b (formerly POSIX.4)
+POSIX.1b
 .SH "SEE ALSO"
 .BR fsync (2)
 .BR sync_file_range (2),
diff --git a/man2/fork.2 b/man2/fork.2
index 37b91b78e..33c1235c0 100644
--- a/man2/fork.2
+++ b/man2/fork.2
@@ -79,9 +79,7 @@ capability.
 .BR fork ()
 failed to allocate the necessary kernel structures because memory is tight.
 .SH "CONFORMING TO"
-The
-.BR fork ()
-call conforms to SVr4, SVID, POSIX, X/OPEN, 4.3BSD.
+SVr4, 4.3BSD, POSIX.1-2001.
 .SH EXAMPLE
 See
 .BR pipe (2)
diff --git a/man2/getcontext.2 b/man2/getcontext.2
index 152bbd888..995e72c61 100644
--- a/man2/getcontext.2
+++ b/man2/getcontext.2
@@ -116,7 +116,7 @@ Do not leave the handler using \fIlongjmp\fP(): it is undefined
 what would happen with contexts. Use \fIsiglongjmp\fP() or
 \fIsetcontext\fP() instead.
 .SH "CONFORMING TO"
-SUSv2
+SUSv2, POSIX.1-2001.
 .SH "SEE ALSO"
 .BR sigaction (2),
 .BR sigaltstack (2),
diff --git a/man2/getdents.2 b/man2/getdents.2
index dbdf48d2d..247dd235a 100644
--- a/man2/getdents.2
+++ b/man2/getdents.2
@@ -113,7 +113,8 @@ No such directory.
 .B ENOTDIR
 File descriptor does not refer to a directory.
 .SH "CONFORMING TO"
-SVr4, SVID.  SVr4 documents additional ENOLINK, EIO error conditions.
+SVr4.
+.\" SVr4 documents additional ENOLINK, EIO error conditions.
 .SH "SEE ALSO"
 .BR readdir (2),
 .BR readdir (3)
diff --git a/man2/getdomainname.2 b/man2/getdomainname.2
index bd51f49db..3f3b0d177 100644
--- a/man2/getdomainname.2
+++ b/man2/getdomainname.2
@@ -77,6 +77,7 @@ the caller is unprivileged (Linux: does not have the
 capability).
 .SH "CONFORMING TO"
 POSIX does not specify these calls.
+.\" But they appear on most systems...
 .SH "SEE ALSO"
 .BR gethostname (2),
 .BR sethostname (2),
diff --git a/man2/getgid.2 b/man2/getgid.2
index 9c4f1a799..5fbc40657 100644
--- a/man2/getgid.2
+++ b/man2/getgid.2
@@ -42,7 +42,7 @@ returns the effective group ID of the current process.
 .SH ERRORS
 These functions are always successful.
 .SH "CONFORMING TO"
-POSIX, 4.3BSD
+POSIX.1-2001, 4.3BSD
 .SH "SEE ALSO"
 .BR setgid (2),
 .BR setregid (2)
diff --git a/man2/getgroups.2 b/man2/getgroups.2
index 8d04a1983..cdb5644fb 100644
--- a/man2/getgroups.2
+++ b/man2/getgroups.2
@@ -116,12 +116,13 @@ is only available if
 .B _BSD_SOURCE
 is defined.
 .SH "CONFORMING TO"
-SVr4, SVID (issue 4 only; these calls were not present in SVr3),
-X/OPEN, 4.3BSD.  The
+SVr4, 4.3BSD.
+The
 .BR getgroups ()
-function is in POSIX.1.  Since
+function is in POSIX.1-2001.
+Since
 .BR setgroups ()
-requires privilege, it is not covered by POSIX.1.
+requires privilege, it is not covered by POSIX.1-2001.
 .SH "SEE ALSO"
 .BR getgid (2),
 .BR setgid (2),
diff --git a/man2/gethostid.2 b/man2/gethostid.2
index b424c6ebb..c251efdfc 100644
--- a/man2/gethostid.2
+++ b/man2/gethostid.2
@@ -56,9 +56,12 @@ argument is stored in the file
 returns the 32-bit identifier for the current host as set by
 .BR sethostid (2).
 .SH "CONFORMING TO"
-4.2BSD.  These functions were dropped in 4.4BSD.
-POSIX.1 does not define these functions, but ISO/IEC 9945-1:1990 mentions
-them in B.4.4.1.  SVr4 includes 
+4.2BSD; these functions were dropped in 4.4BSD.
+SVr4 includes 
+.BR gethostid ()
+but not
+.BR sethostid ().
+POSIX.1-2001 specifies 
 .BR gethostid ()
 but not
 .BR sethostid ().
diff --git a/man2/gethostname.2 b/man2/gethostname.2
index 8861bd4c4..b808143da 100644
--- a/man2/gethostname.2
+++ b/man2/gethostname.2
@@ -79,13 +79,13 @@ the caller did not have the
 capability.
 .SH "CONFORMING TO"
 SVr4, 4.4BSD  (this interfaces first appeared in 4.2BSD).
-POSIX 1003.1-2001 specifies
+POSIX.1-2001 specifies
 .BR gethostname ()
 but not
 .BR sethostname ().
 .SH NOTES
 SUSv2 guarantees that `Host names are limited to 255 bytes'.
-POSIX 1003.1-2001 guarantees that `Host names (not including
+POSIX.1-2001 guarantees that `Host names (not including
 the terminating null byte) are limited to HOST_NAME_MAX bytes'.
 .SH "GLIBC NOTES"
 The GNU C library implements 
diff --git a/man2/getpagesize.2 b/man2/getpagesize.2
index a9263ce80..3dc180cf0 100644
--- a/man2/getpagesize.2
+++ b/man2/getpagesize.2
@@ -61,9 +61,9 @@ This call first appeared in 4.2BSD.
 SVr4, 4.4BSD, SUSv2.
 In SUSv2 the
 .BR getpagesize ()
-call is labeled "legacy", and in POSIX 1003.1-2001
+call is labeled LEGACY, and in POSIX.1-2001
 it has been dropped.
-HPUX does not have this call.
+HP-UX does not have this call.
 .SH NOTES
 Whether
 .BR getpagesize ()
diff --git a/man2/getpeername.2 b/man2/getpeername.2
index 9158d7b30..bb053c714 100644
--- a/man2/getpeername.2
+++ b/man2/getpeername.2
@@ -90,12 +90,16 @@ is a file, not a socket.
 .SH "CONFORMING TO"
 SVr4, 4.4BSD (the
 .BR getpeername ()
-function call first appeared in 4.2BSD).
+function call first appeared in 4.2BSD), POSIX.1-2001.
 .SH NOTE
 The third argument of 
 .BR getpeername ()
-is in reality an `int *' (and this is what 4.x BSD and libc4 and libc5 have).
-Some POSIX confusion resulted in the present socklen_t, also used by glibc.
+is in reality an 
+.I int *
+(and this is what 4.x BSD and libc4 and libc5 have).
+Some POSIX confusion resulted in the present 
+.IR socklen_t , 
+also used by glibc.
 See also
 .BR accept (2).
 .SH "SEE ALSO"
diff --git a/man2/getpid.2 b/man2/getpid.2
index 49d599a54..07611fe30 100644
--- a/man2/getpid.2
+++ b/man2/getpid.2
@@ -39,7 +39,7 @@ routines that generate unique temporary filenames.)
 .BR getppid ()
 returns the process ID of the parent of the current process.
 .SH "CONFORMING TO"
-POSIX, 4.3BSD, SVID
+POSIX.1-2001, 4.3BSD, SVr4
 .SH "SEE ALSO"
 .BR fork (2),
 .BR kill (2),
diff --git a/man2/getpriority.2 b/man2/getpriority.2
index fc231808c..d7fe13da8 100644
--- a/man2/getpriority.2
+++ b/man2/getpriority.2
@@ -158,7 +158,7 @@ The nice value is preserved across
 .BR execve (2). 
 
 The details on the condition for EPERM depend on the system.
-The above description is what SUSv3 says, and seems to be followed on
+The above description is what POSIX.1-2001 says, and seems to be followed on
 all System V-like systems.
 Linux kernels before 2.6.12 required the real or 
 effective user ID of the caller to match
@@ -200,7 +200,8 @@ structure with fields of type
 defined in
 .IR <sys/time.h> .)
 .SH "CONFORMING TO"
-SVr4, 4.4BSD (these function calls first appeared in 4.2BSD).
+SVr4, 4.4BSD (these function calls first appeared in 4.2BSD),
+POSIX.1-2001.
 .SH "SEE ALSO"
 .BR nice (1),
 .BR fork (2),
diff --git a/man2/getresuid.2 b/man2/getresuid.2
index d9ead87ac..08af31b99 100644
--- a/man2/getresuid.2
+++ b/man2/getresuid.2
@@ -52,7 +52,9 @@ is set appropriately.
 One of the arguments specified an address outside the calling program's
 address space.
 .SH "CONFORMING TO"
-This call is Linux-specific.
+These calls are non-standard; 
+they also appear on HP-UX and some of the BSDs.
+
 The prototype is given by glibc since version 2.3.2
 provided _GNU_SOURCE is defined.
 .SH "SEE ALSO"
diff --git a/man2/getrlimit.2 b/man2/getrlimit.2
index 51fd083f1..71d5a5647 100644
--- a/man2/getrlimit.2
+++ b/man2/getrlimit.2
@@ -401,7 +401,7 @@ inherits its parents resource limits.
 Resource limits are preserved across
 .BR execve (2).
 .SH "CONFORMING TO"
-SVr4, 4.3BSD.
+SVr4, 4.3BSD, POSIX.1-2001.
 .BR RLIMIT_MEMLOCK
 and 
 .BR RLIMIT_NPROC
diff --git a/man2/getrusage.2 b/man2/getrusage.2
index f8cb3b7a2..7b1a6726d 100644
--- a/man2/getrusage.2
+++ b/man2/getrusage.2
@@ -88,7 +88,13 @@ points outside the accessible address space.
 .I who
 is invalid.
 .SH "CONFORMING TO"
-SVr4, 4.3BSD
+SVr4, 4.3BSD. 
+POSIX.1-2001 specifies 
+.BR getrusage (),
+but only specifies the fields
+.I ru_utime
+and
+.IR ru_stime .
 .SH NOTES
 Including
 .I <sys/time.h>
@@ -105,7 +111,7 @@ is set to
 then the resource usages of child processes
 are automatically included in the value returned by
 .BR RUSAGE_CHILDREN ,
-although POSIX 1003.1-2001 explicitly prohibits this.
+although POSIX.1-2001 explicitly prohibits this.
 This non-conformance is rectified in Linux 2.6.9 and later.
 .\" See the description of getrusage() in XSH.
 .\" A similar statement was also in SUSv2.
diff --git a/man2/getsid.2 b/man2/getsid.2
index d663205df..9f3067d4f 100644
--- a/man2/getsid.2
+++ b/man2/getsid.2
@@ -53,7 +53,7 @@ No process with process ID
 .I p
 was found.
 .SH "CONFORMING TO"
-SVr4, POSIX 1003.1-2001.
+SVr4, POSIX.1-2001.
 .SH NOTES
 Linux does not return EPERM.
 .LP
diff --git a/man2/getsockname.2 b/man2/getsockname.2
index c0a4b575f..3807af44e 100644
--- a/man2/getsockname.2
+++ b/man2/getsockname.2
@@ -87,8 +87,9 @@ is a file, not a socket.
 .SH "CONFORMING TO"
 SVr4, 4.4BSD (the
 .BR getsockname ()
-function call appeared in 4.2BSD).  SVr4 documents additional ENOMEM
-and ENOSR error codes. 
+function call appeared in 4.2BSD), POSIX.1-2001.
+.\" SVr4 documents additional ENOMEM
+.\" and ENOSR error codes. 
 .SH NOTE
 The third argument of 
 .BR getsockname ()
diff --git a/man2/getsockopt.2 b/man2/getsockopt.2
index 250b97f47..7b37e970a 100644
--- a/man2/getsockopt.2
+++ b/man2/getsockopt.2
@@ -157,16 +157,23 @@ The argument
 .I s
 is a file, not a socket.
 .SH "CONFORMING TO"
-SVr4, 4.4BSD (these system calls first appeared in 4.2BSD).
-SVr4 documents additional ENOMEM and ENOSR error codes, but does
-not document the 
-.BR SO_SNDLOWAT ", " SO_RCVLOWAT ", " SO_SNDTIMEO ", " SO_RCVTIMEO
-options
+SVr4, 4.4BSD (these system calls first appeared in 4.2BSD), 
+ POSIX.1-2001.
+.\" SVr4 documents additional ENOMEM and ENOSR error codes, but does
+.\" not document the 
+.\" .BR SO_SNDLOWAT ", " SO_RCVLOWAT ", " SO_SNDTIMEO ", " SO_RCVTIMEO
+.\" options
 .SH NOTE
-The fifth argument of 
+The 
+.I optlen
+argument of 
 .BR getsockopt " and " setsockopt
-is in reality an int [*] (and this is what 4.x BSD and libc4 and libc5 have).
-Some POSIX confusion resulted in the present socklen_t, also used by glibc.
+is in reality an 
+.I "int [*]"
+(and this is what 4.x BSD and libc4 and libc5 have).
+Some POSIX confusion resulted in the present 
+.IR socklen_t , 
+also used by glibc.
 See also
 .BR accept (2).
 .SH BUGS
diff --git a/man2/gettimeofday.2 b/man2/gettimeofday.2
index 4eafac025..812953cd5 100644
--- a/man2/gettimeofday.2
+++ b/man2/gettimeofday.2
@@ -224,7 +224,8 @@ Traditionally, the fields of
 .I struct timeval 
 were longs.
 .SH "CONFORMING TO"
-SVr4, 4.3BSD. POSIX 1003.1-2001 describes
+SVr4, 4.3BSD. 
+POSIX.1-2001 describes
 .BR gettimeofday ()
 but not 
 .BR settimeofday ().
diff --git a/man2/getuid.2 b/man2/getuid.2
index dbae7429d..a2fcd0fa7 100644
--- a/man2/getuid.2
+++ b/man2/getuid.2
@@ -43,7 +43,7 @@ returns the effective user ID of the current process.
 .SH ERRORS
 These functions are always successful.
 .SH "CONFORMING TO"
-POSIX, 4.3BSD.
+POSIX.1-2001, 4.3BSD.
 .SH HISTORY
 In Unix V6 the \fBgetuid\fP() call returned (euid << 8) + uid.
 Unix V7 introduced separate calls \fBgetuid\fP() and \fBgeteuid\fP().
diff --git a/man2/ioctl.2 b/man2/ioctl.2
index 0050ec60a..7474ec4b4 100644
--- a/man2/ioctl.2
+++ b/man2/ioctl.2
@@ -116,15 +116,18 @@ Often the
 call has unwanted side effects, that can be avoided under Linux
 by giving it the O_NONBLOCK flag.
 .SH "CONFORMING TO"
-No single standard.  Arguments, returns, and semantics of
+No single standard.  
+Arguments, returns, and semantics of
 .BR ioctl (2) 
 vary according to the device driver in question (the call is used as a
 catch-all for operations that don't cleanly fit the Unix stream I/O
-model). See 
+model). 
+See 
 .BR ioctl_list (2)
 for a list of many of the known 
 .BR ioctl ()
-calls.  The
+calls.  
+The
 .BR ioctl ()
 function call appeared in Version 7 AT&T Unix.
 .SH "SEE ALSO"
diff --git a/man2/kill.2 b/man2/kill.2
index 13ac74a39..d9e7b9033 100644
--- a/man2/kill.2
+++ b/man2/kill.2
@@ -109,13 +109,13 @@ has explicitly installed signal handlers.
 This is done to assure the
 system is not brought down accidentally.
 .LP
-POSIX 1003.1-2001 requires that \fIkill(\-1,sig)\fP send \fIsig\fP
+POSIX.1-2001 requires that \fIkill(\-1,sig)\fP send \fIsig\fP
 to all processes that the current process may send signals to,
 except possibly for some implementation-defined system processes.
 Linux allows a process to signal itself, but on Linux the call
 \fIkill(\-1,sig)\fP does not signal the current process.
 .LP
-POSIX 1003.1-2003 requires that if a process sends a signal to itself,
+POSIX.1-2001 requires that if a process sends a signal to itself,
 and the sending thread does not have the signal blocked, 
 and no other thread
 has it unblocked or is waiting for it in \fIsigwait\fP(), at least one
@@ -143,10 +143,10 @@ or the real user ID of the sender matched that of the receiver.
 From kernel 1.2.3 until 1.3.77, a signal could be sent if the
 effective user ID of the sender matched either the real or effective
 user ID of the receiver.
-The current rules, which conform to POSIX 1003.1-2001, were adopted
+The current rules, which conform to POSIX.1-2001, were adopted
 in kernel 1.3.78.
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX.1, X/OPEN, 4.3BSD, POSIX 1003.1-2001
+SVr4, 4.3BSD, POSIX.1-2001
 .SH "SEE ALSO"
 .BR _exit (2),
 .BR killpg (2),
diff --git a/man2/killpg.2 b/man2/killpg.2
index 51169c600..eed3f8b36 100644
--- a/man2/killpg.2
+++ b/man2/killpg.2
@@ -105,7 +105,7 @@ for all target processes.
 .SH "CONFORMING TO"
 SVr4, 4.4BSD (The
 .BR killpg ()
-function call first appeared in 4.0BSD).
+function call first appeared in 4BSD), POSIX.1-2001.
 .SH "SEE ALSO"
 .BR getpgrp (2),
 .BR kill (2),
diff --git a/man2/link.2 b/man2/link.2
index fe046241f..e762da65a 100644
--- a/man2/link.2
+++ b/man2/link.2
@@ -152,9 +152,10 @@ Some other implementations behave in the same manner as Linux.
 .\" thread in the Austin mailing list reported that some
 .\" other (System V) implementations did/do the same -- MTK, Apr 05
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX, 4.3BSD, X/OPEN.  SVr4 documents additional ENOLINK and
-EMULTIHOP error conditions; POSIX.1 does not document ELOOP.
-X/OPEN does not document EFAULT, ENOMEM or EIO.
+SVr4, 4.3BSD, POSIX.1-2001 (except as noted above).
+.\" SVr4 documents additional ENOLINK and
+.\" EMULTIHOP error conditions; POSIX.1 does not document ELOOP.
+.\" X/OPEN does not document EFAULT, ENOMEM or EIO.
 .SH BUGS
 On NFS file systems, the return code may be wrong in case the NFS server
 performs the link creation and dies before it can say so.  Use
diff --git a/man2/listen.2 b/man2/listen.2
index f388ce766..543b25b24 100644
--- a/man2/listen.2
+++ b/man2/listen.2
@@ -110,7 +110,8 @@ The socket is not of a type that supports the
 .BR listen ()
 operation.
 .SH "CONFORMING TO"
-Single Unix, 4.4BSD, POSIX 1003.1g draft. The
+4.4BSD, POSIX.1-2001.
+The
 .BR listen ()
 function call first appeared in 4.2BSD. 
 .SH BUGS
diff --git a/man2/lseek.2 b/man2/lseek.2
index 14ccdba0c..83b73203d 100644
--- a/man2/lseek.2
+++ b/man2/lseek.2
@@ -114,10 +114,11 @@ The resulting file offset cannot be represented in an
 .I fildes
 is associated with a pipe, socket, or FIFO.
 .SH "CONFORMING TO"
-SVr4, POSIX, 4.3BSD
+SVr4, 4.3BSD, POSIX.1-2001.
 .SH RESTRICTIONS
 Some devices are incapable of seeking and POSIX does not specify which
-devices must support it.
+devices must support 
+.BR lseek ().
 
 Linux specific restrictions: using \fBlseek\fP() on a tty device returns
 \fBESPIPE\fP.
@@ -143,7 +144,7 @@ L_INCR	SEEK_CUR
 L_XTND	SEEK_END
 .TE
 .PP
-SVR1-3 returns \fIlong\fP instead of \fIoff_t\fP, BSD returns \fIint\fP.
+SVr1-3 returns \fIlong\fP instead of \fIoff_t\fP, BSD returns \fIint\fP.
 .PP
 Note that file descriptors created by
 .BR dup (2)
diff --git a/man2/madvise.2 b/man2/madvise.2
index ecad30dbb..ec926dce8 100644
--- a/man2/madvise.2
+++ b/man2/madvise.2
@@ -146,9 +146,9 @@ The
 .BR madvise ()
 function first appeared in 4.4BSD.
 .SH "CONFORMING TO"
-POSIX.1b (POSIX.4).
-POSIX 1003.1-2001 describes
-.B posix_madvise
+POSIX.1b.
+POSIX.1-2001 describes
+.BR posix_madvise ()
 with constants POSIX_MADV_NORMAL, etc.,
 with a behaviour close to that described here. There is a similar
 .BR posix_fadvise ()
diff --git a/man2/mkdir.2 b/man2/mkdir.2
index cc93f5009..ea0c02e53 100644
--- a/man2/mkdir.2
+++ b/man2/mkdir.2
@@ -103,8 +103,8 @@ does not support the creation of directories.
 .I pathname
 refers to a file on a read-only filesystem.
 .SH "CONFORMING TO"
-SVr4, POSIX, BSD, X/OPEN.  SVr4 documents additional EIO, EMULTIHOP
-and ENOLINK error conditions; POSIX.1 omits ELOOP.
+SVr4, BSD, POSIX.1-2001.
+.\" SVr4 documents additional EIO, EMULTIHOP
 .SH NOTES
 Under Linux apart from the permission bits, only the S_ISVTX mode bit
 is honored. That is, under Linux the created directory actually gets mode
diff --git a/man2/mknod.2 b/man2/mknod.2
index 74e6b296e..21318f025 100644
--- a/man2/mknod.2
+++ b/man2/mknod.2
@@ -144,12 +144,12 @@ does not support the type of node requested.
 .I pathname
 refers to a file on a read-only filesystem.
 .SH "CONFORMING TO"
-SVr4 (but the call requires privilege and is thus not in POSIX),
-4.4BSD.  The Linux version differs from the SVr4 version in that it
-does not require root permission to create pipes, also in that no
-EMULTIHOP, ENOLINK, or EINTR error is documented.
+SVr4, 4.4BSD, POSIX.1-2001 (but see below).  
+.\" The Linux version differs from the SVr4 version in that it
+.\" does not require root permission to create pipes, also in that no
+.\" EMULTIHOP, ENOLINK, or EINTR error is documented.
 .SH NOTES
-POSIX 1003.1-2001 says: "The only portable use of
+POSIX.1-2001 says: "The only portable use of
 .BR mknod ()
 is to create a FIFO-special file. If
 .I mode
diff --git a/man2/mlock.2 b/man2/mlock.2
index 8c21fb67c..133ac0c47 100644
--- a/man2/mlock.2
+++ b/man2/mlock.2
@@ -171,7 +171,7 @@ and
 automatically round
 .I addr
 down to the nearest page boundary.
-However, POSIX 1003.1-2001 allows an implementation to require that
+However, POSIX.1-2001 allows an implementation to require that
 .I addr
 is page aligned, so portable applications should ensure this.
 .SS "Limits and permissions"
@@ -307,7 +307,7 @@ are available,
 .B _POSIX_MEMLOCK
 is defined in <unistd.h> to a value greater than 0. (See also
 .BR sysconf (3).)
-.\" POSIX 1003.1-2001: It shall be defined to -1 or 0 or 200112L.
+.\" POSIX.1-2001: It shall be defined to -1 or 0 or 200112L.
 .\" -1: unavailable, 0: ask using sysconf().
 .\" glibc defines it to 1.
 .SH "CONFORMING TO"
diff --git a/man2/mmap.2 b/man2/mmap.2
index 33a4f9e67..a8be8cedf 100644
--- a/man2/mmap.2
+++ b/man2/mmap.2
@@ -126,7 +126,7 @@ You must specify exactly one of
 and 
 .BR MAP_PRIVATE .
 .LP
-The above three flags are described in POSIX.1b (formerly POSIX.4) and SUSv2.
+The above three flags are described in POSIX.1b and SUSv2.
 Linux also knows about the following non-standard flags:
 .TP
 .B MAP_DENYWRITE
@@ -344,7 +344,7 @@ or
 .\" jbl - not sure this actually happens ? see generic_file_mmap
 .\" mtk: Before 2.6.12, a length of 0 was permitted: mmap() did 
 .\" not create mapping, but just returned 'start'; since 2.6.12, 
-.\" a length of 0 yields EINVAL (as required by SUSv3).
+.\" a length of 0 yields EINVAL (as required by POSIX.1-2001).
 .TP
 .B ENFILE
 .\" This is for shared anonymous segments
@@ -396,13 +396,13 @@ are available,
 .B _POSIX_MAPPED_FILES
 is defined in <unistd.h> to a value greater than 0. (See also
 .BR sysconf (3).)
-.\" POSIX 1003.1-2001: It shall be defined to -1 or 0 or 200112L.
+.\" POSIX.1-2001: It shall be defined to -1 or 0 or 200112L.
 .\" -1: unavailable, 0: ask using sysconf().
 .\" glibc defines it to 1.
 .SH "CONFORMING TO"
-SVr4, POSIX.1b (formerly POSIX.4), 4.4BSD, SUSv2.
-SVr4 documents additional error codes ENXIO and ENODEV.
-SUSv2 documents additional error codes EMFILE and EOVERFLOW.
+SVr4, 4.4BSD, POSIX.1-2001.
+.\" SVr4 documents additional error codes ENXIO and ENODEV.
+.\" SUSv2 documents additional error codes EMFILE and EOVERFLOW.
 .SH BUGS
 On Linux there are no guarantees like those suggested above under 
 .BR MAP_NORESERVE . 
diff --git a/man2/mprotect.2 b/man2/mprotect.2
index 8ac8de66a..317d6ad0c 100644
--- a/man2/mprotect.2
+++ b/man2/mprotect.2
@@ -138,8 +138,9 @@ main(void)
 }
 .fi
 .SH "CONFORMING TO"
-SVr4, POSIX.1b (formerly POSIX.4).  SVr4 defines an additional error
-code EAGAIN. The SVr4 error conditions don't map neatly onto Linux's.
+SVr4, POSIX.1-2001.
+.\" SVr4 defines an additional error
+.\" code EAGAIN. The SVr4 error conditions don't map neatly onto Linux's.
 POSIX says that
 .BR mprotect ()
 can be used only on regions of memory obtained from
diff --git a/man2/msgctl.2 b/man2/msgctl.2
index 73e81159a..b6a3a4af6 100644
--- a/man2/msgctl.2
+++ b/man2/msgctl.2
@@ -323,7 +323,8 @@ a recompilation under glibc-2.1.91 or later should suffice.
 (The kernel distinguishes old and new calls by an IPC_64 flag in
 .IR cmd .)
 .SH "CONFORMING TO"
-SVr4, SVID.  SVID does not document the EIDRM error condition.
+SVr4, POSIX.1-2001.
+.\" SVID does not document the EIDRM error condition.
 .SH "SEE ALSO"
 .BR msgget (2),
 .BR msgrcv (2),
diff --git a/man2/msgget.2 b/man2/msgget.2
index fef60f645..635c1fdd0 100644
--- a/man2/msgget.2
+++ b/man2/msgget.2
@@ -206,7 +206,8 @@ dependent
 The name choice IPC_PRIVATE was perhaps unfortunate, IPC_NEW
 would more clearly show its function.
 .SH "CONFORMING TO"
-SVr4, SVID.
+SVr4, POSIX.1-2001.
+.SH "LINUX NOTES"
 Until version 2.3.20 Linux would return EIDRM for a
 .BR msgget ()
 on a message queue scheduled for deletion.
diff --git a/man2/msgop.2 b/man2/msgop.2
index 8d017ceab..5958e9bb3 100644
--- a/man2/msgop.2
+++ b/man2/msgop.2
@@ -397,7 +397,7 @@ was specified in
 .I msgflg
 and no message of the requested type existed on the message queue.
 .SH "CONFORMING TO"
-SVr4, SVID, SUSv3.
+SVr4, POSIX.1-2001.
 .SH NOTES
 The 
 .I msgp
diff --git a/man2/msync.2 b/man2/msync.2
index 33236ff59..65cacf119 100644
--- a/man2/msync.2
+++ b/man2/msync.2
@@ -77,11 +77,11 @@ and
 .B _POSIX_SYNCHRONIZED_IO
 are defined in <unistd.h> to a value greater than 0. (See also
 .BR sysconf (3).)
-.\" POSIX 1003.1-2001: It shall be defined to -1 or 0 or 200112L.
+.\" POSIX.1-2001: It shall be defined to -1 or 0 or 200112L.
 .\" -1: unavailable, 0: ask using sysconf().
 .\" glibc defines them to 1.
 .SH "CONFORMING TO"
-POSIX.1b (formerly POSIX.4)
+POSIX.1-2001.
 
 This call was introduced in Linux 1.3.21, and then used EFAULT instead of
 ENOMEM. In Linux 2.4.19 this was changed to the POSIX value ENOMEM.
diff --git a/man2/nanosleep.2 b/man2/nanosleep.2
index f93846937..d6fbcc5fb 100644
--- a/man2/nanosleep.2
+++ b/man2/nanosleep.2
@@ -142,7 +142,7 @@ If the system call is subsequently restarted,
 then the time that the process spent in the stopped state is 
 \fInot\fP counted against the sleep interval.
 .SH "CONFORMING TO"
-POSIX.1b (formerly POSIX.4).
+POSIX.1-2001.
 .SH "SEE ALSO"
 .BR sched_setscheduler (2),
 .BR timer_create (2),
diff --git a/man2/nice.2 b/man2/nice.2
index 60c3add4a..79d4d6490 100644
--- a/man2/nice.2
+++ b/man2/nice.2
@@ -65,11 +65,12 @@ capability is required.
 resource limit in
 .BR setrlimit (2).)
 .SH "CONFORMING TO"
-SVr4, SVID EXT, AT&T, X/OPEN, 4.3BSD. However, the Linux and (g)libc
+SVr4, 4.3BSD, POSIX.1-2001. 
+However, the Linux and (g)libc
 (earlier than glibc 2.2.4) return value is nonstandard, see below.
 SVr4 documents an additional EINVAL error code.
 .SH NOTES
-SUSv2 and POSIX 1003.1-2003 specify that
+SUSv2 and POSIX.1-2001 specify that
 .BR nice ()
 should return the new nice value.
 However, the Linux syscall and the
diff --git a/man2/open.2 b/man2/open.2
index 1bcf1da57..499488eaf 100644
--- a/man2/open.2
+++ b/man2/open.2
@@ -482,7 +482,7 @@ This is typically used to open devices in order to get a file descriptor
 for use with
 .BR ioctl (2).
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX, X/OPEN, 4.3BSD.
+SVr4, 4.3BSD, POSIX.1-2001.
 The
 .BR O_NOATIME ,
 .BR O_NOFOLLOW ,
diff --git a/man2/pause.2 b/man2/pause.2
index e3e113e03..ba48082ac 100644
--- a/man2/pause.2
+++ b/man2/pause.2
@@ -60,7 +60,7 @@ is set to
 .B EINTR
 a signal was caught and the signal-catching function returned.
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX, X/OPEN, 4.3BSD
+SVr4, 4.3BSD, POSIX.1-2001.
 .SH "SEE ALSO"
 .BR kill (2),
 .BR select (2),
diff --git a/man2/pipe.2 b/man2/pipe.2
index 5e1dc4b76..5e3b97843 100644
--- a/man2/pipe.2
+++ b/man2/pipe.2
@@ -59,7 +59,7 @@ Too many file descriptors are in use by the process.
 .B ENFILE
 The system limit on the total number of open files has been reached.
 .SH "CONFORMING TO"
-POSIX.1
+POSIX.1-2001.
 .SH EXAMPLE
 .\" fork.2 refers to this example program.
 The following program creates a pipe, and then 
diff --git a/man2/posix_fadvise.2 b/man2/posix_fadvise.2
index 19d33a1b8..28c931ba6 100644
--- a/man2/posix_fadvise.2
+++ b/man2/posix_fadvise.2
@@ -106,10 +106,14 @@ Pages that have not yet been written out will be unaffected, so if the
 application wishes to guarantee that pages will be released, it should
 call \fBfsync\fP() or \fBfdatasync\fP() first.
 .SH "CONFORMING TO"
-SUSv3 (Advanced Realtime Option), POSIX 1003.1-2003.
+POSIX.1-2001.
 Note that the type of the
 .I len
-parameter was changed from size_t to off_t in POSIX 1003.1-2003 TC5.
+parameter was changed from 
+.I size_t 
+to 
+.I off_t 
+in POSIX.1-2003 TC5.
 .SH BUGS
 In kernels before 2.6.6, if 
 .I len
diff --git a/man2/pread.2 b/man2/pread.2
index 448810bbe..96156852a 100644
--- a/man2/pread.2
+++ b/man2/pread.2
@@ -75,7 +75,7 @@ can fail and set
 .I errno
 to any error specified for \fBwrite\fR(2) or \fBlseek\fR(2).
 .SH "CONFORMING TO"
-Unix98
+POSIX.1-2001.
 .SH HISTORY
 The \fBpread\fR() and \fBpwrite\fR() system calls were added to Linux in
 version 2.1.60; the entries in the i386 system call table were added
diff --git a/man2/ptrace.2 b/man2/ptrace.2
index 51dbfac8e..1eb17626f 100644
--- a/man2/ptrace.2
+++ b/man2/ptrace.2
@@ -410,7 +410,7 @@ Alternatively, the process may already be being traced, or be
 The specified process does not exist, or is not currently being traced 
 by the caller, or is not stopped (for requests that require that).
 .SH "CONFORMING TO"
-SVr4, SVID EXT, AT&T, X/OPEN, 4.3BSD
+SVr4, 4.3BSD
 .SH "SEE ALSO"
 .BR gdb (1),
 .BR strace (1),
diff --git a/man2/read.2 b/man2/read.2
index 624201d28..2e5978ed3 100644
--- a/man2/read.2
+++ b/man2/read.2
@@ -118,7 +118,7 @@ to return \-1 (with
 .I errno
 set to EINTR) or to return the number of bytes already read.
 .SH "CONFORMING TO"
-SVr4, SVID, AT&T, POSIX, X/OPEN, 4.3BSD
+SVr4, 4.3BSD, POSIX.1-2001.
 .SH RESTRICTIONS
 On NFS file systems, reading small amounts of data will only update the
 time stamp the first time, subsequent calls may not do so.  This is caused
diff --git a/man2/readlink.2 b/man2/readlink.2
index 0705c2be0..eacd5b917 100644
--- a/man2/readlink.2
+++ b/man2/readlink.2
@@ -97,9 +97,10 @@ Insufficient kernel memory was available.
 .B ENOTDIR
 A component of the path prefix is not a directory.
 .SH "CONFORMING TO"
-X/OPEN, 4.4BSD (the
+4.4BSD (the
 .BR readlink ()
-function call appeared in 4.2BSD).
+function call appeared in 4.2BSD),
+POSIX.1-2001.
 .SH HISTORY
 In versions of glibc up to and including glibc 2.4, the return type of
 .BR readlink ()
diff --git a/man2/readv.2 b/man2/readv.2
index 3a8d87f1c..840ba0f6c 100644
--- a/man2/readv.2
+++ b/man2/readv.2
@@ -112,14 +112,14 @@ permitted maximum.
 .BR readv ()
 and
 .BR writev ()
-functions first appeared in 4.2BSD), Unix98, POSIX 1003.1-2001.
+functions first appeared in 4.2BSD), POSIX.1-2001.
 Linux libc5 used \fIsize_t\fR as the type of the \fIcount\fR parameter,
 and \fIint\fP as return type for these functions.
 .\" The readv/writev system calls were buggy before Linux 1.3.40.
 .\" (Says release.libc.)
 .SH "LINUX NOTES"
-SUSv3 allows an implementation to place a limit on the number of items
-that can be passed in
+POSIX.1-2001 allows an implementation to place a limit on 
+the number of items that can be passed in
 .IR vector .
 An implementation can advertise its limit by defining
 .B IOV_MAX
diff --git a/man2/reboot.2 b/man2/reboot.2
index efab04167..41529c5f0 100644
--- a/man2/reboot.2
+++ b/man2/reboot.2
@@ -142,7 +142,8 @@ the
 capability is required.
 .SH "CONFORMING TO"
 .BR reboot ()
-is Linux specific, and should not be used in programs intended to be portable.
+is Linux specific, 
+and should not be used in programs intended to be portable.
 .SH "SEE ALSO"
 .BR sync (2),
 .BR bootparam (7),
diff --git a/man2/recv.2 b/man2/recv.2
index f9006093a..723da156f 100644
--- a/man2/recv.2
+++ b/man2/recv.2
@@ -389,9 +389,9 @@ The argument
 does not refer to a socket.
 .SH "CONFORMING TO"
 4.4BSD (these function calls first appeared in 4.2BSD),
-POSIX 1003.1-2001.
+POSIX.1-2001.
 .LP
-POSIX only describes the
+POSIX.1-2001 only describes the
 .BR MSG_OOB ,
 .BR MSG_PEEK ,
 and
diff --git a/man2/rename.2 b/man2/rename.2
index aa3cfa60a..9578d9b21 100644
--- a/man2/rename.2
+++ b/man2/rename.2
@@ -197,7 +197,7 @@ are not on the same mounted filesystem.
 does not work across different mount points,
 even if the same filesystem is mounted on both.)
 .SH "CONFORMING TO"
-POSIX, 4.3BSD, ANSI C
+4.3BSD, C89, POSIX.1-2001.
 .SH BUGS
 On NFS filesystems, you can not assume that if the operation
 failed the file was not renamed.  If the server does the rename operation
diff --git a/man2/rmdir.2 b/man2/rmdir.2
index 06e49e245..2797249ae 100644
--- a/man2/rmdir.2
+++ b/man2/rmdir.2
@@ -121,7 +121,7 @@ does not support the removal of directories.
 .I pathname
 refers to a file on a read-only filesystem.
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX, 4.3BSD
+SVr4, 4.3BSD, POSIX.1-2001.
 .SH BUGS
 Infelicities in the protocol underlying NFS can cause the unexpected
 disappearance of directories which are still being used.
diff --git a/man2/sched_get_priority_max.2 b/man2/sched_get_priority_max.2
index 953ee2c8c..4d440d1fe 100644
--- a/man2/sched_get_priority_max.2
+++ b/man2/sched_get_priority_max.2
@@ -93,7 +93,7 @@ is set appropriately.
 .B EINVAL
 The parameter \fIpolicy\fR does not identify a defined scheduling policy.
 .SH "CONFORMING TO"
-POSIX.1b (formerly POSIX.4)
+POSIX.1-2001.
 .SH "SEE ALSO"
 .BR sched_getaffinity (2),
 .BR sched_getparam (2),
@@ -104,8 +104,3 @@ POSIX.1b (formerly POSIX.4)
 .PP
 .I Programming for the real world \- POSIX.4
 by Bill O. Gallmeister, O'Reilly & Associates, Inc., ISBN 1-56592-074-0
-.br
-.I IEEE Std 1003.1b-1993
-(POSIX.1b standard)
-.br
-.I ISO/IEC 9945-1:1996
diff --git a/man2/sched_rr_get_interval.2 b/man2/sched_rr_get_interval.2
index 47e60f3f1..55bee81fb 100644
--- a/man2/sched_rr_get_interval.2
+++ b/man2/sched_rr_get_interval.2
@@ -82,7 +82,7 @@ The system call is not yet implemented.
 .B ESRCH
 The process whose ID is \fIpid\fR could not be found.
 .SH "CONFORMING TO"
-POSIX.1b (formerly POSIX.4)
+POSIX.1-2001.
 .SH BUGS
 As of Linux 1.3.81 \fBsched_rr_get_interval\fR() returns with error
 ENOSYS, because SCHED_RR has not yet been fully implemented and tested
@@ -93,8 +93,3 @@ has a description of the Linux scheduling scheme.
 .PP
 .I Programming for the real world \- POSIX.4
 by Bill O. Gallmeister, O'Reilly & Associates, Inc., ISBN 1-56592-074-0
-.br
-.I IEEE Std 1003.1b-1993
-(POSIX.1b standard, formerly POSIX.4)
-.br
-.I ISO/IEC 9945-1:1996
diff --git a/man2/sched_setparam.2 b/man2/sched_setparam.2
index 60f4880e0..54e12fe47 100644
--- a/man2/sched_setparam.2
+++ b/man2/sched_setparam.2
@@ -103,7 +103,7 @@ capability).
 .B ESRCH
 The process whose ID is \fIpid\fR could not be found.
 .SH "CONFORMING TO"
-POSIX.1b (formerly POSIX.4)
+POSIX.1-2001.
 .SH "SEE ALSO"
 .BR getpriority (2),
 .BR nice (2),
@@ -118,8 +118,3 @@ POSIX.1b (formerly POSIX.4)
 .PP
 .I Programming for the real world \- POSIX.4
 by Bill O. Gallmeister, O'Reilly & Associates, Inc., ISBN 1-56592-074-0
-.br
-.I IEEE Std 1003.1b-1993
-(POSIX.1b standard)
-.br
-.I ISO/IEC 9945-1:1996
diff --git a/man2/sched_setscheduler.2 b/man2/sched_setscheduler.2
index 93d325d8f..277ec9c66 100644
--- a/man2/sched_setscheduler.2
+++ b/man2/sched_setscheduler.2
@@ -129,7 +129,7 @@ will be inserted at the end of the list for its priority. A call to
 \fIpid\fP at the start of the list if it was runnable.
 As a consequence, it may preempt the currently running process if
 it has the same priority.
-(POSIX 1003.1 specifies that the process should go to the end
+(POSIX.1 specifies that the process should go to the end
 of the list.)
 .\" In 2.2.x and 2.4.x, the process is placed at the front of the queue
 .\" In 2.0.x, the Right Thing happened: the process went to the back -- MTK
@@ -288,7 +288,7 @@ The calling process does not have appropriate privileges.
 .B ESRCH
 The process whose ID is \fIpid\fP could not be found.
 .SH "CONFORMING TO"
-POSIX.1b (formerly POSIX.4).
+POSIX.1-2001.
 The \fISCHED_BATCH\fP policy is Linux specific.
 .SH NOTES
 Standard Linux is a general-purpose operating system
@@ -337,11 +337,3 @@ designed specifically for hard real-time applications.
 .PP
 .I Programming for the real world \- POSIX.4
 by Bill O. Gallmeister, O'Reilly & Associates, Inc., ISBN 1-56592-074-0
-.br
-.I IEEE Std 1003.1b-1993
-(POSIX.1b standard)
-.br
-.I ISO/IEC 9945-1:1996
-\- This is the new 1996 revision of POSIX.1 which contains in one
-single standard POSIX.1(1990), POSIX.1b(1993), POSIX.1c(1995), and
-POSIX.1i(1995).
diff --git a/man2/sched_yield.2 b/man2/sched_yield.2
index e724dfd69..c8453107a 100644
--- a/man2/sched_yield.2
+++ b/man2/sched_yield.2
@@ -61,15 +61,10 @@ On error, \-1 is returned, and
 is set appropriately.
 
 .SH "CONFORMING TO"
-POSIX.1b (formerly POSIX.4)
+POSIX.1-2001.
 .SH "SEE ALSO"
 .BR sched_setscheduler (2)
 for a description of Linux scheduling.
 .PP
 .I Programming for the real world \- POSIX.4
 by Bill O. Gallmeister, O'Reilly & Associates, Inc., ISBN 1-56592-074-0
-.br
-.I IEEE Std 1003.1b-1993
-(POSIX.1b standard)
-.br
-.I ISO/IEC 9945-1:1996
diff --git a/man2/select.2 b/man2/select.2
index 6284eb5be..5d713324b 100644
--- a/man2/select.2
+++ b/man2/select.2
@@ -40,7 +40,7 @@
 select, pselect, FD_CLR, FD_ISSET, FD_SET, FD_ZERO \- synchronous I/O multiplexing
 .SH SYNOPSIS
 .nf
-/* According to POSIX 1003.1-2001 */
+/* According to POSIX.1-2001 */
 .br
 .B #include <sys/select.h>
 .sp
@@ -235,7 +235,7 @@ struct timespec {
 .fi
 .in -0.25i
 
-(However, see below on the POSIX 1003.1-2001 versions.)
+(However, see below on the POSIX.1-2001 versions.)
 .PP
 Some code calls
 .BR select ()
@@ -337,6 +337,8 @@ main(void) {
 }
 .fi
 .SH "CONFORMING TO"
+.BR select () 
+conforms to POSIX.1-2001 and 
 4.4BSD 
 .RB ( select ()
 first appeared in 4.2BSD).  Generally portable to/from
@@ -345,8 +347,8 @@ System V variants).  However, note that the System V variant typically
 sets the timeout variable before exit, but the BSD variant does not.
 .PP
 .BR pselect ()
-is defined in IEEE Std 1003.1g-2000 (POSIX.1g), and in
-POSIX 1003.1-2001.
+is defined in POSIX.1g, and in
+POSIX.1-2001.
 .SH NOTES
 An 
 .I fd_set 
@@ -368,7 +370,7 @@ the two fields of a
 structure are longs (as shown above),
 and the structure is defined in
 .IR <sys/time.h> .
-The POSIX 1003.1-2001 situation is
+The POSIX.1-2001 situation is
 
 .RS
 .nf
@@ -393,7 +395,7 @@ include
 .I <time.h>
 for
 .BR select ().
-The POSIX 1003.1-2001 situation is that one should include
+The POSIX.1-2001 situation is that one should include
 .I <sys/select.h>
 for
 .BR select ()
@@ -411,7 +413,7 @@ when
 is defined, under glibc 2.2.2-2.2.4 it gives it when
 .B _XOPEN_SOURCE
 is defined and has a value of 600 or larger.
-No doubt, since POSIX 1003.1-2001, it should give the prototype by default.
+No doubt, since POSIX.1-2001, it should give the prototype by default.
 .SH VERSIONS
 .BR pselect ()
 was added to Linux in kernel 2.6.16.
diff --git a/man2/semctl.2 b/man2/semctl.2
index e146d9cb2..e4dbcf2ba 100644
--- a/man2/semctl.2
+++ b/man2/semctl.2
@@ -500,7 +500,8 @@ Under Linux,
 is not a system call, but is implemented via the system call
 .BR ipc (2).
 .SH "CONFORMING TO"
-SVr4, SVID.  SVr4 documents more error conditions EINVAL and EOVERFLOW.
+SVr4, POSIX.1-2001.
+.\" SVr4 documents more error conditions EINVAL and EOVERFLOW.
 .SH "SEE ALSO"
 .BR ipc (2),
 .BR semget (2),
diff --git a/man2/semget.2 b/man2/semget.2
index 985d23423..dbcc4e56c 100644
--- a/man2/semget.2
+++ b/man2/semget.2
@@ -273,9 +273,9 @@ in the associated data structure retrieved by a
 .B IPC_STAT
 operation can be used to avoid races.)
 .SH "CONFORMING TO"
-SVr4, SVID.
-SVr4 documents additional error conditions EFBIG, E2BIG, EAGAIN,
-ERANGE, EFAULT.
+SVr4, POSIX.1-2001.
+.\" SVr4 documents additional error conditions EFBIG, E2BIG, EAGAIN,
+.\" ERANGE, EFAULT.
 .SH "SEE ALSO"
 .BR semctl (2),
 .BR semop (2),
diff --git a/man2/semop.2 b/man2/semop.2
index c40b469a5..2f3e608e2 100644
--- a/man2/semop.2
+++ b/man2/semop.2
@@ -474,8 +474,8 @@ This bug is fixed in kernel 2.6.11.
 .\" the fix:
 .\" http://marc.theaimsgroup.com/?l=linux-kernel&m=110261701025794&w=2
 .SH "CONFORMING TO"
-SVr4, SVID.  SVr4 documents additional error conditions EINVAL, EFBIG,
-ENOSPC.
+SVr4, POSIX.1-2001.
+.\" SVr4 documents additional error conditions EINVAL, EFBIG, ENOSPC.
 .SH "SEE ALSO"
 .BR semctl (2),
 .BR semget (2),
diff --git a/man2/send.2 b/man2/send.2
index 434b50336..356d0d135 100644
--- a/man2/send.2
+++ b/man2/send.2
@@ -328,10 +328,10 @@ unless
 .B MSG_NOSIGNAL 
 is set.
 .SH "CONFORMING TO"
-4.4BSD, SVr4, POSIX 1003.1-2001.
+4.4BSD, SVr4, POSIX.1-2001.
 These function calls appeared in 4.2BSD.
 .LP
-POSIX only describes the
+POSIX.1-2001 only describes the
 .B MSG_OOB
 and
 .B MSG_EOR
diff --git a/man2/seteuid.2 b/man2/seteuid.2
index c35b1f7e5..0088f3eeb 100644
--- a/man2/seteuid.2
+++ b/man2/seteuid.2
@@ -88,7 +88,7 @@ and hence does not change the saved set-user-ID.
 Similar remarks hold for
 .BR setegid ().
 .SH "CONFORMING TO"
-4.3BSD
+4.3BSD, POSIX.1-2001.
 .SH "SEE ALSO"
 .BR geteuid (2),
 .BR setresuid (2),
diff --git a/man2/setfsgid.2 b/man2/setfsgid.2
index 6d63281f2..2523b6216 100644
--- a/man2/setfsgid.2
+++ b/man2/setfsgid.2
@@ -69,7 +69,8 @@ is returned.  On error, the current value of
 is returned.
 .SH "CONFORMING TO"
 .BR setfsgid ()
-is Linux specific and should not be used in programs intended to be portable.
+is Linux specific and should not be used in programs intended 
+to be portable.
 It is present since Linux 1.1.44 and in libc since libc 4.7.6.
 .SH BUGS
 No error messages of any kind are returned to the caller. At the very
diff --git a/man2/setfsuid.2 b/man2/setfsuid.2
index 417ce1257..6b14ac692 100644
--- a/man2/setfsuid.2
+++ b/man2/setfsuid.2
@@ -69,7 +69,8 @@ is returned.  On error, the current value of
 is returned.
 .SH "CONFORMING TO"
 .BR setfsuid ()
-is Linux specific and should not be used in programs intended to be portable.
+is Linux specific and should not be used in programs intended 
+to be portable.
 It is present since Linux 1.1.44 and in libc since libc 4.7.6.
 .SH BUGS
 No error messages of any kind are returned to the caller. At the very
diff --git a/man2/setgid.2 b/man2/setgid.2
index 20c0285ac..b54a6c2f1 100644
--- a/man2/setgid.2
+++ b/man2/setgid.2
@@ -58,7 +58,7 @@ CAP_SETGID capability), and
 does not match the effective group ID or saved set-group-ID of
 the calling process.
 .SH "CONFORMING TO"
-SVr4, SVID.
+SVr4, POSIX.1-2001.
 .SH "SEE ALSO"
 .BR getgid (2),
 .BR setegid (2),
diff --git a/man2/setpgid.2 b/man2/setpgid.2
index 306648749..d7098b344 100644
--- a/man2/setpgid.2
+++ b/man2/setpgid.2
@@ -166,7 +166,7 @@ The functions
 .BR setpgid ()
 and
 .BR getpgrp ()
-conform to POSIX.1.
+conform to POSIX.1-2001.
 The function
 .BR setpgrp ()
 is from 4.2BSD.
diff --git a/man2/setresuid.2 b/man2/setresuid.2
index 96b9750be..978391260 100644
--- a/man2/setresuid.2
+++ b/man2/setresuid.2
@@ -77,7 +77,8 @@ bring that user ID over its NPROC rlimit.
 The calling process is not privileged (did not have the CAP_SETUID
 capability) and tried to change the IDs to values that are not permitted.
 .SH "CONFORMING TO"
-This call is nonstandard.
+These calls are non-standard; 
+they also appear on HP-UX and some of the BSDs.
 .SH HISTORY
 This system call was first introduced in HP-UX.
 It is available under Linux since Linux 2.1.44.
diff --git a/man2/setreuid.2 b/man2/setreuid.2
index e20754399..d7958a3a1 100644
--- a/man2/setreuid.2
+++ b/man2/setreuid.2
@@ -103,7 +103,7 @@ Setting the effective user (group) ID to the
 saved set-user-ID (saved set-group-ID) is
 possible since Linux 1.1.37 (1.1.38).
 .SH "CONFORMING TO"
-4.3BSD (the
+POSIX.1-2001, 4.3BSD (the
 .BR setreuid ()
 and
 .BR setregid ()
diff --git a/man2/setsid.2 b/man2/setsid.2
index c5dbef455..a2f267aad 100644
--- a/man2/setsid.2
+++ b/man2/setsid.2
@@ -70,7 +70,7 @@ and
 and have the child do
 .BR setsid ().
 .SH "CONFORMING TO"
-POSIX, SVr4.
+SVr4, POSIX.1-2001.
 .SH "SEE ALSO"
 .BR setpgid (2),
 .BR setpgrp (2),
diff --git a/man2/setuid.2 b/man2/setuid.2
index 1a4a180e2..017c981b1 100644
--- a/man2/setuid.2
+++ b/man2/setuid.2
@@ -82,9 +82,10 @@ capability) and
 .I uid
 does not match the real UID or saved set-user-ID of the calling process.
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX.1.  Not quite compatible with the 4.4BSD call, which
-sets all of the real, saved, and effective user IDs.  SVr4 documents an
-additional EINVAL error condition.
+SVr4, POSIX.1-2001.  
+Not quite compatible with the 4.4BSD call, which
+sets all of the real, saved, and effective user IDs.  
+.\" SVr4 documents an additional EINVAL error condition.
 .SH "LINUX-SPECIFIC REMARKS"
 Linux has the concept of filesystem user ID, normally equal to the
 effective user ID.  The
diff --git a/man2/shmctl.2 b/man2/shmctl.2
index dd9ff0863..d813ed591 100644
--- a/man2/shmctl.2
+++ b/man2/shmctl.2
@@ -380,9 +380,10 @@ a recompilation under glibc-2.1.91 or later should suffice.
 (The kernel distinguishes old and new calls by an IPC_64 flag in
 .IR cmd .)
 .SH "CONFORMING TO"
-SVr4, SVID.  SVr4 documents additional error conditions EINVAL,
-ENOENT, ENOSPC, ENOMEM, EEXIST.  Neither SVr4 nor SVID documents
-an EIDRM error condition.
+SVr4, POSIX.1-2001.  
+.\" SVr4 documents additional error conditions EINVAL,
+.\" ENOENT, ENOSPC, ENOMEM, EEXIST.  Neither SVr4 nor SVID documents
+.\" an EIDRM error condition.
 .SH "SEE ALSO"
 .BR mlock (2),
 .BR setrlimit (2),
diff --git a/man2/shmget.2 b/man2/shmget.2
index 28ecdbee8..cf6b294c6 100644
--- a/man2/shmget.2
+++ b/man2/shmget.2
@@ -286,7 +286,9 @@ number of shared memory segments
 The name choice IPC_PRIVATE was perhaps unfortunate, IPC_NEW
 would more clearly show its function.
 .SH "CONFORMING TO"
-SVr4, SVID.  SVr4 documents an additional error condition EEXIST.
+SVr4, POSIX.1-2001.  
+.\" SVr4 documents an additional error condition EEXIST.
+.SH LINUX NOTES
 Until version 2.3.30 Linux would return EIDRM for a
 .BR shmget ()
 on a shared memory segment scheduled for deletion.
diff --git a/man2/shmop.2 b/man2/shmop.2
index 9f51e21e0..871a7c7f0 100644
--- a/man2/shmop.2
+++ b/man2/shmop.2
@@ -269,8 +269,11 @@ The implementation places no intrinsic limit on the per\-process maximum
 number of shared memory segments
 .RB ( SHMSEG ).
 .SH "CONFORMING TO"
-SVr4, SVID.  SVr4 documents an additional error condition EMFILE.
-In SVID-v4 the type of the \fIshmaddr\fP argument was changed from
+SVr4, POSIX.1-2001.  
+.\" SVr4 documents an additional error condition EMFILE.
+
+In SVID 3 (or perhaps earlier) 
+the type of the \fIshmaddr\fP argument was changed from
 .B "char *"
 into
 .BR "const void *" ,
diff --git a/man2/sigaction.2 b/man2/sigaction.2
index c93f14b47..ebec69af2 100644
--- a/man2/sigaction.2
+++ b/man2/sigaction.2
@@ -469,7 +469,8 @@ execution of the handler, but also the signals specified in
 .IR sa_mask .
 This bug is was fixed in kernel 2.6.14.
 .SH "CONFORMING TO"
-POSIX, SVr4.  SVr4 does not document the EINTR condition.
+POSIX.1-2001, SVr4.  
+.\" SVr4 does not document the EINTR condition.
 .SH UNDOCUMENTED
 Before the introduction of
 .B SA_SIGINFO
diff --git a/man2/sigaltstack.2 b/man2/sigaltstack.2
index 724ebcad5..f34d5d81e 100644
--- a/man2/sigaltstack.2
+++ b/man2/sigaltstack.2
@@ -181,7 +181,7 @@ All new applications should be written using \fBsigaltstack\fP().
 different struct, and had the major disadvantage that the caller
 had to know the direction of stack growth.
 .SH "CONFORMING TO"
-SUSv2, SVr4, POSIX 1003.1-2001.
+SUSv2, SVr4, POSIX.1-2001.
 .SH "SEE ALSO"
 .BR execve (2),
 .BR setrlimit (2),
diff --git a/man2/signal.2 b/man2/signal.2
index 7f57b73fe..4b04ebf74 100644
--- a/man2/signal.2
+++ b/man2/signal.2
@@ -122,7 +122,7 @@ If a signal interrupts an unsafe function, and
 .I handler
 calls an unsafe function, then the behavior is undefined. Safe
 functions are listed explicitly in the various standards.
-The POSIX 1003.1-2003 list is
+The POSIX.1-2003 list is
 
 _Exit()
 _exit()
@@ -280,7 +280,7 @@ and, when
 is defined, also
 .IR sighandler_t .
 .SH "CONFORMING TO"
-ANSI C
+C89, POSIX.1-2001.
 .SH "SEE ALSO"
 .BR kill (1),
 .BR alarm (2),
diff --git a/man2/sigqueue.2 b/man2/sigqueue.2
index bf5d0b9a3..f4a8a53f0 100644
--- a/man2/sigqueue.2
+++ b/man2/sigqueue.2
@@ -105,7 +105,7 @@ having it unblocked, or by waiting for it using
 then at least some signal must be delivered to this thread before this
 function returns.
 .SH "CONFORMING TO"
-POSIX 1003.1-2001
+POSIX.1-2001
 .SH "SEE ALSO"
 .BR kill (2),
 .BR sigaction (2),
diff --git a/man2/sigwaitinfo.2 b/man2/sigwaitinfo.2
index a7f70fe24..4b2904a15 100644
--- a/man2/sigwaitinfo.2
+++ b/man2/sigwaitinfo.2
@@ -137,7 +137,7 @@ as a call to
 .BR sigwaitinfo (),
 and indeed this is what is done on Linux.
 .SH "CONFORMING TO"
-POSIX 1003.1-2001
+POSIX.1-2001
 .SH "SEE ALSO"
 .BR kill (2),
 .BR sigaction (2),
diff --git a/man2/socket.2 b/man2/socket.2
index ddc17bbf8..38abd371a 100644
--- a/man2/socket.2
+++ b/man2/socket.2
@@ -301,7 +301,7 @@ supported within this domain.
 .PP
 Other errors may be generated by the underlying protocol modules.
 .SH "CONFORMING TO"
-4.4BSD, SUSv2, POSIX 1003.1-2001.
+4.4BSD, POSIX.1-2001.
 .BR socket ()
 appeared in 4.2BSD. It is generally portable to/from
 non-BSD systems supporting clones of the BSD socket layer (including
diff --git a/man2/socketpair.2 b/man2/socketpair.2
index 20e701781..096a05dd6 100644
--- a/man2/socketpair.2
+++ b/man2/socketpair.2
@@ -86,7 +86,7 @@ The specified protocol does not support creation of socket pairs.
 .B EPROTONOSUPPORT
 The specified protocol is not supported on this machine.
 .SH "CONFORMING TO"
-4.4BSD, SUSv2, POSIX 1003.1-2001.
+4.4BSD, POSIX.1-2001.
 The
 .BR socketpair ()
 function call appeared in 4.2BSD. It is generally portable to/from
diff --git a/man2/stat.2 b/man2/stat.2
index 1424dd184..23a7fae41 100644
--- a/man2/stat.2
+++ b/man2/stat.2
@@ -306,34 +306,30 @@ Out of memory (i.e. kernel memory).
 .B ENOTDIR
 A component of the path is not a directory.
 .SH "CONFORMING TO"
-The
-.BR stat ()
-and
-.BR fstat ()
-calls conform to SVr4, SVID, POSIX, X/OPEN, 4.3BSD.  The
-.BR lstat ()
-call conforms to 4.3BSD and SVr4.
-SVr4 documents additional
-.BR fstat ()
-error conditions EINTR, ENOLINK, and EOVERFLOW.  SVr4
-documents additional
-.BR stat ()
-and
-.BR lstat ()
-error conditions EINTR, EMULTIHOP, ENOLINK, and EOVERFLOW.
+calls conform to SVr4, 4.3BSD, POSIX.1-2001.
+.\" SVr4 documents additional
+.\" .BR fstat ()
+.\" error conditions EINTR, ENOLINK, and EOVERFLOW.  SVr4
+.\" documents additional
+.\" .BR stat ()
+.\" and
+.\" .BR lstat ()
+.\" error conditions EINTR, EMULTIHOP, ENOLINK, and EOVERFLOW.
+
 Use of the
 .I st_blocks
 and
 .I st_blksize
 fields may be less portable. (They were introduced in BSD.
-Are not specified by POSIX. The interpretation differs between
+The interpretation differs between
 systems, and possibly on a single system when NFS mounts are involved.)
 .LP
 POSIX does not describe the S_IFMT, S_IFSOCK, S_IFLNK, S_IFREG, S_IFBLK,
 S_IFDIR, S_IFCHR, S_IFIFO, S_ISVTX bits, but instead demands the use of
-the macros S_ISDIR(), etc. The S_ISLNK and S_ISSOCK macros are not in
-POSIX.1-1996, but both will be in the next POSIX standard;
-the former is from SVID 4v2, the latter from SUSv2.
+the macros S_ISDIR(), etc. 
+The S_ISLNK and S_ISSOCK macros are not in
+POSIX.1-1996, but both are present in POSIX.1-2001;
+the former is from SVID 4, the latter from SUSv2.
 .LP
 Unix V7 (and later systems) had S_IREAD, S_IWRITE, S_IEXEC, where POSIX
 prescribes the synonyms S_IRUSR, S_IWUSR, S_IXUSR.
diff --git a/man2/statfs.2 b/man2/statfs.2
index ea99b21cd..ff0594d3b 100644
--- a/man2/statfs.2
+++ b/man2/statfs.2
@@ -212,7 +212,7 @@ that returns a
 containing an
 .I "unsigned long"
 .IR f_fsid .
-Linux, SunOS, HPUX, 4.4BSD have a system call
+Linux, SunOS, HP-UX, 4.4BSD have a system call
 .BR statfs ()
 that returns a
 .I "struct statfs"
diff --git a/man2/statvfs.2 b/man2/statvfs.2
index e188b8c13..f885f9d6d 100644
--- a/man2/statvfs.2
+++ b/man2/statvfs.2
@@ -152,7 +152,7 @@ is not a directory.
 Some values were too large to be represented in the returned struct.
 .PP
 .SH "CONFORMING TO"
-Solaris, Irix, POSIX 1003.1-2001
+Solaris, Irix, POSIX.1-2001
 .SH NOTES
 The Linux kernel has system calls 
 .BR statfs ()
diff --git a/man2/stime.2 b/man2/stime.2
index b08cecaf4..33bf3272f 100644
--- a/man2/stime.2
+++ b/man2/stime.2
@@ -55,7 +55,7 @@ Under Linux the
 .B CAP_SYS_TIME
 privilege is required.
 .SH "CONFORMING TO"
-SVr4, SVID, X/OPEN
+SVr4.
 .SH NOTES
 Under glibc2,
 .I <time.h>
diff --git a/man2/symlink.2 b/man2/symlink.2
index d68db90a0..e6a4f0af7 100644
--- a/man2/symlink.2
+++ b/man2/symlink.2
@@ -137,9 +137,8 @@ file (unless it also has other hard links). If this behaviour is not
 desired, use
 .BR link ().
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX, 4.3BSD.  SVr4 documents additional error codes
-SVr4, SVID, 4.3BSD, X/OPEN.  SVr4 documents additional error codes
-EDQUOT and ENOSYS.
+SVr4, 4.3BSD, POSIX.1-2001.  
+.\" SVr4 documents additional error codes EDQUOT and ENOSYS.
 See
 .BR open (2)
 re multiple files with the same name, and NFS.
diff --git a/man2/sync.2 b/man2/sync.2
index bc14cbf63..76095b92d 100644
--- a/man2/sync.2
+++ b/man2/sync.2
@@ -44,9 +44,9 @@ first commits inodes to buffers, and then buffers to disk.
 .SH ERRORS
 This function is always successful.
 .SH "CONFORMING TO"
-SVr4, SVID, X/OPEN, 4.3BSD
+SVr4, 4.3BSD, POSIX.1-2001.
 .SH BUGS
-According to the standard specification (e.g., SVID),
+According to the standard specification (e.g., POSIX.1-2001),
 \fBsync\fP() schedules the writes, but may return before the actual
 writing is done.
 However, since version 1.3.20 Linux does actually wait.
diff --git a/man2/time.2 b/man2/time.2
index d1ce5b4d9..e0d59897f 100644
--- a/man2/time.2
+++ b/man2/time.2
@@ -64,7 +64,7 @@ required to be synchronised to a standard reference.  The intention is
 that the interpretation of seconds since the Epoch values be
 consistent; see POSIX.1 Annex B 2.2.2 for further rationale.
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX, X/OPEN, 4.3BSD
+SVr4, 4.3BSD, POSIX.1-2001.
 .br
 Under 4.3BSD, this call is obsoleted by
 .BR gettimeofday (2).
diff --git a/man2/times.2 b/man2/times.2
index 185801d42..c1480aaeb 100644
--- a/man2/times.2
+++ b/man2/times.2
@@ -128,7 +128,7 @@ are automatically included in the
 .I tms_cstime
 and
 .I tms_cutime
-fields, although POSIX 1003.1-2001 says that this should only happen
+fields, although POSIX.1-2001 says that this should only happen
 if the calling process
 .BR wait ()s
 on its children.
@@ -154,7 +154,7 @@ that are not measured in clock ticks
 but in
 .BR CLOCKS_PER_SEC .
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX, X/OPEN, 4.3BSD
+SVr4, 4.3BSD, POSIX.1-2001.
 .SH "HISTORICAL NOTES"
 SVr1-3 returns
 .I long
diff --git a/man2/tkill.2 b/man2/tkill.2
index 245f74dbf..ecc0be9e4 100644
--- a/man2/tkill.2
+++ b/man2/tkill.2
@@ -78,6 +78,7 @@ No process with the specified thread ID (and thread group ID) exists.
 .SH "CONFORMING TO"
 \fBtkill\fP() and \fBtgkill\fP() are Linux specific and should not be used
 in programs that are intended to be portable.
+.SH VERSIONS
 \fBtkill\fP() is supported since Linux 2.4.19 / 2.5.4.
 \fBtgkill\fP() was added in Linux 2.5.75.
 .SH "SEE ALSO"
diff --git a/man2/truncate.2 b/man2/truncate.2
index 1180911ec..6ab7ab605 100644
--- a/man2/truncate.2
+++ b/man2/truncate.2
@@ -164,18 +164,18 @@ The
 .I fd
 does not reference a regular file.
 .SH "CONFORMING TO"
-4.4BSD, SVr4 (these function calls first appeared in 4.2BSD).
-POSIX 1003.1-1996 has
-.BR ftruncate ().
-POSIX 1003.1-2001 also has
-.BR truncate (),
-as an XSI extension.
-.LP
-SVr4 documents additional
-.BR truncate ()
-error conditions EMFILE, EMULTIHP, ENFILE, ENOLINK.  SVr4 documents for
-.BR ftruncate ()
-an additional EAGAIN error condition.
+4.4BSD, SVr4, POSIX.1-2001 (these calls first appeared in 4.2BSD).
+.\" POSIX.1-1996 has
+.\" .BR ftruncate ().
+.\" POSIX.1-2001 also has
+.\" .BR truncate (),
+.\" as an XSI extension.
+.\" .LP
+.\" SVr4 documents additional
+.\" .BR truncate ()
+.\" error conditions EMFILE, EMULTIHP, ENFILE, ENOLINK.  SVr4 documents for
+.\" .BR ftruncate ()
+.\" an additional EAGAIN error condition.
 .SH NOTES
 The above description is for XSI-compliant systems.
 For non-XSI-compliant systems, the POSIX standard allows
diff --git a/man2/umask.2 b/man2/umask.2
index ffb02b997..6d6b51753 100644
--- a/man2/umask.2
+++ b/man2/umask.2
@@ -93,7 +93,7 @@ inherits its parent's umask.
 The umask is left unchanged by
 .BR execve (2).
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX, X/OPEN, 4.3BSD
+SVr4, 4.3BSD, POSIX.1-2001.
 .SH "SEE ALSO"
 .BR chmod (2),
 .BR mkdir (2),
diff --git a/man2/uname.2 b/man2/uname.2
index 2440015a2..e49327463 100644
--- a/man2/uname.2
+++ b/man2/uname.2
@@ -66,7 +66,7 @@ is set appropriately.
 .I buf
 is not valid.
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX, X/OPEN.
+SVr4, POSIX.1-2001.
 There is no
 .BR uname ()
 call in 4.3BSD.
diff --git a/man2/unlink.2 b/man2/unlink.2
index 4238e5e99..5a71afb62 100644
--- a/man2/unlink.2
+++ b/man2/unlink.2
@@ -134,8 +134,9 @@ capability).
 .I pathname
 refers to a file on a read-only filesystem.
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX, X/OPEN, 4.3BSD.  SVr4 documents additional error
-conditions EINTR, EMULTIHOP, ETXTBSY, ENOLINK.
+SVr4, 4.3BSD, POSIX.1-2001.  
+.\" SVr4 documents additional error
+.\" conditions EINTR, EMULTIHOP, ETXTBSY, ENOLINK.
 .SH BUGS
 Infelicities in the protocol underlying NFS can cause the unexpected
 disappearance of files which are still being used.
diff --git a/man2/ustat.2 b/man2/ustat.2
index 1a8a30776..d3ef03482 100644
--- a/man2/ustat.2
+++ b/man2/ustat.2
@@ -85,18 +85,22 @@ The mounted file system referenced by
 does not support this operation, or any version of Linux before
 1.3.16.
 .SH "CONFORMING TO"
-SVr4.  SVr4 documents additional error conditions ENOLINK, ECOMM, and EINTR
-but has no ENOSYS condition.
+SVr4.  
+.\" SVr4 documents additional error conditions ENOLINK, ECOMM, and EINTR
+.\" but has no ENOSYS condition.
 .SH NOTES
 .BR ustat ()
 is deprecated and has only been provided for compatibility.
 All new programs should use
 .BR statfs (2)
 instead.
-.SH "HP NOTES"
-The HP version of struct ustat has an additional field
-.I f_blksize
-that is unknown elsewhere. HP warns:
+.SH "HP-UX NOTES"
+The HP-UX version of the
+.I ustat 
+structure has an additional field,
+.IR f_blksize ,
+that is unknown elsewhere.  
+HP-UX warns:
 For some file systems, the number of free inodes does not change.
 Such file systems will return \-1 in the field
 .IR f_tinode .
diff --git a/man2/utime.2 b/man2/utime.2
index 0f50072e7..288ec1d84 100644
--- a/man2/utime.2
+++ b/man2/utime.2
@@ -148,12 +148,13 @@ legacy, which is strange since it provides more functionality than
 .BR utime ().
 .SH BUGS
 Linux is not careful to distinguish between the EACCES and EPERM error returns.
-On the other hand, POSIX 1003.1-2003 is buggy in its error description for
+On the other hand, POSIX.1-2001 is buggy in its error description for
 .BR utimes ().
 .SH "CONFORMING TO"
 .BR utime ():
-SVr4, SVID, POSIX.  SVr4 documents additional error conditions EFAULT,
-EINTR, ELOOP, EMULTIHOP, ENAMETOOLONG, ENOLINK, ENOLINK, ENOTDIR.
+SVr4, POSIX.1-2001.  
+.\" SVr4 documents additional error conditions EFAULT,
+.\" EINTR, ELOOP, EMULTIHOP, ENAMETOOLONG, ENOLINK, ENOLINK, ENOTDIR.
 .br
 .BR utimes ():
 4.3BSD
diff --git a/man2/vfork.2 b/man2/vfork.2
index 684412bda..66edd97dd 100644
--- a/man2/vfork.2
+++ b/man2/vfork.2
@@ -33,7 +33,7 @@ vfork \- create a child process and block parent
 .sp
 .B pid_t vfork(void);
 .SH "STANDARD DESCRIPTION"
-(From XPG4 / SUSv2 / POSIX draft.)
+(From SUSv2 / POSIX draft.)
 The
 .BR vfork ()
 function has the same effect as
@@ -156,10 +156,9 @@ until 2.2.0-pre6 or so. Since 2.2.0-pre9 (on i386, somewhat later on
 other architectures) it is an independent system call. Support was
 added in glibc 2.0.112.
 .SH "CONFORMING TO"
-The
-.BR vfork ()
-call may be a bit similar to calls with the same name in other
-operating systems. The requirements put on
+4.3BSD, POSIX.1-2001.
+
+The requirements put on
 .BR vfork ()
 by the standards are weaker than those put on
 .BR fork (),
diff --git a/man2/wait.2 b/man2/wait.2
index c47b45a62..a8479cd6e 100644
--- a/man2/wait.2
+++ b/man2/wait.2
@@ -560,7 +560,7 @@ main(int argc, char *argv[])
 }
 .fi
 .SH "CONFORMING TO"
-SVr4, POSIX.1
+SVr4, 4.3BSD, POSIX.1-2001.
 .SH "SEE ALSO"
 .BR _exit (2),
 .BR clone (2),
diff --git a/man2/write.2 b/man2/write.2
index 8e9ebc548..24559c802 100644
--- a/man2/write.2
+++ b/man2/write.2
@@ -108,8 +108,10 @@ catches, blocks or ignores this signal.)
 Other errors may occur, depending on the object connected to
 .IR fd .
 .SH "CONFORMING TO"
-SVr4, SVID, POSIX, X/OPEN, 4.3BSD.  SVr4 documents additional error
-conditions EDEADLK, ENOLCK, ENOLNK, ENOSR, ENXIO, or ERANGE.
+SVr4, 4.3BSD, POSIX.1-2001.  
+.\" SVr4 documents additional error
+.\" conditions EDEADLK, ENOLCK, ENOLNK, ENOSR, ENXIO, or ERANGE.
+
 Under SVr4 a write may be interrupted and return EINTR at any point,
 not just before any data is written. 
 .SH NOTES