Use ``.St -p1003.1-96''.

70 files changed, 140 insertions, 210 deletions

diff --git a/lib/libc/gen/sem_destroy.3 b/lib/libc/gen/sem_destroy.3
index bc66ffd..4074adc 100644
--- a/lib/libc/gen/sem_destroy.3
+++ b/lib/libc/gen/sem_destroy.3
@@ -71,9 +71,8 @@ points to.
 .Xr sem_init 3
 .Sh STANDARDS
 .Fn sem_destroy
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conforms to
+.St -p1003.1-96 .
 .Pp
 POSIX does not define the behavior of
 .Fn sem_destroy
diff --git a/lib/libc/gen/sem_getvalue.3 b/lib/libc/gen/sem_getvalue.3
index 9e2c560..e9ac2a6 100644
--- a/lib/libc/gen/sem_getvalue.3
+++ b/lib/libc/gen/sem_getvalue.3
@@ -69,9 +69,8 @@ points to an invalid semaphore.
 .Xr sem_wait 3
 .Sh STANDARDS
 .Fn sem_getvalue
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conforms to
+.St -p1003.1-96 .
 .Pp
 The value of the semaphore is never negative, even if there are threads blocked
 on the semaphore.  POSIX is somewhat ambiguous in its wording with regard to
diff --git a/lib/libc/gen/sem_init.3 b/lib/libc/gen/sem_init.3
index ae791ba..a727fe2 100644
--- a/lib/libc/gen/sem_init.3
+++ b/lib/libc/gen/sem_init.3
@@ -88,9 +88,8 @@ Unable to initialize a shared semaphore.
 .Xr sem_wait 3
 .Sh STANDARDS
 .Fn sem_init
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conforms to
+.St -p1003.1-96 .
 .Pp
 This implementation does not support shared semaphores, and reports this fact
 by setting
diff --git a/lib/libc/gen/sem_open.3 b/lib/libc/gen/sem_open.3
index a948bdc..22229b3 100644
--- a/lib/libc/gen/sem_open.3
+++ b/lib/libc/gen/sem_open.3
@@ -77,6 +77,5 @@ Function not supported by this implementation.
 .Fn sem_close ,
 and
 .Fn sem_unlink
-conform to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conform to
+.St -p1003.1-96 .
diff --git a/lib/libc/gen/sem_post.3 b/lib/libc/gen/sem_post.3
index 34fef83..970550d 100644
--- a/lib/libc/gen/sem_post.3
+++ b/lib/libc/gen/sem_post.3
@@ -71,6 +71,5 @@ points to an invalid semaphore.
 .Xr sem_wait 3
 .Sh STANDARDS
 .Fn sem_post
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc/gen/sem_wait.3 b/lib/libc/gen/sem_wait.3
index ab08582..beff2e3 100644
--- a/lib/libc/gen/sem_wait.3
+++ b/lib/libc/gen/sem_wait.3
@@ -89,6 +89,5 @@ The semaphore value was zero, and thus could not be decremented.
 .Fn sem_wait
 and
 .Fn sem_trywait
-conform to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conform to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_cancel.3 b/lib/libc_r/man/pthread_cancel.3
index 9a741d8..2e392de 100644
--- a/lib/libc_r/man/pthread_cancel.3
+++ b/lib/libc_r/man/pthread_cancel.3
@@ -68,9 +68,8 @@ thread ID.
 .Xr pthread_testcancel 3
 .Sh STANDARDS
 .Fn pthread_cancel
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
 .Sh AUTHORS
 This man page was written by
 .An David Leonard Aq d@openbsd.org
diff --git a/lib/libc_r/man/pthread_cleanup_pop.3 b/lib/libc_r/man/pthread_cleanup_pop.3
index a2f7894..3cefb61 100644
--- a/lib/libc_r/man/pthread_cleanup_pop.3
+++ b/lib/libc_r/man/pthread_cleanup_pop.3
@@ -60,6 +60,5 @@ None
 .Xr pthread_exit 3
 .Sh STANDARDS
 .Fn pthread_cleanup_pop
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_cleanup_push.3 b/lib/libc_r/man/pthread_cleanup_push.3
index 103daa6..b04c212 100644
--- a/lib/libc_r/man/pthread_cleanup_push.3
+++ b/lib/libc_r/man/pthread_cleanup_push.3
@@ -62,6 +62,5 @@ None
 .Xr pthread_exit 3
 .Sh STANDARDS
 .Fn pthread_cleanup_push
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_cond_broadcast.3 b/lib/libc_r/man/pthread_cond_broadcast.3
index c380ece..47d0bb4 100644
--- a/lib/libc_r/man/pthread_cond_broadcast.3
+++ b/lib/libc_r/man/pthread_cond_broadcast.3
@@ -67,6 +67,5 @@ is invalid.
 .Xr pthread_cond_wait 3
 .Sh STANDARDS
 .Fn pthread_cond_broadcast
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_cond_destroy.3 b/lib/libc_r/man/pthread_cond_destroy.3
index bf8bbf3..380aa69 100644
--- a/lib/libc_r/man/pthread_cond_destroy.3
+++ b/lib/libc_r/man/pthread_cond_destroy.3
@@ -71,6 +71,5 @@ is locked by another thread.
 .Xr pthread_cond_wait 3
 .Sh STANDARDS
 .Fn pthread_cond_destroy
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_cond_init.3 b/lib/libc_r/man/pthread_cond_init.3
index 6c7ccca..3c33299 100644
--- a/lib/libc_r/man/pthread_cond_init.3
+++ b/lib/libc_r/man/pthread_cond_init.3
@@ -76,6 +76,5 @@ The temporarily lacks the resources to create another condition variable.
 .Xr pthread_cond_wait 3
 .Sh STANDARDS
 .Fn pthread_cond_init
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_cond_signal.3 b/lib/libc_r/man/pthread_cond_signal.3
index 7ad985e..1583975 100644
--- a/lib/libc_r/man/pthread_cond_signal.3
+++ b/lib/libc_r/man/pthread_cond_signal.3
@@ -67,6 +67,5 @@ is invalid.
 .Xr pthread_cond_wait 3
 .Sh STANDARDS
 .Fn pthread_cond_signal
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_cond_timedwait.3 b/lib/libc_r/man/pthread_cond_timedwait.3
index e80c2bf..c7142d0 100644
--- a/lib/libc_r/man/pthread_cond_timedwait.3
+++ b/lib/libc_r/man/pthread_cond_timedwait.3
@@ -86,6 +86,5 @@ The system time has reached or exceeded the time specified in
 .Xr pthread_cond_wait 3
 .Sh STANDARDS
 .Fn pthread_cond_timedwait
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_cond_wait.3 b/lib/libc_r/man/pthread_cond_wait.3
index 024367a..e2d6094 100644
--- a/lib/libc_r/man/pthread_cond_wait.3
+++ b/lib/libc_r/man/pthread_cond_wait.3
@@ -80,6 +80,5 @@ is invalid.
 .Xr pthread_cond_timedwait 3
 .Sh STANDARDS
 .Fn pthread_cond_wait
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_create.3 b/lib/libc_r/man/pthread_create.3
index 2f760d0..66c8038 100644
--- a/lib/libc_r/man/pthread_create.3
+++ b/lib/libc_r/man/pthread_create.3
@@ -118,6 +118,5 @@ is invalid.
 .Xr pthread_join 3
 .Sh STANDARDS
 .Fn pthread_create
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_detach.3 b/lib/libc_r/man/pthread_detach.3
index 05154fc..329db62 100644
--- a/lib/libc_r/man/pthread_detach.3
+++ b/lib/libc_r/man/pthread_detach.3
@@ -86,6 +86,5 @@ thread ID,
 .Xr pthread_join 3
 .Sh STANDARDS
 .Fn pthread_detach
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_equal.3 b/lib/libc_r/man/pthread_equal.3
index 9e9f5c7..d953309 100644
--- a/lib/libc_r/man/pthread_equal.3
+++ b/lib/libc_r/man/pthread_equal.3
@@ -65,6 +65,5 @@ None.
 .Xr pthread_exit 3
 .Sh STANDARDS
 .Fn pthread_equal
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_exit.3 b/lib/libc_r/man/pthread_exit.3
index 6f95e9d..f245258 100644
--- a/lib/libc_r/man/pthread_exit.3
+++ b/lib/libc_r/man/pthread_exit.3
@@ -102,6 +102,5 @@ None.
 .Xr pthread_join 3
 .Sh STANDARDS
 .Fn pthread_exit
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_getspecific.3 b/lib/libc_r/man/pthread_getspecific.3
index 9900d29..4bcb0d9 100644
--- a/lib/libc_r/man/pthread_getspecific.3
+++ b/lib/libc_r/man/pthread_getspecific.3
@@ -79,6 +79,5 @@ None.
 .Xr pthread_setspecific 3
 .Sh STANDARDS
 .Fn pthread_getspecific
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_join.3 b/lib/libc_r/man/pthread_join.3
index d6a42e5..9a41294 100644
--- a/lib/libc_r/man/pthread_join.3
+++ b/lib/libc_r/man/pthread_join.3
@@ -102,6 +102,5 @@ specifies the calling thread.
 .Xr pthread_create 3
 .Sh STANDARDS
 .Fn pthread_join
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_key_create.3 b/lib/libc_r/man/pthread_key_create.3
index f6a1d9c..44aecfe 100644
--- a/lib/libc_r/man/pthread_key_create.3
+++ b/lib/libc_r/man/pthread_key_create.3
@@ -104,6 +104,5 @@ Insufficient memory exists to create the key.
 .Xr pthread_setspecific 3
 .Sh STANDARDS
 .Fn pthread_key_create
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_key_delete.3 b/lib/libc_r/man/pthread_key_delete.3
index e735eb6..8b1019d 100644
--- a/lib/libc_r/man/pthread_key_delete.3
+++ b/lib/libc_r/man/pthread_key_delete.3
@@ -95,6 +95,5 @@ value is invalid.
 .Xr pthread_setspecific 3
 .Sh STANDARDS
 .Fn pthread_key_delete
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_mutex_destroy.3 b/lib/libc_r/man/pthread_mutex_destroy.3
index 87384dc..4863c90 100644
--- a/lib/libc_r/man/pthread_mutex_destroy.3
+++ b/lib/libc_r/man/pthread_mutex_destroy.3
@@ -69,6 +69,5 @@ is locked by another thread.
 .Xr pthread_mutex_unlock 3
 .Sh STANDARDS
 .Fn pthread_mutex_destroy
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_mutex_init.3 b/lib/libc_r/man/pthread_mutex_init.3
index ba19e3b..0e5f43e 100644
--- a/lib/libc_r/man/pthread_mutex_init.3
+++ b/lib/libc_r/man/pthread_mutex_init.3
@@ -74,6 +74,5 @@ The temporarily lacks the resources to create another mutex.
 .Xr pthread_mutex_unlock 3
 .Sh STANDARDS
 .Fn pthread_mutex_init
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_mutex_lock.3 b/lib/libc_r/man/pthread_mutex_lock.3
index 0c6419a..1cd462f 100644
--- a/lib/libc_r/man/pthread_mutex_lock.3
+++ b/lib/libc_r/man/pthread_mutex_lock.3
@@ -71,6 +71,5 @@ A deadlock would occur if the thread blocked waiting for
 .Xr pthread_mutex_unlock 3
 .Sh STANDARDS
 .Fn pthread_mutex_lock
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_mutex_trylock.3 b/lib/libc_r/man/pthread_mutex_trylock.3
index 268a558..8dc9802 100644
--- a/lib/libc_r/man/pthread_mutex_trylock.3
+++ b/lib/libc_r/man/pthread_mutex_trylock.3
@@ -72,6 +72,5 @@ is already locked.
 .Xr pthread_mutex_unlock 3
 .Sh STANDARDS
 .Fn pthread_mutex_trylock
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_mutex_unlock.3 b/lib/libc_r/man/pthread_mutex_unlock.3
index 29d5c61..c72fc3e 100644
--- a/lib/libc_r/man/pthread_mutex_unlock.3
+++ b/lib/libc_r/man/pthread_mutex_unlock.3
@@ -71,6 +71,5 @@ The current thread does not hold a lock on
 .Xr pthread_mutex_trylock 3
 .Sh STANDARDS
 .Fn pthread_mutex_unlock
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_once.3 b/lib/libc_r/man/pthread_once.3
index e77e180..48a4279 100644
--- a/lib/libc_r/man/pthread_once.3
+++ b/lib/libc_r/man/pthread_once.3
@@ -103,6 +103,5 @@ None.
 .Pp
 .Sh STANDARDS
 .Fn pthread_once
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_self.3 b/lib/libc_r/man/pthread_self.3
index c196875..c7a8dc3 100644
--- a/lib/libc_r/man/pthread_self.3
+++ b/lib/libc_r/man/pthread_self.3
@@ -58,6 +58,5 @@ None.
 .Xr pthread_equal 3
 .Sh STANDARDS
 .Fn pthread_self
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_setspecific.3 b/lib/libc_r/man/pthread_setspecific.3
index 2ab28de..d211c94 100644
--- a/lib/libc_r/man/pthread_setspecific.3
+++ b/lib/libc_r/man/pthread_setspecific.3
@@ -92,6 +92,5 @@ value is invalid.
 .Xr pthread_key_delete 3
 .Sh STANDARDS
 .Fn pthread_setspecific
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/pthread_testcancel.3 b/lib/libc_r/man/pthread_testcancel.3
index c27c16d..2bb4ae2 100644
--- a/lib/libc_r/man/pthread_testcancel.3
+++ b/lib/libc_r/man/pthread_testcancel.3
@@ -190,9 +190,8 @@ or
 .Xr pthread_cancel 3
 .Sh STANDARDS
 .Fn pthread_testcancel
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
 .Sh AUTHORS
 This man page was written by
 .An David Leonard Aq d@openbsd.org
diff --git a/lib/libc_r/man/sem_destroy.3 b/lib/libc_r/man/sem_destroy.3
index bc66ffd..4074adc 100644
--- a/lib/libc_r/man/sem_destroy.3
+++ b/lib/libc_r/man/sem_destroy.3
@@ -71,9 +71,8 @@ points to.
 .Xr sem_init 3
 .Sh STANDARDS
 .Fn sem_destroy
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conforms to
+.St -p1003.1-96 .
 .Pp
 POSIX does not define the behavior of
 .Fn sem_destroy
diff --git a/lib/libc_r/man/sem_getvalue.3 b/lib/libc_r/man/sem_getvalue.3
index 9e2c560..e9ac2a6 100644
--- a/lib/libc_r/man/sem_getvalue.3
+++ b/lib/libc_r/man/sem_getvalue.3
@@ -69,9 +69,8 @@ points to an invalid semaphore.
 .Xr sem_wait 3
 .Sh STANDARDS
 .Fn sem_getvalue
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conforms to
+.St -p1003.1-96 .
 .Pp
 The value of the semaphore is never negative, even if there are threads blocked
 on the semaphore.  POSIX is somewhat ambiguous in its wording with regard to
diff --git a/lib/libc_r/man/sem_init.3 b/lib/libc_r/man/sem_init.3
index ae791ba..a727fe2 100644
--- a/lib/libc_r/man/sem_init.3
+++ b/lib/libc_r/man/sem_init.3
@@ -88,9 +88,8 @@ Unable to initialize a shared semaphore.
 .Xr sem_wait 3
 .Sh STANDARDS
 .Fn sem_init
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conforms to
+.St -p1003.1-96 .
 .Pp
 This implementation does not support shared semaphores, and reports this fact
 by setting
diff --git a/lib/libc_r/man/sem_open.3 b/lib/libc_r/man/sem_open.3
index a948bdc..22229b3 100644
--- a/lib/libc_r/man/sem_open.3
+++ b/lib/libc_r/man/sem_open.3
@@ -77,6 +77,5 @@ Function not supported by this implementation.
 .Fn sem_close ,
 and
 .Fn sem_unlink
-conform to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conform to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/sem_post.3 b/lib/libc_r/man/sem_post.3
index 34fef83..970550d 100644
--- a/lib/libc_r/man/sem_post.3
+++ b/lib/libc_r/man/sem_post.3
@@ -71,6 +71,5 @@ points to an invalid semaphore.
 .Xr sem_wait 3
 .Sh STANDARDS
 .Fn sem_post
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libc_r/man/sem_wait.3 b/lib/libc_r/man/sem_wait.3
index ab08582..beff2e3 100644
--- a/lib/libc_r/man/sem_wait.3
+++ b/lib/libc_r/man/sem_wait.3
@@ -89,6 +89,5 @@ The semaphore value was zero, and thus could not be decremented.
 .Fn sem_wait
 and
 .Fn sem_trywait
-conform to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conform to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_cancel.3 b/lib/libpthread/man/pthread_cancel.3
index 9a741d8..2e392de 100644
--- a/lib/libpthread/man/pthread_cancel.3
+++ b/lib/libpthread/man/pthread_cancel.3
@@ -68,9 +68,8 @@ thread ID.
 .Xr pthread_testcancel 3
 .Sh STANDARDS
 .Fn pthread_cancel
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
 .Sh AUTHORS
 This man page was written by
 .An David Leonard Aq d@openbsd.org
diff --git a/lib/libpthread/man/pthread_cleanup_pop.3 b/lib/libpthread/man/pthread_cleanup_pop.3
index a2f7894..3cefb61 100644
--- a/lib/libpthread/man/pthread_cleanup_pop.3
+++ b/lib/libpthread/man/pthread_cleanup_pop.3
@@ -60,6 +60,5 @@ None
 .Xr pthread_exit 3
 .Sh STANDARDS
 .Fn pthread_cleanup_pop
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_cleanup_push.3 b/lib/libpthread/man/pthread_cleanup_push.3
index 103daa6..b04c212 100644
--- a/lib/libpthread/man/pthread_cleanup_push.3
+++ b/lib/libpthread/man/pthread_cleanup_push.3
@@ -62,6 +62,5 @@ None
 .Xr pthread_exit 3
 .Sh STANDARDS
 .Fn pthread_cleanup_push
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_cond_broadcast.3 b/lib/libpthread/man/pthread_cond_broadcast.3
index c380ece..47d0bb4 100644
--- a/lib/libpthread/man/pthread_cond_broadcast.3
+++ b/lib/libpthread/man/pthread_cond_broadcast.3
@@ -67,6 +67,5 @@ is invalid.
 .Xr pthread_cond_wait 3
 .Sh STANDARDS
 .Fn pthread_cond_broadcast
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_cond_destroy.3 b/lib/libpthread/man/pthread_cond_destroy.3
index bf8bbf3..380aa69 100644
--- a/lib/libpthread/man/pthread_cond_destroy.3
+++ b/lib/libpthread/man/pthread_cond_destroy.3
@@ -71,6 +71,5 @@ is locked by another thread.
 .Xr pthread_cond_wait 3
 .Sh STANDARDS
 .Fn pthread_cond_destroy
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_cond_init.3 b/lib/libpthread/man/pthread_cond_init.3
index 6c7ccca..3c33299 100644
--- a/lib/libpthread/man/pthread_cond_init.3
+++ b/lib/libpthread/man/pthread_cond_init.3
@@ -76,6 +76,5 @@ The temporarily lacks the resources to create another condition variable.
 .Xr pthread_cond_wait 3
 .Sh STANDARDS
 .Fn pthread_cond_init
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_cond_signal.3 b/lib/libpthread/man/pthread_cond_signal.3
index 7ad985e..1583975 100644
--- a/lib/libpthread/man/pthread_cond_signal.3
+++ b/lib/libpthread/man/pthread_cond_signal.3
@@ -67,6 +67,5 @@ is invalid.
 .Xr pthread_cond_wait 3
 .Sh STANDARDS
 .Fn pthread_cond_signal
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_cond_timedwait.3 b/lib/libpthread/man/pthread_cond_timedwait.3
index e80c2bf..c7142d0 100644
--- a/lib/libpthread/man/pthread_cond_timedwait.3
+++ b/lib/libpthread/man/pthread_cond_timedwait.3
@@ -86,6 +86,5 @@ The system time has reached or exceeded the time specified in
 .Xr pthread_cond_wait 3
 .Sh STANDARDS
 .Fn pthread_cond_timedwait
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_cond_wait.3 b/lib/libpthread/man/pthread_cond_wait.3
index 024367a..e2d6094 100644
--- a/lib/libpthread/man/pthread_cond_wait.3
+++ b/lib/libpthread/man/pthread_cond_wait.3
@@ -80,6 +80,5 @@ is invalid.
 .Xr pthread_cond_timedwait 3
 .Sh STANDARDS
 .Fn pthread_cond_wait
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_create.3 b/lib/libpthread/man/pthread_create.3
index 2f760d0..66c8038 100644
--- a/lib/libpthread/man/pthread_create.3
+++ b/lib/libpthread/man/pthread_create.3
@@ -118,6 +118,5 @@ is invalid.
 .Xr pthread_join 3
 .Sh STANDARDS
 .Fn pthread_create
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_detach.3 b/lib/libpthread/man/pthread_detach.3
index 05154fc..329db62 100644
--- a/lib/libpthread/man/pthread_detach.3
+++ b/lib/libpthread/man/pthread_detach.3
@@ -86,6 +86,5 @@ thread ID,
 .Xr pthread_join 3
 .Sh STANDARDS
 .Fn pthread_detach
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_equal.3 b/lib/libpthread/man/pthread_equal.3
index 9e9f5c7..d953309 100644
--- a/lib/libpthread/man/pthread_equal.3
+++ b/lib/libpthread/man/pthread_equal.3
@@ -65,6 +65,5 @@ None.
 .Xr pthread_exit 3
 .Sh STANDARDS
 .Fn pthread_equal
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_exit.3 b/lib/libpthread/man/pthread_exit.3
index 6f95e9d..f245258 100644
--- a/lib/libpthread/man/pthread_exit.3
+++ b/lib/libpthread/man/pthread_exit.3
@@ -102,6 +102,5 @@ None.
 .Xr pthread_join 3
 .Sh STANDARDS
 .Fn pthread_exit
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_getspecific.3 b/lib/libpthread/man/pthread_getspecific.3
index 9900d29..4bcb0d9 100644
--- a/lib/libpthread/man/pthread_getspecific.3
+++ b/lib/libpthread/man/pthread_getspecific.3
@@ -79,6 +79,5 @@ None.
 .Xr pthread_setspecific 3
 .Sh STANDARDS
 .Fn pthread_getspecific
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_join.3 b/lib/libpthread/man/pthread_join.3
index d6a42e5..9a41294 100644
--- a/lib/libpthread/man/pthread_join.3
+++ b/lib/libpthread/man/pthread_join.3
@@ -102,6 +102,5 @@ specifies the calling thread.
 .Xr pthread_create 3
 .Sh STANDARDS
 .Fn pthread_join
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_key_create.3 b/lib/libpthread/man/pthread_key_create.3
index f6a1d9c..44aecfe 100644
--- a/lib/libpthread/man/pthread_key_create.3
+++ b/lib/libpthread/man/pthread_key_create.3
@@ -104,6 +104,5 @@ Insufficient memory exists to create the key.
 .Xr pthread_setspecific 3
 .Sh STANDARDS
 .Fn pthread_key_create
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_key_delete.3 b/lib/libpthread/man/pthread_key_delete.3
index e735eb6..8b1019d 100644
--- a/lib/libpthread/man/pthread_key_delete.3
+++ b/lib/libpthread/man/pthread_key_delete.3
@@ -95,6 +95,5 @@ value is invalid.
 .Xr pthread_setspecific 3
 .Sh STANDARDS
 .Fn pthread_key_delete
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_mutex_destroy.3 b/lib/libpthread/man/pthread_mutex_destroy.3
index 87384dc..4863c90 100644
--- a/lib/libpthread/man/pthread_mutex_destroy.3
+++ b/lib/libpthread/man/pthread_mutex_destroy.3
@@ -69,6 +69,5 @@ is locked by another thread.
 .Xr pthread_mutex_unlock 3
 .Sh STANDARDS
 .Fn pthread_mutex_destroy
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_mutex_init.3 b/lib/libpthread/man/pthread_mutex_init.3
index ba19e3b..0e5f43e 100644
--- a/lib/libpthread/man/pthread_mutex_init.3
+++ b/lib/libpthread/man/pthread_mutex_init.3
@@ -74,6 +74,5 @@ The temporarily lacks the resources to create another mutex.
 .Xr pthread_mutex_unlock 3
 .Sh STANDARDS
 .Fn pthread_mutex_init
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_mutex_lock.3 b/lib/libpthread/man/pthread_mutex_lock.3
index 0c6419a..1cd462f 100644
--- a/lib/libpthread/man/pthread_mutex_lock.3
+++ b/lib/libpthread/man/pthread_mutex_lock.3
@@ -71,6 +71,5 @@ A deadlock would occur if the thread blocked waiting for
 .Xr pthread_mutex_unlock 3
 .Sh STANDARDS
 .Fn pthread_mutex_lock
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_mutex_trylock.3 b/lib/libpthread/man/pthread_mutex_trylock.3
index 268a558..8dc9802 100644
--- a/lib/libpthread/man/pthread_mutex_trylock.3
+++ b/lib/libpthread/man/pthread_mutex_trylock.3
@@ -72,6 +72,5 @@ is already locked.
 .Xr pthread_mutex_unlock 3
 .Sh STANDARDS
 .Fn pthread_mutex_trylock
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_mutex_unlock.3 b/lib/libpthread/man/pthread_mutex_unlock.3
index 29d5c61..c72fc3e 100644
--- a/lib/libpthread/man/pthread_mutex_unlock.3
+++ b/lib/libpthread/man/pthread_mutex_unlock.3
@@ -71,6 +71,5 @@ The current thread does not hold a lock on
 .Xr pthread_mutex_trylock 3
 .Sh STANDARDS
 .Fn pthread_mutex_unlock
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_once.3 b/lib/libpthread/man/pthread_once.3
index e77e180..48a4279 100644
--- a/lib/libpthread/man/pthread_once.3
+++ b/lib/libpthread/man/pthread_once.3
@@ -103,6 +103,5 @@ None.
 .Pp
 .Sh STANDARDS
 .Fn pthread_once
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_self.3 b/lib/libpthread/man/pthread_self.3
index c196875..c7a8dc3 100644
--- a/lib/libpthread/man/pthread_self.3
+++ b/lib/libpthread/man/pthread_self.3
@@ -58,6 +58,5 @@ None.
 .Xr pthread_equal 3
 .Sh STANDARDS
 .Fn pthread_self
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_setspecific.3 b/lib/libpthread/man/pthread_setspecific.3
index 2ab28de..d211c94 100644
--- a/lib/libpthread/man/pthread_setspecific.3
+++ b/lib/libpthread/man/pthread_setspecific.3
@@ -92,6 +92,5 @@ value is invalid.
 .Xr pthread_key_delete 3
 .Sh STANDARDS
 .Fn pthread_setspecific
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/pthread_testcancel.3 b/lib/libpthread/man/pthread_testcancel.3
index c27c16d..2bb4ae2 100644
--- a/lib/libpthread/man/pthread_testcancel.3
+++ b/lib/libpthread/man/pthread_testcancel.3
@@ -190,9 +190,8 @@ or
 .Xr pthread_cancel 3
 .Sh STANDARDS
 .Fn pthread_testcancel
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .
 .Sh AUTHORS
 This man page was written by
 .An David Leonard Aq d@openbsd.org
diff --git a/lib/libpthread/man/sem_destroy.3 b/lib/libpthread/man/sem_destroy.3
index bc66ffd..4074adc 100644
--- a/lib/libpthread/man/sem_destroy.3
+++ b/lib/libpthread/man/sem_destroy.3
@@ -71,9 +71,8 @@ points to.
 .Xr sem_init 3
 .Sh STANDARDS
 .Fn sem_destroy
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conforms to
+.St -p1003.1-96 .
 .Pp
 POSIX does not define the behavior of
 .Fn sem_destroy
diff --git a/lib/libpthread/man/sem_getvalue.3 b/lib/libpthread/man/sem_getvalue.3
index 9e2c560..e9ac2a6 100644
--- a/lib/libpthread/man/sem_getvalue.3
+++ b/lib/libpthread/man/sem_getvalue.3
@@ -69,9 +69,8 @@ points to an invalid semaphore.
 .Xr sem_wait 3
 .Sh STANDARDS
 .Fn sem_getvalue
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conforms to
+.St -p1003.1-96 .
 .Pp
 The value of the semaphore is never negative, even if there are threads blocked
 on the semaphore.  POSIX is somewhat ambiguous in its wording with regard to
diff --git a/lib/libpthread/man/sem_init.3 b/lib/libpthread/man/sem_init.3
index ae791ba..a727fe2 100644
--- a/lib/libpthread/man/sem_init.3
+++ b/lib/libpthread/man/sem_init.3
@@ -88,9 +88,8 @@ Unable to initialize a shared semaphore.
 .Xr sem_wait 3
 .Sh STANDARDS
 .Fn sem_init
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conforms to
+.St -p1003.1-96 .
 .Pp
 This implementation does not support shared semaphores, and reports this fact
 by setting
diff --git a/lib/libpthread/man/sem_open.3 b/lib/libpthread/man/sem_open.3
index a948bdc..22229b3 100644
--- a/lib/libpthread/man/sem_open.3
+++ b/lib/libpthread/man/sem_open.3
@@ -77,6 +77,5 @@ Function not supported by this implementation.
 .Fn sem_close ,
 and
 .Fn sem_unlink
-conform to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conform to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/sem_post.3 b/lib/libpthread/man/sem_post.3
index 34fef83..970550d 100644
--- a/lib/libpthread/man/sem_post.3
+++ b/lib/libpthread/man/sem_post.3
@@ -71,6 +71,5 @@ points to an invalid semaphore.
 .Xr sem_wait 3
 .Sh STANDARDS
 .Fn sem_post
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conforms to
+.St -p1003.1-96 .
diff --git a/lib/libpthread/man/sem_wait.3 b/lib/libpthread/man/sem_wait.3
index ab08582..beff2e3 100644
--- a/lib/libpthread/man/sem_wait.3
+++ b/lib/libpthread/man/sem_wait.3
@@ -89,6 +89,5 @@ The semaphore value was zero, and thus could not be decremented.
 .Fn sem_wait
 and
 .Fn sem_trywait
-conform to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 1996 Edition.
+conform to
+.St -p1003.1-96 .