From 46635b74ba728027b94e75c92129dd6a2a6265da Mon Sep 17 00:00:00 2001 From: guenther Date: Wed, 22 Feb 2023 06:31:51 +0000 Subject: [PATCH] Prefer "get or set" over "get/set" or "get and set". From discussion with schwarze@ and jmc@ ok jmc@ --- lib/libc/gen/getprogname.3 | 6 +++--- lib/libc/gen/posix_spawnattr_getflags.3 | 6 +++--- lib/libc/gen/posix_spawnattr_getpgroup.3 | 6 +++--- lib/libc/sys/__get_tcb.2 | 6 +++--- lib/libc/sys/getlogin.2 | 6 +++--- lib/libc/sys/getrtable.2 | 6 +++--- lib/libc/sys/getsockopt.2 | 6 +++--- lib/libc/sys/getthrname.2 | 6 +++--- lib/libpthread/man/pthread_barrierattr_getpshared.3 | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/libc/gen/getprogname.3 b/lib/libc/gen/getprogname.3 index 58e85b877cf..5542abc8477 100644 --- a/lib/libc/gen/getprogname.3 +++ b/lib/libc/gen/getprogname.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getprogname.3,v 1.5 2015/05/05 14:37:20 schwarze Exp $ +.\" $OpenBSD: getprogname.3,v 1.6 2023/02/22 06:31:51 guenther Exp $ .\" .\" Copyright (c) 2001 Christopher G. Demetriou .\" All rights reserved. @@ -30,13 +30,13 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 5 2015 $ +.Dd $Mdocdate: February 22 2023 $ .Dt GETPROGNAME 3 .Os .Sh NAME .Nm getprogname , .Nm setprogname -.Nd get/set the name of the current program +.Nd get or set the name of the current program .Sh SYNOPSIS .In stdlib.h .Ft const char * diff --git a/lib/libc/gen/posix_spawnattr_getflags.3 b/lib/libc/gen/posix_spawnattr_getflags.3 index b3ce91e4f95..a3f509f758e 100644 --- a/lib/libc/gen/posix_spawnattr_getflags.3 +++ b/lib/libc/gen/posix_spawnattr_getflags.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: posix_spawnattr_getflags.3,v 1.9 2014/11/30 02:41:43 schwarze Exp $ +.\" $OpenBSD: posix_spawnattr_getflags.3,v 1.10 2023/02/22 06:31:51 guenther Exp $ .\" .\" Copyright (c) 2012 Marc Espie .\" @@ -14,13 +14,13 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: November 30 2014 $ +.Dd $Mdocdate: February 22 2023 $ .Dt POSIX_SPAWNATTR_GETFLAGS 3 .Os .Sh NAME .Nm posix_spawnattr_getflags , .Nm posix_spawnattr_setflags -.Nd get and set flags of a posix_spawn attributes object +.Nd get or set flags of a posix_spawn attributes object .Sh SYNOPSIS .In spawn.h .Ft int diff --git a/lib/libc/gen/posix_spawnattr_getpgroup.3 b/lib/libc/gen/posix_spawnattr_getpgroup.3 index 544a5a9f1b7..10e807950b0 100644 --- a/lib/libc/gen/posix_spawnattr_getpgroup.3 +++ b/lib/libc/gen/posix_spawnattr_getpgroup.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: posix_spawnattr_getpgroup.3,v 1.9 2017/05/29 09:40:02 deraadt Exp $ +.\" $OpenBSD: posix_spawnattr_getpgroup.3,v 1.10 2023/02/22 06:31:51 guenther Exp $ .\" .\" Copyright (c) 2012 Marc Espie .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: May 29 2017 $ +.Dd $Mdocdate: February 22 2023 $ .Dt POSIX_SPAWNATTR_GETPGROUP 3 .Os .Sh NAME @@ -28,7 +28,7 @@ .Nm posix_spawnattr_setschedpolicy , .Nm posix_spawnattr_setsigdefault , .Nm posix_spawnattr_setsigmask -.Nd get and set misc attributes of a posix_spawn attributes object +.Nd get or set misc attributes of a posix_spawn attributes object .Sh SYNOPSIS .In spawn.h .Ft int diff --git a/lib/libc/sys/__get_tcb.2 b/lib/libc/sys/__get_tcb.2 index 123fe02df16..904d6a5b8ca 100644 --- a/lib/libc/sys/__get_tcb.2 +++ b/lib/libc/sys/__get_tcb.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: __get_tcb.2,v 1.6 2016/03/30 06:58:06 jmc Exp $ +.\" $OpenBSD: __get_tcb.2,v 1.7 2023/02/22 06:31:51 guenther Exp $ .\" .\" Copyright (c) 2011 Philip Guenther .\" @@ -14,13 +14,13 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: March 30 2016 $ +.Dd $Mdocdate: February 22 2023 $ .Dt __GET_TCB 2 .Os .Sh NAME .Nm __get_tcb , .Nm __set_tcb -.Nd get and set the address of the thread control block of the current thread +.Nd get or set the address of the thread control block of the current thread .Sh SYNOPSIS .Ft void * .Fn __get_tcb "void" diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2 index 07f8ced3cd7..1aace6a24b8 100644 --- a/lib/libc/sys/getlogin.2 +++ b/lib/libc/sys/getlogin.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getlogin.2,v 1.22 2020/02/09 02:32:43 jsg Exp $ +.\" $OpenBSD: getlogin.2,v 1.23 2023/02/22 06:31:51 guenther Exp $ .\" $NetBSD: getlogin.2,v 1.4 1995/02/27 12:33:03 cgd Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 @@ -30,14 +30,14 @@ .\" .\" @(#)getlogin.2 8.1 (Berkeley) 6/9/93 .\" -.Dd $Mdocdate: February 9 2020 $ +.Dd $Mdocdate: February 22 2023 $ .Dt GETLOGIN 2 .Os .Sh NAME .Nm getlogin , .Nm getlogin_r , .Nm setlogin -.Nd get/set login name +.Nd get or set login name .Sh SYNOPSIS .In unistd.h .Ft char * diff --git a/lib/libc/sys/getrtable.2 b/lib/libc/sys/getrtable.2 index b45085013f4..12b2dbd954b 100644 --- a/lib/libc/sys/getrtable.2 +++ b/lib/libc/sys/getrtable.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getrtable.2,v 1.4 2015/09/10 17:55:21 schwarze Exp $ +.\" $OpenBSD: getrtable.2,v 1.5 2023/02/22 06:31:51 guenther Exp $ .\" .\" Copyright (c) 2009 Reyk Floeter .\" @@ -14,13 +14,13 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: September 10 2015 $ +.Dd $Mdocdate: February 22 2023 $ .Dt GETRTABLE 2 .Os .Sh NAME .Nm getrtable , .Nm setrtable -.Nd get and set the default routing table of the current process +.Nd get or set the default routing table of the current process .Sh SYNOPSIS .In sys/types.h .In sys/socket.h diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2 index bd499ccb19b..f078525f13e 100644 --- a/lib/libc/sys/getsockopt.2 +++ b/lib/libc/sys/getsockopt.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getsockopt.2,v 1.60 2022/09/11 06:38:11 jmc Exp $ +.\" $OpenBSD: getsockopt.2,v 1.61 2023/02/22 06:31:51 guenther Exp $ .\" $NetBSD: getsockopt.2,v 1.7 1995/02/27 12:33:29 cgd Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 @@ -30,13 +30,13 @@ .\" .\" @(#)getsockopt.2 8.3 (Berkeley) 4/19/94 .\" -.Dd $Mdocdate: September 11 2022 $ +.Dd $Mdocdate: February 22 2023 $ .Dt GETSOCKOPT 2 .Os .Sh NAME .Nm getsockopt , .Nm setsockopt -.Nd get and set options on sockets +.Nd get or set options on sockets .Sh SYNOPSIS .In sys/socket.h .Ft int diff --git a/lib/libc/sys/getthrname.2 b/lib/libc/sys/getthrname.2 index 86b3b72b128..d7aea7f3ecf 100644 --- a/lib/libc/sys/getthrname.2 +++ b/lib/libc/sys/getthrname.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getthrname.2,v 1.1 2023/01/08 04:54:50 guenther Exp $ +.\" $OpenBSD: getthrname.2,v 1.2 2023/02/22 06:31:51 guenther Exp $ .\" .\" Copyright (c) 2023 Philip Guenther .\" @@ -14,13 +14,13 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: January 8 2023 $ +.Dd $Mdocdate: February 22 2023 $ .Dt GETTHRNAME 2 .Os .Sh NAME .Nm getthrname , .Nm setthrname -.Nd get and set thread name +.Nd get or set thread name .Sh SYNOPSIS .In unistd.h .Ft int diff --git a/lib/libpthread/man/pthread_barrierattr_getpshared.3 b/lib/libpthread/man/pthread_barrierattr_getpshared.3 index 281607fe6ac..22015b341bf 100644 --- a/lib/libpthread/man/pthread_barrierattr_getpshared.3 +++ b/lib/libpthread/man/pthread_barrierattr_getpshared.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pthread_barrierattr_getpshared.3,v 1.4 2020/04/06 00:01:08 pirofti Exp $ +.\" $OpenBSD: pthread_barrierattr_getpshared.3,v 1.5 2023/02/22 06:31:51 guenther Exp $ .\" .\" Copyright (c) 2012 Paul Irofti .\" @@ -15,13 +15,13 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" -.Dd $Mdocdate: April 6 2020 $ +.Dd $Mdocdate: February 22 2023 $ .Dt PTHREAD_BARRIERATTR_GETPSHARED 3 .Os .Sh NAME .Nm pthread_barrierattr_getpshared , .Nm pthread_barrierattr_setpshared -.Nd get and set the process-shared attribute of the barrier attribute's object +.Nd get or set the process-shared attribute of the barrier attribute's object .Sh SYNOPSIS .In pthread.h .Ft int -- 2.20.1