1 files changed, 19 insertions, 18 deletions
diff --git a/man7/socket.7 b/man7/socket.7
index d49d0bb6ed..cf34236182 100644
--- a/man7/socket.7
+++ b/man7/socket.7
@@ -17,6 +17,7 @@
 .\" FIXME probably all PF_* should be AF_* in this page, since
 .\"        POSIX only specifies the latter values.
 .\"
+.\" FIXME Section titles and orderings in this page are very inconsistent
 .TH SOCKET 7 2004-05-27 "Linux 2.6.6" "Linux Programmer's Manual"
 .SH NAME
 socket \- Linux socket interface
@@ -43,7 +44,7 @@ or
 See
 .BR socket (2)
 for more information on families and types.
-.SH "SOCKET LAYER FUNCTIONS"
+.SS Socket Layer Functions
 These functions are used by the user process to send or receive packets
 and to do other socket operations.
 For more information see their respective manual pages.
@@ -193,7 +194,7 @@ must be installed via
 See the
 .I SIGNALS
 discussion below.
-.SH "SOCKET OPTIONS"
+.SS Socket Options
 These socket options can be set by using
 .BR setsockopt (2)
 and read with
@@ -487,7 +488,7 @@ Gets the socket type as an integer (like
 Can only be read
 with
 .BR getsockopt (2).
-.SH SIGNALS
+.SS Signals
 When writing onto a connection-oriented socket that has been shut down
 (by the local or the remote end)
 .B SIGPIPE
@@ -530,8 +531,8 @@ single socket), the condition that caused the
 may have already disappeared when the process reacts to the signal.
 If this happens, the process should wait again because Linux
 will resend the signal later.
-.\" .SH ANCILLARY MESSAGES
-.SH SYSCTLS
+.\" .SS Ancillary Messages
+.SH Sysctls
 The core socket networking sysctls can be accessed using the
 .I /proc/sys/net/core/*
 files or with the
@@ -567,7 +568,7 @@ Maximum number of packets in the global input queue.
 Maximum length of ancillary data and user control data like the iovecs
 per socket.
 .\" netdev_fastroute is not documented because it is experimental
-.SH IOCTLS
+.SS Ioctls
 These operations can be accessed using
 .BR ioctl (2):
 
@@ -653,6 +654,18 @@ The same as the SIOCGPGRP
 .BR FIOSETOWN
 The same as the SIOCSPGRP
 .BR ioctl (2).
+.SH VERSIONS
+.B SO_BINDTODEVICE
+was introduced in Linux 2.0.30.
+.B SO_PASSCRED
+is new in Linux 2.2.
+The sysctls are new in Linux 2.2.
+.B SO_RCVTIMEO
+and
+.B SO_SNDTIMEO
+are supported since Linux 2.3.41.
+Earlier, timeouts were fixed to
+a protocol specific setting, and could not be read or written.
 .SH NOTES
 Linux assumes that half of the send/receive buffer is used for internal
 kernel structures; thus the sysctls are twice what can be observed
@@ -677,18 +690,6 @@ are
 not documented.
 The suggested interface to use them is via the libpcap
 library.
-.SH VERSIONS
-.B SO_BINDTODEVICE
-was introduced in Linux 2.0.30.
-.B SO_PASSCRED
-is new in Linux 2.2.
-The sysctls are new in Linux 2.2.
-.B SO_RCVTIMEO
-and
-.B SO_SNDTIMEO
-are supported since Linux 2.3.41.
-Earlier, timeouts were fixed to
-a protocol specific setting, and could not be read or written.
 .\" .SH AUTHORS
 .\" This man page was written by Andi Kleen.
 .SH "SEE ALSO"