Many pages: Use man3type/ and man2type/ for type pages

Quoting Ingo:

[
The mandoc(1) program is also able to handle paths like
"man3/id_t.3type".  It will consider that page to be *both* in section
"3" (as specified by the directory name) and in section "3type" (as
specified by the file name and by the .TH macro).  I would consider
it better style to keep section names consistent, i.e. to use either
"man3/id_t.3" .TH id_t 3 or "man3type/id_t.3type" .TH id_t 3type,
but it's not a big deal: since many systems (in particular various
Linux distros) suffer from such inconsistencies, handling such
inconsistencies gracefully is an important feature that certainly
won't get removed.
]

Let's be nice, and do things right here, in the hope that others
may follow the example.

===

Most of this patch has been scripted:

$ mkdir man2type man3type
$ find man2 | grep type$ | while read f; do mv -t man2type $f; done
$ find man3 | grep type$ | while read f; do mv -t man3type $f; done
$ grep -rl man3/.*type man* | xargs sed -i 's,man3/,man3type/,'

Apart from that, I adapted the Makefiles, and moved va_list into
the man3type subsection (it was accidentally placed in the main 3
section).

Link: <https://lore.kernel.org/linux-man/YrB66rgFZqryrmpt@asta-kit.de/T/#u>
Reported-by: Ingo Schwarze <schwarze@usta.de>
Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>

112 files changed, 135 insertions, 121 deletions

diff --git a/Makefile b/Makefile
index 37da646ab..c8f27a442 100644
--- a/Makefile
+++ b/Makefile
@@ -37,21 +37,23 @@ MAKEFLAGS += --warn-undefined-variables
 
 srcdir := .
 
-MANDIR  := $(srcdir)
-MAN0DIR := $(MANDIR)/man0
-MAN1DIR := $(MANDIR)/man1
-MAN2DIR := $(MANDIR)/man2
-MAN3DIR := $(MANDIR)/man3
-MAN4DIR := $(MANDIR)/man4
-MAN5DIR := $(MANDIR)/man5
-MAN6DIR := $(MANDIR)/man6
-MAN7DIR := $(MANDIR)/man7
-MAN8DIR := $(MANDIR)/man8
-MANEXT  := \.[0-9]\w*
+MANDIR       := $(srcdir)
+MAN0DIR      := $(MANDIR)/man0
+MAN1DIR      := $(MANDIR)/man1
+MAN2DIR      := $(MANDIR)/man2
+MAN2TYPE_DIR := $(MANDIR)/man2type
+MAN3DIR      := $(MANDIR)/man3
+MAN3TYPE_DIR := $(MANDIR)/man3type
+MAN4DIR      := $(MANDIR)/man4
+MAN5DIR      := $(MANDIR)/man5
+MAN6DIR      := $(MANDIR)/man6
+MAN7DIR      := $(MANDIR)/man7
+MAN8DIR      := $(MANDIR)/man8
+MANEXT       := \.[0-9]\w*
 
 
-MANPAGES := $(sort $(shell find $(MANDIR)/man?/ -type f | grep '$(MANEXT)'))
-MANDIRS  := $(sort $(shell find $(MANDIR)/man? -type d))
+MANPAGES := $(sort $(shell find $(MANDIR)/man*/ -type f | grep '$(MANEXT)'))
+MANDIRS  := $(sort $(shell find $(MANDIR)/man* -type d))
 
 
 .PHONY: all
@@ -89,7 +91,9 @@ help:
 	$(info	[un]install-man0	[Un]install man pages in section 0)
 	$(info	[un]install-man1	[Un]install man pages in section 1)
 	$(info	[un]install-man2	[Un]install man pages in section 2)
+	$(info	[un]install-man2type	[Un]install man pages in section 2type)
 	$(info	[un]install-man3	[Un]install man pages in section 3)
+	$(info	[un]install-man3type	[Un]install man pages in section 3type)
 	$(info	[un]install-man4	[Un]install man pages in section 4)
 	$(info	[un]install-man5	[Un]install man pages in section 5)
 	$(info	[un]install-man6	[Un]install man pages in section 6)
@@ -113,7 +117,9 @@ help:
 	$(info	installdirs-man0	Create directories needed by "install-man0")
 	$(info	installdirs-man1	Create directories needed by "install-man1")
 	$(info	installdirs-man2	Create directories needed by "install-man2")
+	$(info	installdirs-man2type	Create directories needed by "install-man2type")
 	$(info	installdirs-man3	Create directories needed by "install-man3")
+	$(info	installdirs-man3type	Create directories needed by "install-man3type")
 	$(info	installdirs-man4	Create directories needed by "install-man4")
 	$(info	installdirs-man5	Create directories needed by "install-man5")
 	$(info	installdirs-man6	Create directories needed by "install-man6")
diff --git a/lib/build-src.mk b/lib/build-src.mk
index 2d9bb6d1b..57c4731ae 100644
--- a/lib/build-src.mk
+++ b/lib/build-src.mk
@@ -48,7 +48,7 @@ MAN := man
 _SRCPAGEDIRS   := $(patsubst $(MANDIR)/%,$(_SRCDIR)/%.d,$(LINTMAN))
 
 _UNITS_src_src := $(sort $(patsubst $(MANDIR)/%,$(_SRCDIR)/%,$(shell \
-		find $(MANDIR)/man?/ -type f \
+		find $(MANDIR)/man*/ -type f \
 		| grep '$(MANEXT)$$' \
 		| xargs grep -l '^\.TH ' \
 		| while read m; do \
diff --git a/lib/install-man.mk b/lib/install-man.mk
index ec46bdfb1..58cb95f2c 100644
--- a/lib/install-man.mk
+++ b/lib/install-man.mk
@@ -11,77 +11,85 @@ MAKEFILE_INSTALL_MAN_INCLUDED := 1
 include $(srcdir)/lib/install.mk
 
 
-mandir       := $(datarootdir)/man
-man0dir      := $(mandir)/man0
-man1dir      := $(mandir)/man1
-man2dir      := $(mandir)/man2
-man3dir      := $(mandir)/man3
-man4dir      := $(mandir)/man4
-man5dir      := $(mandir)/man5
-man6dir      := $(mandir)/man6
-man7dir      := $(mandir)/man7
-man8dir      := $(mandir)/man8
-man0ext      := .0
-man1ext      := .1
-man2ext      := .2
-man2type_ext := .2type
-man3ext      := .3
-man3type_ext := .3type
-man4ext      := .4
-man5ext      := .5
-man6ext      := .6
-man7ext      := .7
-man8ext      := .8
-_mandir      := $(DESTDIR)$(mandir)
-
-
-_manpages  := $(patsubst $(MANDIR)/%,$(_mandir)/%,$(MANPAGES))
-_man0pages := $(filter %$(man0ext),$(_manpages))
-_man1pages := $(filter %$(man1ext),$(_manpages))
-_man2pages := $(filter %$(man2ext),$(_manpages))
-_man2pages += $(filter %$(man2type_ext),$(_manpages))
-_man3pages := $(filter %$(man3ext),$(_manpages))
-_man3pages += $(filter %$(man3type_ext),$(_manpages))
-_man4pages := $(filter %$(man4ext),$(_manpages))
-_man5pages := $(filter %$(man5ext),$(_manpages))
-_man6pages := $(filter %$(man6ext),$(_manpages))
-_man7pages := $(filter %$(man7ext),$(_manpages))
-_man8pages := $(filter %$(man8ext),$(_manpages))
-
-_mandirs := $(patsubst $(MANDIR)/%,$(_mandir)/%/.,$(MANDIRS))
-_man0dir := $(filter %man0/.,$(_mandirs))
-_man1dir := $(filter %man1/.,$(_mandirs))
-_man2dir := $(filter %man2/.,$(_mandirs))
-_man3dir := $(filter %man3/.,$(_mandirs))
-_man4dir := $(filter %man4/.,$(_mandirs))
-_man5dir := $(filter %man5/.,$(_mandirs))
-_man6dir := $(filter %man6/.,$(_mandirs))
-_man7dir := $(filter %man7/.,$(_mandirs))
-_man8dir := $(filter %man8/.,$(_mandirs))
-
-_man0pages_rm := $(addsuffix -rm,$(wildcard $(_man0pages)))
-_man1pages_rm := $(addsuffix -rm,$(wildcard $(_man1pages)))
-_man2pages_rm := $(addsuffix -rm,$(wildcard $(_man2pages)))
-_man3pages_rm := $(addsuffix -rm,$(wildcard $(_man3pages)))
-_man4pages_rm := $(addsuffix -rm,$(wildcard $(_man4pages)))
-_man5pages_rm := $(addsuffix -rm,$(wildcard $(_man5pages)))
-_man6pages_rm := $(addsuffix -rm,$(wildcard $(_man6pages)))
-_man7pages_rm := $(addsuffix -rm,$(wildcard $(_man7pages)))
-_man8pages_rm := $(addsuffix -rm,$(wildcard $(_man8pages)))
-
-_mandirs_rmdir := $(addsuffix -rmdir,$(wildcard $(_mandirs)))
-_man0dir_rmdir := $(addsuffix -rmdir,$(wildcard $(_man0dir)))
-_man1dir_rmdir := $(addsuffix -rmdir,$(wildcard $(_man1dir)))
-_man2dir_rmdir := $(addsuffix -rmdir,$(wildcard $(_man2dir)))
-_man3dir_rmdir := $(addsuffix -rmdir,$(wildcard $(_man3dir)))
-_man4dir_rmdir := $(addsuffix -rmdir,$(wildcard $(_man4dir)))
-_man5dir_rmdir := $(addsuffix -rmdir,$(wildcard $(_man5dir)))
-_man6dir_rmdir := $(addsuffix -rmdir,$(wildcard $(_man6dir)))
-_man7dir_rmdir := $(addsuffix -rmdir,$(wildcard $(_man7dir)))
-_man8dir_rmdir := $(addsuffix -rmdir,$(wildcard $(_man8dir)))
-_mandir_rmdir  := $(addsuffix -rmdir,$(wildcard $(_mandir)/.))
-
-MAN_SECTIONS     := 0 1 2 3 4 5 6 7 8
+mandir      := $(datarootdir)/man
+man0dir     := $(mandir)/man0
+man1dir     := $(mandir)/man1
+man2dir     := $(mandir)/man2
+man2typedir := $(mandir)/man2type
+man3dir     := $(mandir)/man3
+man3typedir := $(mandir)/man3type
+man4dir     := $(mandir)/man4
+man5dir     := $(mandir)/man5
+man6dir     := $(mandir)/man6
+man7dir     := $(mandir)/man7
+man8dir     := $(mandir)/man8
+man0ext     := .0
+man1ext     := .1
+man2ext     := .2
+man2typeext := .2type
+man3ext     := .3
+man3typeext := .3type
+man4ext     := .4
+man5ext     := .5
+man6ext     := .6
+man7ext     := .7
+man8ext     := .8
+_mandir     := $(DESTDIR)$(mandir)
+
+
+_manpages      := $(patsubst $(MANDIR)/%,$(_mandir)/%,$(MANPAGES))
+_man0pages     := $(filter %$(man0ext),$(_manpages))
+_man1pages     := $(filter %$(man1ext),$(_manpages))
+_man2pages     := $(filter %$(man2ext),$(_manpages))
+_man2typepages := $(filter %$(man2typeext),$(_manpages))
+_man3pages     := $(filter %$(man3ext),$(_manpages))
+_man3typepages := $(filter %$(man3typeext),$(_manpages))
+_man4pages     := $(filter %$(man4ext),$(_manpages))
+_man5pages     := $(filter %$(man5ext),$(_manpages))
+_man6pages     := $(filter %$(man6ext),$(_manpages))
+_man7pages     := $(filter %$(man7ext),$(_manpages))
+_man8pages     := $(filter %$(man8ext),$(_manpages))
+
+_mandirs     := $(patsubst $(MANDIR)/%,$(_mandir)/%/.,$(MANDIRS))
+_man0dir     := $(filter %man0/.,$(_mandirs))
+_man1dir     := $(filter %man1/.,$(_mandirs))
+_man2dir     := $(filter %man2/.,$(_mandirs))
+_man2typedir := $(filter %man2type/.,$(_mandirs))
+_man3dir     := $(filter %man3/.,$(_mandirs))
+_man3typedir := $(filter %man3type/.,$(_mandirs))
+_man4dir     := $(filter %man4/.,$(_mandirs))
+_man5dir     := $(filter %man5/.,$(_mandirs))
+_man6dir     := $(filter %man6/.,$(_mandirs))
+_man7dir     := $(filter %man7/.,$(_mandirs))
+_man8dir     := $(filter %man8/.,$(_mandirs))
+
+_man0pages_rm     := $(addsuffix -rm,$(wildcard $(_man0pages)))
+_man1pages_rm     := $(addsuffix -rm,$(wildcard $(_man1pages)))
+_man2pages_rm     := $(addsuffix -rm,$(wildcard $(_man2pages)))
+_man2typepages_rm := $(addsuffix -rm,$(wildcard $(_man2typepages)))
+_man3pages_rm     := $(addsuffix -rm,$(wildcard $(_man3pages)))
+_man3typepages_rm := $(addsuffix -rm,$(wildcard $(_man3typepages)))
+_man4pages_rm     := $(addsuffix -rm,$(wildcard $(_man4pages)))
+_man5pages_rm     := $(addsuffix -rm,$(wildcard $(_man5pages)))
+_man6pages_rm     := $(addsuffix -rm,$(wildcard $(_man6pages)))
+_man7pages_rm     := $(addsuffix -rm,$(wildcard $(_man7pages)))
+_man8pages_rm     := $(addsuffix -rm,$(wildcard $(_man8pages)))
+
+_mandirs_rmdir     := $(addsuffix -rmdir,$(wildcard $(_mandirs)))
+_man0dir_rmdir     := $(addsuffix -rmdir,$(wildcard $(_man0dir)))
+_man1dir_rmdir     := $(addsuffix -rmdir,$(wildcard $(_man1dir)))
+_man2dir_rmdir     := $(addsuffix -rmdir,$(wildcard $(_man2dir)))
+_man2typedir_rmdir := $(addsuffix -rmdir,$(wildcard $(_man2typedir)))
+_man3dir_rmdir     := $(addsuffix -rmdir,$(wildcard $(_man3dir)))
+_man3typedir_rmdir := $(addsuffix -rmdir,$(wildcard $(_man3typedir)))
+_man4dir_rmdir     := $(addsuffix -rmdir,$(wildcard $(_man4dir)))
+_man5dir_rmdir     := $(addsuffix -rmdir,$(wildcard $(_man5dir)))
+_man6dir_rmdir     := $(addsuffix -rmdir,$(wildcard $(_man6dir)))
+_man7dir_rmdir     := $(addsuffix -rmdir,$(wildcard $(_man7dir)))
+_man8dir_rmdir     := $(addsuffix -rmdir,$(wildcard $(_man8dir)))
+_mandir_rmdir      := $(addsuffix -rmdir,$(wildcard $(_mandir)/.))
+
+MAN_SECTIONS     := 0 1 2 2type 3 3type 4 5 6 7 8
 install_manX     := $(foreach x,$(MAN_SECTIONS),install-man$(x))
 installdirs_manX := $(foreach x,$(MAN_SECTIONS),installdirs-man$(x))
 uninstall_manX   := $(foreach x,$(MAN_SECTIONS),uninstall-man$(x))
diff --git a/lib/lint.mk b/lib/lint.mk
index abf64b9d6..b4fff3631 100644
--- a/lib/lint.mk
+++ b/lib/lint.mk
@@ -16,7 +16,7 @@ SYSCONFDIR := $(srcdir)/etc
 _LINTDIR   := $(builddir)/lint
 
 
-LINTMAN   := $(shell find $(MANDIR)/man?/ -type f | grep '$(MANEXT)' \
+LINTMAN   := $(shell find $(MANDIR)/man*/ -type f | grep '$(MANEXT)' \
                      | xargs grep -l '^\.TH ' | sort))
 _LINTDIRS := $(patsubst $(MANDIR)/%,$(_LINTDIR)/%/.,$(MANDIRS))
 
diff --git a/man2/open_how.2type b/man2type/open_how.2type
index e058c08dc..e058c08dc 100644
--- a/man2/open_how.2type
+++ b/man2type/open_how.2type
diff --git a/man3/epoll_data.3type b/man3/epoll_data.3type
deleted file mode 100644
index b07b5059d..000000000
--- a/man3/epoll_data.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/epoll_event.3type
diff --git a/man3/epoll_data_t.3type b/man3/epoll_data_t.3type
deleted file mode 100644
index b07b5059d..000000000
--- a/man3/epoll_data_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/epoll_event.3type
diff --git a/man3/fexcept_t.3type b/man3/fexcept_t.3type
deleted file mode 100644
index 4269c6f7f..000000000
--- a/man3/fexcept_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/fenv_t.3type
diff --git a/man3/float_t.3type b/man3/float_t.3type
deleted file mode 100644
index 74a0a945d..000000000
--- a/man3/float_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/double_t.3type
diff --git a/man3/gid_t.3type b/man3/gid_t.3type
deleted file mode 100644
index ed4021e73..000000000
--- a/man3/gid_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/id_t.3type
diff --git a/man3/imaxdiv_t.3type b/man3/imaxdiv_t.3type
deleted file mode 100644
index 97939a855..000000000
--- a/man3/imaxdiv_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/div_t.3type
diff --git a/man3/in6_addr.3type b/man3/in6_addr.3type
deleted file mode 100644
index a500289ed..000000000
--- a/man3/in6_addr.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sockaddr.3type
diff --git a/man3/in_addr.3type b/man3/in_addr.3type
deleted file mode 100644
index a500289ed..000000000
--- a/man3/in_addr.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sockaddr.3type
diff --git a/man3/in_addr_t.3type b/man3/in_addr_t.3type
deleted file mode 100644
index a500289ed..000000000
--- a/man3/in_addr_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sockaddr.3type
diff --git a/man3/in_port_t.3type b/man3/in_port_t.3type
deleted file mode 100644
index a500289ed..000000000
--- a/man3/in_port_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sockaddr.3type
diff --git a/man3/int16_t.3type b/man3/int16_t.3type
deleted file mode 100644
index 07d8ccbb6..000000000
--- a/man3/int16_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/intN_t.3type
diff --git a/man3/int32_t.3type b/man3/int32_t.3type
deleted file mode 100644
index 07d8ccbb6..000000000
--- a/man3/int32_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/intN_t.3type
diff --git a/man3/int64_t.3type b/man3/int64_t.3type
deleted file mode 100644
index 07d8ccbb6..000000000
--- a/man3/int64_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/intN_t.3type
diff --git a/man3/int8_t.3type b/man3/int8_t.3type
deleted file mode 100644
index 07d8ccbb6..000000000
--- a/man3/int8_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/intN_t.3type
diff --git a/man3/ldiv_t.3type b/man3/ldiv_t.3type
deleted file mode 100644
index 97939a855..000000000
--- a/man3/ldiv_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/div_t.3type
diff --git a/man3/lldiv_t.3type b/man3/lldiv_t.3type
deleted file mode 100644
index 97939a855..000000000
--- a/man3/lldiv_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/div_t.3type
diff --git a/man3/loff_t.3type b/man3/loff_t.3type
deleted file mode 100644
index 37ecada85..000000000
--- a/man3/loff_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/off_t.3type
diff --git a/man3/off64_t.3type b/man3/off64_t.3type
deleted file mode 100644
index 37ecada85..000000000
--- a/man3/off64_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/off_t.3type
diff --git a/man3/pid_t.3type b/man3/pid_t.3type
deleted file mode 100644
index ed4021e73..000000000
--- a/man3/pid_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/id_t.3type
diff --git a/man3/sockaddr_in.3type b/man3/sockaddr_in.3type
deleted file mode 100644
index a500289ed..000000000
--- a/man3/sockaddr_in.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sockaddr.3type
diff --git a/man3/sockaddr_in6.3type b/man3/sockaddr_in6.3type
deleted file mode 100644
index a500289ed..000000000
--- a/man3/sockaddr_in6.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sockaddr.3type
diff --git a/man3/sockaddr_storage.3type b/man3/sockaddr_storage.3type
deleted file mode 100644
index a500289ed..000000000
--- a/man3/sockaddr_storage.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sockaddr.3type
diff --git a/man3/sockaddr_un.3type b/man3/sockaddr_un.3type
deleted file mode 100644
index a500289ed..000000000
--- a/man3/sockaddr_un.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sockaddr.3type
diff --git a/man3/socklen_t.3type b/man3/socklen_t.3type
deleted file mode 100644
index a500289ed..000000000
--- a/man3/socklen_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sockaddr.3type
diff --git a/man3/ssize_t.3type b/man3/ssize_t.3type
deleted file mode 100644
index 492c9ae1a..000000000
--- a/man3/ssize_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/size_t.3type
diff --git a/man3/suseconds_t.3type b/man3/suseconds_t.3type
deleted file mode 100644
index 53febb1ca..000000000
--- a/man3/suseconds_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/time_t.3type
diff --git a/man3/uid_t.3type b/man3/uid_t.3type
deleted file mode 100644
index ed4021e73..000000000
--- a/man3/uid_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/id_t.3type
diff --git a/man3/uint16_t.3type b/man3/uint16_t.3type
deleted file mode 100644
index 07d8ccbb6..000000000
--- a/man3/uint16_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/intN_t.3type
diff --git a/man3/uint32_t.3type b/man3/uint32_t.3type
deleted file mode 100644
index 07d8ccbb6..000000000
--- a/man3/uint32_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/intN_t.3type
diff --git a/man3/uint64_t.3type b/man3/uint64_t.3type
deleted file mode 100644
index 07d8ccbb6..000000000
--- a/man3/uint64_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/intN_t.3type
diff --git a/man3/uint8_t.3type b/man3/uint8_t.3type
deleted file mode 100644
index 07d8ccbb6..000000000
--- a/man3/uint8_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/intN_t.3type
diff --git a/man3/uintN_t.3type b/man3/uintN_t.3type
deleted file mode 100644
index 07d8ccbb6..000000000
--- a/man3/uintN_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/intN_t.3type
diff --git a/man3/uintmax_t.3type b/man3/uintmax_t.3type
deleted file mode 100644
index 08de48ad5..000000000
--- a/man3/uintmax_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/intmax_t.3type
diff --git a/man3/uintptr_t.3type b/man3/uintptr_t.3type
deleted file mode 100644
index c02308016..000000000
--- a/man3/uintptr_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/intptr_t.3type
diff --git a/man3/useconds_t.3type b/man3/useconds_t.3type
deleted file mode 100644
index 53febb1ca..000000000
--- a/man3/useconds_t.3type
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/time_t.3type
diff --git a/man3/aiocb.3type b/man3type/aiocb.3type
index f75a06d9c..f75a06d9c 100644
--- a/man3/aiocb.3type
+++ b/man3type/aiocb.3type
diff --git a/man3/blkcnt_t.3type b/man3type/blkcnt_t.3type
index 1ce53ec7e..1ce53ec7e 100644
--- a/man3/blkcnt_t.3type
+++ b/man3type/blkcnt_t.3type
diff --git a/man3/blksize_t.3type b/man3type/blksize_t.3type
index 6045780f1..6045780f1 100644
--- a/man3/blksize_t.3type
+++ b/man3type/blksize_t.3type
diff --git a/man3/cc_t.3type b/man3type/cc_t.3type
index dae5a274a..dae5a274a 100644
--- a/man3/cc_t.3type
+++ b/man3type/cc_t.3type
diff --git a/man3/clock_t.3type b/man3type/clock_t.3type
index a96edd02b..a96edd02b 100644
--- a/man3/clock_t.3type
+++ b/man3type/clock_t.3type
diff --git a/man3/clockid_t.3type b/man3type/clockid_t.3type
index eecd310f7..eecd310f7 100644
--- a/man3/clockid_t.3type
+++ b/man3type/clockid_t.3type
diff --git a/man3/dev_t.3type b/man3type/dev_t.3type
index 59f3a31f6..59f3a31f6 100644
--- a/man3/dev_t.3type
+++ b/man3type/dev_t.3type
diff --git a/man3/div_t.3type b/man3type/div_t.3type
index 0fae56f99..0fae56f99 100644
--- a/man3/div_t.3type
+++ b/man3type/div_t.3type
diff --git a/man3/double_t.3type b/man3type/double_t.3type
index 7745f8bd2..7745f8bd2 100644
--- a/man3/double_t.3type
+++ b/man3type/double_t.3type
diff --git a/man3type/epoll_data.3type b/man3type/epoll_data.3type
new file mode 100644
index 000000000..033a55fc4
--- /dev/null
+++ b/man3type/epoll_data.3type
@@ -0,0 +1 @@
+.so man3type/epoll_event.3type
diff --git a/man3type/epoll_data_t.3type b/man3type/epoll_data_t.3type
new file mode 100644
index 000000000..033a55fc4
--- /dev/null
+++ b/man3type/epoll_data_t.3type
@@ -0,0 +1 @@
+.so man3type/epoll_event.3type
diff --git a/man3/epoll_event.3type b/man3type/epoll_event.3type
index 084b243a6..084b243a6 100644
--- a/man3/epoll_event.3type
+++ b/man3type/epoll_event.3type
diff --git a/man3/fenv_t.3type b/man3type/fenv_t.3type
index 554179cc7..554179cc7 100644
--- a/man3/fenv_t.3type
+++ b/man3type/fenv_t.3type
diff --git a/man3type/fexcept_t.3type b/man3type/fexcept_t.3type
new file mode 100644
index 000000000..5bedba097
--- /dev/null
+++ b/man3type/fexcept_t.3type
@@ -0,0 +1 @@
+.so man3type/fenv_t.3type
diff --git a/man3type/float_t.3type b/man3type/float_t.3type
new file mode 100644
index 000000000..104734cfe
--- /dev/null
+++ b/man3type/float_t.3type
@@ -0,0 +1 @@
+.so man3type/double_t.3type
diff --git a/man3type/gid_t.3type b/man3type/gid_t.3type
new file mode 100644
index 000000000..52bae7406
--- /dev/null
+++ b/man3type/gid_t.3type
@@ -0,0 +1 @@
+.so man3type/id_t.3type
diff --git a/man3/id_t.3type b/man3type/id_t.3type
index 18803e677..18803e677 100644
--- a/man3/id_t.3type
+++ b/man3type/id_t.3type
diff --git a/man3type/imaxdiv_t.3type b/man3type/imaxdiv_t.3type
new file mode 100644
index 000000000..3ab8f3447
--- /dev/null
+++ b/man3type/imaxdiv_t.3type
@@ -0,0 +1 @@
+.so man3type/div_t.3type
diff --git a/man3type/in6_addr.3type b/man3type/in6_addr.3type
new file mode 100644
index 000000000..39e914c30
--- /dev/null
+++ b/man3type/in6_addr.3type
@@ -0,0 +1 @@
+.so man3type/sockaddr.3type
diff --git a/man3type/in_addr.3type b/man3type/in_addr.3type
new file mode 100644
index 000000000..39e914c30
--- /dev/null
+++ b/man3type/in_addr.3type
@@ -0,0 +1 @@
+.so man3type/sockaddr.3type
diff --git a/man3type/in_addr_t.3type b/man3type/in_addr_t.3type
new file mode 100644
index 000000000..39e914c30
--- /dev/null
+++ b/man3type/in_addr_t.3type
@@ -0,0 +1 @@
+.so man3type/sockaddr.3type
diff --git a/man3type/in_port_t.3type b/man3type/in_port_t.3type
new file mode 100644
index 000000000..39e914c30
--- /dev/null
+++ b/man3type/in_port_t.3type
@@ -0,0 +1 @@
+.so man3type/sockaddr.3type
diff --git a/man3type/int16_t.3type b/man3type/int16_t.3type
new file mode 100644
index 000000000..a0d1a82b8
--- /dev/null
+++ b/man3type/int16_t.3type
@@ -0,0 +1 @@
+.so man3type/intN_t.3type
diff --git a/man3type/int32_t.3type b/man3type/int32_t.3type
new file mode 100644
index 000000000..a0d1a82b8
--- /dev/null
+++ b/man3type/int32_t.3type
@@ -0,0 +1 @@
+.so man3type/intN_t.3type
diff --git a/man3type/int64_t.3type b/man3type/int64_t.3type
new file mode 100644
index 000000000..a0d1a82b8
--- /dev/null
+++ b/man3type/int64_t.3type
@@ -0,0 +1 @@
+.so man3type/intN_t.3type
diff --git a/man3type/int8_t.3type b/man3type/int8_t.3type
new file mode 100644
index 000000000..a0d1a82b8
--- /dev/null
+++ b/man3type/int8_t.3type
@@ -0,0 +1 @@
+.so man3type/intN_t.3type
diff --git a/man3/intN_t.3type b/man3type/intN_t.3type
index c02c939b0..c02c939b0 100644
--- a/man3/intN_t.3type
+++ b/man3type/intN_t.3type
diff --git a/man3/intmax_t.3type b/man3type/intmax_t.3type
index 0c68f9d1b..0c68f9d1b 100644
--- a/man3/intmax_t.3type
+++ b/man3type/intmax_t.3type
diff --git a/man3/intptr_t.3type b/man3type/intptr_t.3type
index b6afd01d7..b6afd01d7 100644
--- a/man3/intptr_t.3type
+++ b/man3type/intptr_t.3type
diff --git a/man3/iovec.3type b/man3type/iovec.3type
index aa4638811..aa4638811 100644
--- a/man3/iovec.3type
+++ b/man3type/iovec.3type
diff --git a/man3/lconv.3type b/man3type/lconv.3type
index 5633d706e..5633d706e 100644
--- a/man3/lconv.3type
+++ b/man3type/lconv.3type
diff --git a/man3type/ldiv_t.3type b/man3type/ldiv_t.3type
new file mode 100644
index 000000000..3ab8f3447
--- /dev/null
+++ b/man3type/ldiv_t.3type
@@ -0,0 +1 @@
+.so man3type/div_t.3type
diff --git a/man3type/lldiv_t.3type b/man3type/lldiv_t.3type
new file mode 100644
index 000000000..3ab8f3447
--- /dev/null
+++ b/man3type/lldiv_t.3type
@@ -0,0 +1 @@
+.so man3type/div_t.3type
diff --git a/man3type/loff_t.3type b/man3type/loff_t.3type
new file mode 100644
index 000000000..e59af3f11
--- /dev/null
+++ b/man3type/loff_t.3type
@@ -0,0 +1 @@
+.so man3type/off_t.3type
diff --git a/man3/mode_t.3type b/man3type/mode_t.3type
index 08e53d1cc..08e53d1cc 100644
--- a/man3/mode_t.3type
+++ b/man3type/mode_t.3type
diff --git a/man3type/off64_t.3type b/man3type/off64_t.3type
new file mode 100644
index 000000000..e59af3f11
--- /dev/null
+++ b/man3type/off64_t.3type
@@ -0,0 +1 @@
+.so man3type/off_t.3type
diff --git a/man3/off_t.3type b/man3type/off_t.3type
index f8bfaef27..f8bfaef27 100644
--- a/man3/off_t.3type
+++ b/man3type/off_t.3type
diff --git a/man3type/pid_t.3type b/man3type/pid_t.3type
new file mode 100644
index 000000000..52bae7406
--- /dev/null
+++ b/man3type/pid_t.3type
@@ -0,0 +1 @@
+.so man3type/id_t.3type
diff --git a/man3/ptrdiff_t.3type b/man3type/ptrdiff_t.3type
index 0813fd7a9..0813fd7a9 100644
--- a/man3/ptrdiff_t.3type
+++ b/man3type/ptrdiff_t.3type
diff --git a/man3/regex_t.3type b/man3type/regex_t.3type
index db50c0f09..db50c0f09 100644
--- a/man3/regex_t.3type
+++ b/man3type/regex_t.3type
diff --git a/man3/regmatch_t.3type b/man3type/regmatch_t.3type
index db50c0f09..db50c0f09 100644
--- a/man3/regmatch_t.3type
+++ b/man3type/regmatch_t.3type
diff --git a/man3/regoff_t.3type b/man3type/regoff_t.3type
index db50c0f09..db50c0f09 100644
--- a/man3/regoff_t.3type
+++ b/man3type/regoff_t.3type
diff --git a/man3/sigevent.3type b/man3type/sigevent.3type
index db50c0f09..db50c0f09 100644
--- a/man3/sigevent.3type
+++ b/man3type/sigevent.3type
diff --git a/man3/siginfo_t.3type b/man3type/siginfo_t.3type
index db50c0f09..db50c0f09 100644
--- a/man3/siginfo_t.3type
+++ b/man3type/siginfo_t.3type
diff --git a/man3/sigset_t.3type b/man3type/sigset_t.3type
index db50c0f09..db50c0f09 100644
--- a/man3/sigset_t.3type
+++ b/man3type/sigset_t.3type
diff --git a/man3/sigval.3type b/man3type/sigval.3type
index db50c0f09..db50c0f09 100644
--- a/man3/sigval.3type
+++ b/man3type/sigval.3type
diff --git a/man3/size_t.3type b/man3type/size_t.3type
index 226f427c6..226f427c6 100644
--- a/man3/size_t.3type
+++ b/man3type/size_t.3type
diff --git a/man3/sockaddr.3type b/man3type/sockaddr.3type
index 2589e9999..2589e9999 100644
--- a/man3/sockaddr.3type
+++ b/man3type/sockaddr.3type
diff --git a/man3type/sockaddr_in.3type b/man3type/sockaddr_in.3type
new file mode 100644
index 000000000..39e914c30
--- /dev/null
+++ b/man3type/sockaddr_in.3type
@@ -0,0 +1 @@
+.so man3type/sockaddr.3type
diff --git a/man3type/sockaddr_in6.3type b/man3type/sockaddr_in6.3type
new file mode 100644
index 000000000..39e914c30
--- /dev/null
+++ b/man3type/sockaddr_in6.3type
@@ -0,0 +1 @@
+.so man3type/sockaddr.3type
diff --git a/man3type/sockaddr_storage.3type b/man3type/sockaddr_storage.3type
new file mode 100644
index 000000000..39e914c30
--- /dev/null
+++ b/man3type/sockaddr_storage.3type
@@ -0,0 +1 @@
+.so man3type/sockaddr.3type
diff --git a/man3type/sockaddr_un.3type b/man3type/sockaddr_un.3type
new file mode 100644
index 000000000..39e914c30
--- /dev/null
+++ b/man3type/sockaddr_un.3type
@@ -0,0 +1 @@
+.so man3type/sockaddr.3type
diff --git a/man3type/socklen_t.3type b/man3type/socklen_t.3type
new file mode 100644
index 000000000..39e914c30
--- /dev/null
+++ b/man3type/socklen_t.3type
@@ -0,0 +1 @@
+.so man3type/sockaddr.3type
diff --git a/man3type/ssize_t.3type b/man3type/ssize_t.3type
new file mode 100644
index 000000000..c8d440814
--- /dev/null
+++ b/man3type/ssize_t.3type
@@ -0,0 +1 @@
+.so man3type/size_t.3type
diff --git a/man3/stat.3type b/man3type/stat.3type
index db50c0f09..db50c0f09 100644
--- a/man3/stat.3type
+++ b/man3type/stat.3type
diff --git a/man3type/suseconds_t.3type b/man3type/suseconds_t.3type
new file mode 100644
index 000000000..7f430e1eb
--- /dev/null
+++ b/man3type/suseconds_t.3type
@@ -0,0 +1 @@
+.so man3type/time_t.3type
diff --git a/man3/time_t.3type b/man3type/time_t.3type
index 2ce689237..2ce689237 100644
--- a/man3/time_t.3type
+++ b/man3type/time_t.3type
diff --git a/man3/timer_t.3type b/man3type/timer_t.3type
index db50c0f09..db50c0f09 100644
--- a/man3/timer_t.3type
+++ b/man3type/timer_t.3type
diff --git a/man3/timespec.3type b/man3type/timespec.3type
index 000206d97..000206d97 100644
--- a/man3/timespec.3type
+++ b/man3type/timespec.3type
diff --git a/man3/timeval.3type b/man3type/timeval.3type
index f7e6c975e..f7e6c975e 100644
--- a/man3/timeval.3type
+++ b/man3type/timeval.3type
diff --git a/man3/tm.3type b/man3type/tm.3type
index 4b98819f9..4b98819f9 100644
--- a/man3/tm.3type
+++ b/man3type/tm.3type
diff --git a/man3type/uid_t.3type b/man3type/uid_t.3type
new file mode 100644
index 000000000..52bae7406
--- /dev/null
+++ b/man3type/uid_t.3type
@@ -0,0 +1 @@
+.so man3type/id_t.3type
diff --git a/man3type/uint16_t.3type b/man3type/uint16_t.3type
new file mode 100644
index 000000000..a0d1a82b8
--- /dev/null
+++ b/man3type/uint16_t.3type
@@ -0,0 +1 @@
+.so man3type/intN_t.3type
diff --git a/man3type/uint32_t.3type b/man3type/uint32_t.3type
new file mode 100644
index 000000000..a0d1a82b8
--- /dev/null
+++ b/man3type/uint32_t.3type
@@ -0,0 +1 @@
+.so man3type/intN_t.3type
diff --git a/man3type/uint64_t.3type b/man3type/uint64_t.3type
new file mode 100644
index 000000000..a0d1a82b8
--- /dev/null
+++ b/man3type/uint64_t.3type
@@ -0,0 +1 @@
+.so man3type/intN_t.3type
diff --git a/man3type/uint8_t.3type b/man3type/uint8_t.3type
new file mode 100644
index 000000000..a0d1a82b8
--- /dev/null
+++ b/man3type/uint8_t.3type
@@ -0,0 +1 @@
+.so man3type/intN_t.3type
diff --git a/man3type/uintN_t.3type b/man3type/uintN_t.3type
new file mode 100644
index 000000000..a0d1a82b8
--- /dev/null
+++ b/man3type/uintN_t.3type
@@ -0,0 +1 @@
+.so man3type/intN_t.3type
diff --git a/man3type/uintmax_t.3type b/man3type/uintmax_t.3type
new file mode 100644
index 000000000..497d4ace1
--- /dev/null
+++ b/man3type/uintmax_t.3type
@@ -0,0 +1 @@
+.so man3type/intmax_t.3type
diff --git a/man3type/uintptr_t.3type b/man3type/uintptr_t.3type
new file mode 100644
index 000000000..6a55bc9be
--- /dev/null
+++ b/man3type/uintptr_t.3type
@@ -0,0 +1 @@
+.so man3type/intptr_t.3type
diff --git a/man3type/useconds_t.3type b/man3type/useconds_t.3type
new file mode 100644
index 000000000..7f430e1eb
--- /dev/null
+++ b/man3type/useconds_t.3type
@@ -0,0 +1 @@
+.so man3type/time_t.3type
diff --git a/man3/va_list.3 b/man3type/va_list.3type
index ab580b81c..ab580b81c 100644
--- a/man3/va_list.3
+++ b/man3type/va_list.3type
diff --git a/man3/void.3type b/man3type/void.3type
index 9562e3f5f..9562e3f5f 100644
--- a/man3/void.3type
+++ b/man3type/void.3type