aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--GNUmakefile (renamed from Makefile)4
-rw-r--r--INSTALL2
-rw-r--r--README2
-rw-r--r--RELEASE2
-rw-r--r--man3type/clock_t.3type2
-rw-r--r--man3type/itimerspec.3type9
-rwxr-xr-xscripts/sortman2
-rw-r--r--share/mk/src.mk2
8 files changed, 12 insertions, 13 deletions
diff --git a/Makefile b/GNUmakefile
index 93a51a63cd..8c8352dbae 100644
--- a/Makefile
+++ b/GNUmakefile
@@ -1,5 +1,5 @@
########################################################################
-# Copyright 2021-2022, Alejandro Colomar <alx@kernel.org>
+# Copyright 2021-2023, Alejandro Colomar <alx@kernel.org>
# SPDX-License-Identifier: GPL-3.0-or-later
########################################################################
# Conventions:
@@ -134,7 +134,7 @@ help:
MK := \
- $(srcdir)/Makefile \
+ $(srcdir)/GNUmakefile \
$(wildcard $(addprefix $(MAKEFILEDIR)/, *.mk */*.mk */*/*.mk))
include $(MK)
$(MK):: ;
diff --git a/INSTALL b/INSTALL
index d12fd7ae5b..80071e0ee5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -131,7 +131,7 @@ Description
targets that can be used.
Files
- Makefile, share/mk/install-man.mk, share/mk/install.mk
+ GNUmakefile, share/mk/install-man.mk, share/mk/install.mk
Main makefiles for installing (however, others may also be used
by inclusion).
diff --git a/README b/README
index 9925ac13ff..52cb6a57de 100644
--- a/README
+++ b/README
@@ -35,7 +35,7 @@ Files
Change log. Includes most relevant changes. However, it's not
as complete as the git(1) log.
- Makefile, share/mk/*
+ GNUmakefile, share/mk/*
Build system. For help, consult the <INSTALL> file, and run
'make help'.
diff --git a/RELEASE b/RELEASE
index aff32873db..97c4479c1f 100644
--- a/RELEASE
+++ b/RELEASE
@@ -188,7 +188,7 @@ Files
Changes, Changes.old
Change log. Includes most relevant changes.
- Makefile, share/mk/dist.mk, share/mk/version.mk
+ GNUmakefile, share/mk/dist.mk, share/mk/version.mk
Main makefiles used for releasing (however, others may also be
used by inclusion).
diff --git a/man3type/clock_t.3type b/man3type/clock_t.3type
index 12da83de93..77d16052e0 100644
--- a/man3type/clock_t.3type
+++ b/man3type/clock_t.3type
@@ -31,7 +31,7 @@ C89, POSIX.1-2001.
The following headers also provide this type:
.I <sys/types.h>
and
-.IR <sys/time.h> .
+.IR <sys/times.h> .
.SH SEE ALSO
.BR times (2),
.BR clock (3)
diff --git a/man3type/itimerspec.3type b/man3type/itimerspec.3type
index 5d645e2f7f..862235fa95 100644
--- a/man3type/itimerspec.3type
+++ b/man3type/itimerspec.3type
@@ -5,7 +5,7 @@
.\"
.TH itimerspec 3type (date) "Linux man-pages (unreleased)"
.SH NAME
-timespec \- interval for a timer with nanosecond precision
+itimerspec \- interval for a timer with nanosecond precision
.SH LIBRARY
Standard C library
.RI ( libc )
@@ -23,10 +23,9 @@ Describes the initial expiration of a timer,
and its interval,
in seconds and nanoseconds.
.SH STANDARDS
-Linux.
-.SH NOTES
-The following header also provides this type:
-.IR <sys/timerfd.h> .
+POSIX.1-2008.
+.SH HISTORY
+POSIX.1-2001.
.SH SEE ALSO
.BR timerfd_create (2),
.BR timer_settime (2),
diff --git a/scripts/sortman b/scripts/sortman
index 01564fdce0..546a7943d6 100755
--- a/scripts/sortman
+++ b/scripts/sortman
@@ -5,7 +5,7 @@
sed -E '/\/intro./ s/.*\.([[:digit:]])/\10\t&/' \
| sed -E '/\/intro./! s/.*\.([[:digit:]])\>/\11\t&/' \
-| sed -E '/\/intro./! s/.*\.([[:digit:]])([[:alnum:]]+)/\12.\2\t&/' \
+| sed -E '/\/intro./! s/.*\.([[:digit:]])([[:alpha:]][[:alnum:]]*\>)/\12.\2\t&/' \
| sed -E ' s/\t(.*)/&\n\1/' \
| sed -E '/\t/ s/\/[_-]*/\//g' \
| sed -E '/\t/ s/[_-]/_/g' \
diff --git a/share/mk/src.mk b/share/mk/src.mk
index 186e5628bf..c113ecb73c 100644
--- a/share/mk/src.mk
+++ b/share/mk/src.mk
@@ -12,7 +12,7 @@ include $(MAKEFILEDIR)/cmd.mk
MANDIR := $(srcdir)
-MANEXT := \.[0-9]\w*\(\.man\)\?\(\.in\)\?$
+MANEXT := \.[[:digit:]]\([[:alpha:]][[:alnum:]]*\)\?\>\(\.man\|\.in\)*$
MANPAGES := $(shell $(FIND) $(MANDIR)/* -type f \