Use .St for standards. Random cleanups as well.

28 files changed, 169 insertions, 124 deletions

diff --git a/lib/libpthread/man/pthread_cancel.3 b/lib/libpthread/man/pthread_cancel.3
index 2d863956b28..d03467a8c73 100644
--- a/lib/libpthread/man/pthread_cancel.3
+++ b/lib/libpthread/man/pthread_cancel.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_cancel.3,v 1.8 2001/12/07 15:47:44 fgsch Exp $
+.\" $OpenBSD: pthread_cancel.3,v 1.9 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .Dd January 17, 1999
 .Dt PTHREAD_CANCEL 3
 .Os
@@ -61,6 +62,5 @@ thread ID.
 .Xr pthread_testcancel 3
 .Sh STANDARDS
 .Fn pthread_cancel
-conform 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_pop.3 b/lib/libpthread/man/pthread_cleanup_pop.3
index 9ca21a90bb8..c642070445a 100644
--- a/lib/libpthread/man/pthread_cleanup_pop.3
+++ b/lib/libpthread/man/pthread_cleanup_pop.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_cleanup_pop.3,v 1.5 2001/06/24 18:17:30 jasoni Exp $
+.\" $OpenBSD: pthread_cleanup_pop.3,v 1.6 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1997 Brian Cully <shmit@kublai.com>
 .\" All rights reserved.
 .\"
@@ -58,6 +59,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_cond_broadcast.3 b/lib/libpthread/man/pthread_cond_broadcast.3
index 6383ecf136c..11c8910989c 100644
--- a/lib/libpthread/man/pthread_cond_broadcast.3
+++ b/lib/libpthread/man/pthread_cond_broadcast.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_cond_broadcast.3,v 1.5 1999/11/24 05:35:31 d Exp $
+.\" $OpenBSD: pthread_cond_broadcast.3,v 1.6 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1997 Brian Cully <shmit@kublai.com>
 .\" All rights reserved.
 .\"
@@ -65,6 +66,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 18404d26b3f..3ec164b6ee3 100644
--- a/lib/libpthread/man/pthread_cond_destroy.3
+++ b/lib/libpthread/man/pthread_cond_destroy.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_cond_destroy.3,v 1.6 2002/01/28 19:27:29 fgsch Exp $
+.\" $OpenBSD: pthread_cond_destroy.3,v 1.7 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1997 Brian Cully <shmit@kublai.com>
 .\" All rights reserved.
 .\"
@@ -69,6 +70,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 7445f6abe07..ef4d2005b99 100644
--- a/lib/libpthread/man/pthread_cond_init.3
+++ b/lib/libpthread/man/pthread_cond_init.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_cond_init.3,v 1.7 2001/05/31 21:48:23 jasoni Exp $
+.\" $OpenBSD: pthread_cond_init.3,v 1.8 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1997 Brian Cully <shmit@kublai.com>
 .\" All rights reserved.
 .\"
@@ -77,6 +78,5 @@ 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 3aa39820b2f..23c62192ebd 100644
--- a/lib/libpthread/man/pthread_cond_signal.3
+++ b/lib/libpthread/man/pthread_cond_signal.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_cond_signal.3,v 1.5 1999/11/24 05:35:31 d Exp $
+.\" $OpenBSD: pthread_cond_signal.3,v 1.6 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1997 Brian Cully <shmit@kublai.com>
 .\" All rights reserved.
 .\"
@@ -65,6 +66,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 c923b264d3d..22c2df147a0 100644
--- a/lib/libpthread/man/pthread_cond_timedwait.3
+++ b/lib/libpthread/man/pthread_cond_timedwait.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_cond_timedwait.3,v 1.6 2000/02/10 11:46:24 d Exp $
+.\" $OpenBSD: pthread_cond_timedwait.3,v 1.7 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1997 Brian Cully <shmit@kublai.com>
 .\" All rights reserved.
 .\"
@@ -83,6 +84,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 3f1370d3b1f..70fe207baf4 100644
--- a/lib/libpthread/man/pthread_cond_wait.3
+++ b/lib/libpthread/man/pthread_cond_wait.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_cond_wait.3,v 1.6 2001/08/20 21:17:34 pvalchev Exp $
+.\" $OpenBSD: pthread_cond_wait.3,v 1.7 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1997 Brian Cully <shmit@kublai.com>
 .\" All rights reserved.
 .\"
@@ -76,6 +77,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 800c784ed8c..8bae34329dc 100644
--- a/lib/libpthread/man/pthread_create.3
+++ b/lib/libpthread/man/pthread_create.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_create.3,v 1.7 2001/06/24 18:17:30 jasoni Exp $
+.\" $OpenBSD: pthread_create.3,v 1.8 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
 .\" All rights reserved.
 .\"
@@ -113,6 +114,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 c1b62a5d5d1..4aa837643aa 100644
--- a/lib/libpthread/man/pthread_detach.3
+++ b/lib/libpthread/man/pthread_detach.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_detach.3,v 1.8 2001/06/24 18:17:30 jasoni Exp $
+.\" $OpenBSD: pthread_detach.3,v 1.9 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1996-1998 John Birrell <jb@cimlogic.com.au>.
 .\" All rights reserved.
 .\"
@@ -80,6 +81,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 7abf2c58a2a..d43bb802736 100644
--- a/lib/libpthread/man/pthread_equal.3
+++ b/lib/libpthread/man/pthread_equal.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_equal.3,v 1.6 2001/06/01 00:07:11 jasoni Exp $
+.\" $OpenBSD: pthread_equal.3,v 1.7 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
 .\" All rights reserved.
 .\"
@@ -63,6 +64,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 eba7cbba253..db1b4fbf03f 100644
--- a/lib/libpthread/man/pthread_exit.3
+++ b/lib/libpthread/man/pthread_exit.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_exit.3,v 1.8 2001/08/03 21:10:23 deraadt Exp $
+.\" $OpenBSD: pthread_exit.3,v 1.9 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
 .\" All rights reserved.
 .\"
@@ -95,6 +96,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 e2b166e9cb4..bf319ffc029 100644
--- a/lib/libpthread/man/pthread_getspecific.3
+++ b/lib/libpthread/man/pthread_getspecific.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_getspecific.3,v 1.4 1999/11/24 05:35:32 d Exp $
+.\" $OpenBSD: pthread_getspecific.3,v 1.5 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
 .\" All rights reserved.
 .\"
@@ -78,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 53992e1117c..4399970816a 100644
--- a/lib/libpthread/man/pthread_join.3
+++ b/lib/libpthread/man/pthread_join.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_join.3,v 1.6 2001/06/24 23:46:35 jasoni Exp $
+.\" $OpenBSD: pthread_join.3,v 1.7 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1996-1998 John Birrell <jb@cimlogic.com.au>.
 .\" All rights reserved.
 .\"
@@ -96,6 +97,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 548e96ac5db..08ba9ea7e3e 100644
--- a/lib/libpthread/man/pthread_key_create.3
+++ b/lib/libpthread/man/pthread_key_create.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_key_create.3,v 1.5 1999/11/24 05:35:32 d Exp $
+.\" $OpenBSD: pthread_key_create.3,v 1.6 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
 .\" All rights reserved.
 .\"
@@ -95,6 +96,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 ce95dbf6e5e..0135abd7357 100644
--- a/lib/libpthread/man/pthread_key_delete.3
+++ b/lib/libpthread/man/pthread_key_delete.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_key_delete.3,v 1.5 1999/11/24 05:35:32 d Exp $
+.\" $OpenBSD: pthread_key_delete.3,v 1.6 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
 .\" All rights reserved.
 .\"
@@ -89,6 +90,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 9cc1360c9d7..66ad2ea04b7 100644
--- a/lib/libpthread/man/pthread_mutex_destroy.3
+++ b/lib/libpthread/man/pthread_mutex_destroy.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_mutex_destroy.3,v 1.6 1999/11/24 05:35:32 d Exp $
+.\" $OpenBSD: pthread_mutex_destroy.3,v 1.7 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1997 Brian Cully <shmit@kublai.com>
 .\" All rights reserved.
 .\"
@@ -67,6 +68,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 a8c5d937dba..55cb09bdf62 100644
--- a/lib/libpthread/man/pthread_mutex_init.3
+++ b/lib/libpthread/man/pthread_mutex_init.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_mutex_init.3,v 1.6 1999/11/24 05:35:32 d Exp $
+.\" $OpenBSD: pthread_mutex_init.3,v 1.7 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1997 Brian Cully <shmit@kublai.com>
 .\" All rights reserved.
 .\"
@@ -74,6 +75,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 66d211064d4..d506ce0d0fa 100644
--- a/lib/libpthread/man/pthread_mutex_lock.3
+++ b/lib/libpthread/man/pthread_mutex_lock.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_mutex_lock.3,v 1.5 1999/11/24 05:35:32 d Exp $
+.\" $OpenBSD: pthread_mutex_lock.3,v 1.6 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1997 Brian Cully <shmit@kublai.com>
 .\" All rights reserved.
 .\"
@@ -69,6 +70,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 6475d5f7c61..ade8afec404 100644
--- a/lib/libpthread/man/pthread_mutex_trylock.3
+++ b/lib/libpthread/man/pthread_mutex_trylock.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_mutex_trylock.3,v 1.6 1999/11/24 05:35:32 d Exp $
+.\" $OpenBSD: pthread_mutex_trylock.3,v 1.7 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1997 Brian Cully <shmit@kublai.com>
 .\" All rights reserved.
 .\"
@@ -70,6 +71,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 ebf4113829e..09b1a3f33a4 100644
--- a/lib/libpthread/man/pthread_mutex_unlock.3
+++ b/lib/libpthread/man/pthread_mutex_unlock.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_mutex_unlock.3,v 1.5 1999/11/24 05:35:32 d Exp $
+.\" $OpenBSD: pthread_mutex_unlock.3,v 1.6 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1997 Brian Cully <shmit@kublai.com>
 .\" All rights reserved.
 .\"
@@ -69,6 +70,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_mutexattr.3 b/lib/libpthread/man/pthread_mutexattr.3
index 380b059c0e4..09b0a1a4b25 100644
--- a/lib/libpthread/man/pthread_mutexattr.3
+++ b/lib/libpthread/man/pthread_mutexattr.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_mutexattr.3,v 1.1 2001/08/04 13:56:19 fgsch Exp $
+.\" $OpenBSD: pthread_mutexattr.3,v 1.2 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (C) 2000 Jason Evans <jasone@freebsd.org>.
 .\" All rights reserved.
 .\"
@@ -162,9 +163,8 @@ Invalid value for
 .Fn pthread_mutexattr_init
 and
 .Fn pthread_mutexattr_destroy
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1 Second Edition 1996-07-12.
+conform to
+.St -p1003.1-96
 .Pp
 .Fn pthread_mutexattr_setprioceiling ,
 .Fn pthread_mutexattr_getprioceiling ,
diff --git a/lib/libpthread/man/pthread_once.3 b/lib/libpthread/man/pthread_once.3
index a2a41043b4f..4e1ae2a02de 100644
--- a/lib/libpthread/man/pthread_once.3
+++ b/lib/libpthread/man/pthread_once.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_once.3,v 1.8 2001/06/24 23:46:35 jasoni Exp $
+.\" $OpenBSD: pthread_once.3,v 1.9 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
 .\" All rights reserved.
 .\"
@@ -98,6 +99,5 @@ indicate the error.
 None.
 .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 edc4c20eb4d..03be4482f5c 100644
--- a/lib/libpthread/man/pthread_self.3
+++ b/lib/libpthread/man/pthread_self.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_self.3,v 1.5 1999/11/24 05:35:33 d Exp $
+.\" $OpenBSD: pthread_self.3,v 1.6 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
 .\" All rights reserved.
 .\"
@@ -56,6 +57,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 3d949d681ff..b64d052f192 100644
--- a/lib/libpthread/man/pthread_setspecific.3
+++ b/lib/libpthread/man/pthread_setspecific.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_setspecific.3,v 1.8 2001/06/24 23:46:35 jasoni Exp $
+.\" $OpenBSD: pthread_setspecific.3,v 1.9 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
 .\" All rights reserved.
 .\"
@@ -55,11 +56,11 @@ reserved for use by the calling thread.
 The effect of calling
 .Fn pthread_setspecific
 with a key value not obtained from
-.Fn pthread_key_create ,
+.Fn pthread_key_create
 or after
 .Fa key
 has been deleted with
-.Fn pthread_key_delete ,
+.Fn pthread_key_delete
 is undefined.
 .Pp
 .Fn pthread_setspecific
@@ -88,6 +89,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_sigmask.3 b/lib/libpthread/man/pthread_sigmask.3
index e3bc625974f..41aaf7c8c61 100644
--- a/lib/libpthread/man/pthread_sigmask.3
+++ b/lib/libpthread/man/pthread_sigmask.3
@@ -1,10 +1,11 @@
-.\" $OpenBSD: pthread_sigmask.3,v 1.3 1999/07/07 10:50:05 aaron Exp $
+.\" $OpenBSD: pthread_sigmask.3,v 1.4 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .Dd March 21, 1999
 .Dt PTHREAD_SIGMASK 3
 .Os
 .Sh NAME
 .Nm pthread_sigmask
-.Nd manipulate the current thread's signal mask
+.Nd examine and/or change a thread's signal mask
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Fd #include <signal.h>
@@ -13,19 +14,56 @@
 .Sh DESCRIPTION
 The
 .Fn pthread_sigmask
-function is identical to
-.Xr sigprocmask 2 ,
-except that it only affects the signal mask of the calling thread.
+function examines and/or changes the calling thread's signal mask.
+.Pp
+If
+.Fa set
+is not
+.Dv NULL ,
+it specifies a set of signals to be modified, and
+.Fa how
+specifies what to set the signal mask to:
+.Bl -tag -width SIG_UNBLOCK
+.It Dv SIG_BLOCK
+Union of the current mask and
+.Fa set .
+.It Dv SIG_UNBLOCK
+Intersection of the current mask and the complement of
+.Fa set .
+.It Dv SIG_SETMASK
+.Fa set .
+.El
+.Pp
+If
+.Fa oset
+is not NULL, the previous signal mask is stored in the location pointed to by
+.Fa oset .
+.Pp
+.Dv SIGKILL
+and
+.Dv SIGSTOP
+cannot be blocked, and will be silently ignored if included in the signal mask.
 .Sh RETURN VALUES
-The return values of
+If successful,
+.Fn pthread_sigmask
+returns 0.
+Otherwise, an error is returned.
+.Sh ERRORS
 .Fn pthread_sigmask
-are the same as
-.Xr sigprocmask 2 .
+will fail if:
+.Bl -tag -width Er
+.It Bq Er EINVAL
+.Fa how
+is not one of the defined values.
+.El
 .Sh SEE ALSO
+.Xr sigaction 2 ,
+.Xr sigpending 2 ,
 .Xr sigprocmask 2 ,
+.Xr sigsetops 3 ,
+.Xr sigsuspend 2 ,
 .Xr pthreads 3
 .Sh STANDARDS
 .Fn pthread_sigmask
-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 b34ae7c7d8c..f2eeb0106dc 100644
--- a/lib/libpthread/man/pthread_testcancel.3
+++ b/lib/libpthread/man/pthread_testcancel.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: pthread_testcancel.3,v 1.6 2000/01/22 13:59:29 aaron Exp $
+.\" $OpenBSD: pthread_testcancel.3,v 1.7 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .Dd January 17, 1999
 .Dt PTHREAD_TESTCANCEL 3
 .Os
@@ -21,7 +22,11 @@ The
 function atomically both sets the calling thread's cancelability state
 to the indicated
 .Fa state
-and returns the previous cancelability state at the location referenced by
+and, if
+.Fa oldstate
+is not
+.Dv NULL ,
+returns the previous cancelability state at the location referenced by
 .Fa oldstate .
 Legal values for
 .Fa state
@@ -35,7 +40,11 @@ The
 function atomically both sets the calling thread's cancelability type
 to the indicated
 .Fa type
-and returns the previous cancelability type at the location referenced by
+and, if
+.Fa oldtype
+is not
+.Dv NULL ,
+returns the previous cancelability type at the location referenced by
 .Fa oldtype .
 Legal values for
 .Fa type
@@ -178,6 +187,5 @@ 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   
diff --git a/lib/libpthread/man/sigwait.3 b/lib/libpthread/man/sigwait.3
index ace9af3f1c4..f13d6b9071b 100644
--- a/lib/libpthread/man/sigwait.3
+++ b/lib/libpthread/man/sigwait.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: sigwait.3,v 1.9 2000/03/07 19:58:22 alex Exp $
+.\" $OpenBSD: sigwait.3,v 1.10 2002/02/21 20:12:19 fgsch Exp $
+.\"
 .\" David Leonard <d@openbsd.org>, 1998. Public domain.
 .Dd August 20, 1998
 .Dt SIGWAIT 3
@@ -71,7 +72,5 @@ argument contains an invalid or unsupported signal number
 .Xr pthreads 3
 .Sh STANDARDS
 .Fn sigwait
-conforms to ISO/IEC 9945-1 ANSI/IEEE
-.Pq Dq Tn POSIX
-Std 1003.1c/D10.
-.\" Std 1003.1 Second Edition 1996-07-12.
+conforms to
+.St -p1003.1-96 .