3 files changed, 20 insertions, 30 deletions
diff --git a/man3/sockaddr-struct.3 b/man3/sockaddr-struct.3
index 0847166a18..0db6b5930b 100644
--- a/man3/sockaddr-struct.3
+++ b/man3/sockaddr-struct.3
@@ -1,6 +1,6 @@
 .TH SOCKADDR 3 2022-02-24 Linux "Linux Programmer's Manual"
 .SH NAME
-sockaddr \- socket address
+sockaddr, socklen_t \- socket address
 .SH SYNOPSIS
 .nf
 .B #include <sys/socket.h>
@@ -9,13 +9,30 @@ sockaddr \- socket address
 .BR "    sa_family_t sa_family;" "  /* Address family */"
 .BR "    char        sa_data[];" "  /* Socket address */"
 .B };
+.PP
+.BR typedef " /* ... */ " socklen_t;
 .fi
 .SH DESCRIPTION
+.TP
+.I sockaddr
 Describes a socket address.
+.TP
+.I socklen_t
+Describes the length of a socket address.
+According to POSIX,
+this shall be an integer type of at least 32 bits.
 .SH CONFORMING TO
 POSIX.1-2001 and later.
+.SH NOTES
+.I socklen_t
+is also defined in
+.IR <netdb.h> .
 .SH SEE ALSO
 .BR accept (2),
+.BR bind (2),
+.BR connect (2),
 .BR getpeername (2),
 .BR getsockname (2),
-.BR socket (2)
+.BR socket (2),
+.BR gethostbyaddr (3),
+.BR getnameinfo (3)
diff --git a/man3/socklen_t.3 b/man3/socklen_t.3
index db50c0f091..6977e5235e 100644
--- a/man3/socklen_t.3
+++ b/man3/socklen_t.3
@@ -1 +1 @@
-.so man7/system_data_types.7
+.so man3/sockaddr-struct.3
diff --git a/man7/system_data_types.7 b/man7/system_data_types.7
index d426b11c42..84f5b69953 100644
--- a/man7/system_data_types.7
+++ b/man7/system_data_types.7
@@ -596,33 +596,6 @@ types in this page.
 .RE
 .\"------------------------------------- sockaddr ---------------------/
 .\"------------------------------------- socklen_t --------------------/
-.TP
-.I socklen_t
-.RS
-.IR Include :
-.IR <sys/socket.h> .
-Alternatively,
-.IR <netdb.h> .
-.PP
-Describes the length of a socket address.
-According to POSIX,
-this shall be an integer type of at least 32 bits.
-.PP
-.IR "Conforming to" :
-POSIX.1-2001 and later.
-.PP
-.IR "See also" :
-.BR accept (2),
-.BR bind (2),
-.BR connect (2),
-.BR gethostbyaddr (2),
-.BR getnameinfo (2),
-.BR socket (2)
-.PP
-See also the
-.I sockaddr
-structure in this page.
-.RE
 .\"------------------------------------- ssize_t ----------------------/
 .TP
 .I ssize_t