34 files changed, 233 insertions, 235 deletions
diff --git a/man7/aio.7 b/man7/aio.7
index 57791c14e0..d0d814cb24 100644
--- a/man7/aio.7
+++ b/man7/aio.7
@@ -140,7 +140,7 @@ structure was less than 0,
 or was greater than the limit returned by the call
 .IR sysconf(_SC_AIO_PRIO_DELTA_MAX) .
 .SH VERSIONS
-The POSIX AIO interfaces are provided by glibc since version 2.1.
+The POSIX AIO interfaces are provided by glibc since glibc 2.1.
 .SH STANDARDS
 POSIX.1-2001, POSIX.1-2008.
 .SH NOTES
diff --git a/man7/capabilities.7 b/man7/capabilities.7
index d85c62f463..45ab7264b5 100644
--- a/man7/capabilities.7
+++ b/man7/capabilities.7
@@ -10,7 +10,7 @@
 .\" 2008-07-15, Serge Hallyn <serue@us.bbm.com>
 .\"     Document file capabilities, per-process capability
 .\"     bounding set, changed semantics for CAP_SETPCAP,
-.\"     and other changes in 2.6.2[45].
+.\"     and other changes in Linux 2.6.2[45].
 .\"     Add CAP_MAC_ADMIN, CAP_MAC_OVERRIDE, CAP_SETFCAP.
 .\" 2008-07-15, mtk
 .\"     Add text describing circumstances in which CAP_SETPCAP
@@ -41,7 +41,7 @@ while unprivileged processes are subject to full permission
 checking based on the process's credentials
 (usually: effective UID, effective GID, and supplementary group list).
 .PP
-Starting with kernel 2.2, Linux divides the privileges traditionally
+Starting with Linux 2.2, Linux divides the privileges traditionally
 associated with superuser into distinct units, known as
 .IR capabilities ,
 which can be independently enabled and disabled.
@@ -347,7 +347,7 @@ make changes to the
 .I securebits
 flags.
 .IP
-If file capabilities are not supported (i.e., kernels before Linux 2.6.24):
+If file capabilities are not supported (i.e., before Linux 2.6.24):
 grant or remove any capability in the
 caller's permitted capability set to or from any other process.
 (This property of
@@ -582,7 +582,7 @@ Load and unload kernel modules
 and
 .BR delete_module (2));
 .IP \(bu
-in kernels before 2.6.25:
+before Linux 2.6.25:
 drop capabilities from the system-wide capability bounding set.
 .PD
 .RE
@@ -833,8 +833,8 @@ be changed and retrieved.
 The filesystem must support attaching capabilities to an executable file,
 so that a process gains those capabilities when the file is executed.
 .PP
-Before kernel 2.6.24, only the first two of these requirements are met;
-since kernel 2.6.24, all three requirements are met.
+Before Linux 2.6.24, only the first two of these requirements are met;
+since Linux 2.6.24, all three requirements are met.
 .\"
 .SS Notes to kernel developers
 When adding a new kernel feature that should be governed by a capability,
@@ -986,7 +986,7 @@ this can be used to determine the highest bit
 that may be set in a capability set.
 .\"
 .SS File capabilities
-Since kernel 2.6.24, the kernel supports
+Since Linux 2.6.24, the kernel supports
 associating capability sets with an executable file using
 .BR setcap (8).
 The file capability sets are stored in an extended attribute (see
@@ -1428,7 +1428,7 @@ operation.
 .PP
 Removing capabilities from the bounding set is supported only if file
 capabilities are compiled into the kernel.
-In kernels before Linux 2.6.33,
+Before Linux 2.6.33,
 file capabilities were an optional feature configurable via the
 .B CONFIG_SECURITY_FILE_CAPABILITIES
 option.
@@ -1453,7 +1453,7 @@ back into the thread's inheritable set in the future.
 .PP
 .B "Capability bounding set prior to Linux 2.6.25"
 .PP
-In kernels before 2.6.25, the capability bounding set is a system-wide
+Before Linux 2.6.25, the capability bounding set is a system-wide
 attribute that affects all threads on the system.
 The bounding set is accessible via the file
 .IR /proc/sys/kernel/cap\-bound .
@@ -1478,7 +1478,7 @@ in
 and rebuild the kernel.
 .PP
 The system-wide capability bounding set feature was added
-to Linux starting with kernel version 2.2.11.
+to Linux 2.2.11.
 .\"
 .\"
 .\"
@@ -1564,7 +1564,7 @@ The new effective set must be a subset of the new permitted set.
 .\" For some background:
 .\"       see http://lwn.net/Articles/280279/ and
 .\"       http://article.gmane.org/gmane.linux.kernel.lsm/5476/
-Starting with kernel 2.6.26,
+Starting with Linux 2.6.26,
 and with a kernel in which file capabilities are enabled,
 Linux implements a set of per-thread
 .I securebits
@@ -1776,7 +1776,7 @@ $ \fBsudo strace \-o trace.log \-u ceci ./myprivprog\fP
 .EE
 .in
 .PP
-From kernel 2.5.27 to kernel 2.6.26,
+From Linux 2.5.27 to Linux 2.6.26,
 .\" commit 5915eb53861c5776cfec33ca4fcc1fd20d66dd27 removed
 .\" CONFIG_SECURITY_CAPABILITIES
 capabilities were an optional kernel component,
@@ -1816,7 +1816,7 @@ It can be found at
 .UR https://git.kernel.org\:/pub\:/scm\:/libs\:/libcap\:/libcap.git\:/refs/
 .UE .
 .PP
-Before kernel 2.6.24, and from kernel 2.6.24 to kernel 2.6.32 if
+Before Linux 2.6.24, and from Linux 2.6.24 to Linux 2.6.32 if
 file capabilities are not enabled, a thread with the
 .B CAP_SETPCAP
 capability can manipulate the capabilities of threads other than itself.
diff --git a/man7/cpuset.7 b/man7/cpuset.7
index e3b9b403e6..9cc3c52ade 100644
--- a/man7/cpuset.7
+++ b/man7/cpuset.7
@@ -1323,7 +1323,7 @@ the process ID (PID) of a nonexistent process to a cpuset
 file.
 .\" ================== VERSIONS ==================
 .SH VERSIONS
-Cpusets appeared in version 2.6.12 of the Linux kernel.
+Cpusets appeared in Linux 2.6.12.
 .\" ================== NOTES ==================
 .SH NOTES
 Despite its name, the
diff --git a/man7/credentials.7 b/man7/credentials.7
index 1ee4885579..35a98b2199 100644
--- a/man7/credentials.7
+++ b/man7/credentials.7
@@ -215,15 +215,15 @@ and
 Supplementary group IDs.
 This is a set of additional group IDs that are used for permission
 checks when accessing files and other shared resources.
-On Linux kernels before 2.6.4,
+Before Linux 2.6.4,
 a process can be a member of up to 32 supplementary groups;
-since kernel 2.6.4,
+since Linux 2.6.4,
 a process can be a member of up to 65536 supplementary groups.
 The call
 .I sysconf(_SC_NGROUPS_MAX)
 can be used to determine the number of supplementary groups
 of which a process may be a member.
-.\" Since kernel 2.6.4, the limit is visible via the read-only file
+.\" Since Linux 2.6.4, the limit is visible via the read-only file
 .\" /proc/sys/kernel/ngroups_max.
 .\" As at 2.6.22-rc2, this file is still read-only.
 A process can obtain its set of supplementary group IDs using
diff --git a/man7/epoll.7 b/man7/epoll.7
index 3812d94e39..bdad0e40f7 100644
--- a/man7/epoll.7
+++ b/man7/epoll.7
@@ -236,7 +236,7 @@ call.
 .SS /proc interfaces
 The following interfaces can be used to limit the amount of
 kernel memory consumed by epoll:
-.\" Following was added in 2.6.28, but them removed in 2.6.29
+.\" Following was added in Linux 2.6.28, but them removed in Linux 2.6.29
 .\" .TP
 .\" .IR /proc/sys/fs/epoll/max_user_instances " (since Linux 2.6.28)"
 .\" This specifies an upper limit on the number of epoll instances
@@ -250,7 +250,7 @@ The limit is per real user ID.
 Each registered file descriptor costs roughly 90 bytes on a 32-bit kernel,
 and roughly 160 bytes on a 64-bit kernel.
 Currently,
-.\" 2.6.29 (in 2.6.28, the default was 1/32 of lowmem)
+.\" Linux 2.6.29 (in Linux 2.6.28, the default was 1/32 of lowmem)
 the default value for
 .I max_user_watches
 is 1/25 (4%) of the available low memory,
@@ -578,7 +578,7 @@ The
 .B epoll
 API was introduced in Linux kernel 2.5.44.
 .\" Its interface should be finalized in Linux kernel 2.5.66.
-Support was added to glibc in version 2.3.2.
+Support was added in glibc 2.3.2.
 .SH STANDARDS
 The
 .B epoll
diff --git a/man7/fanotify.7 b/man7/fanotify.7
index 87417ed29f..a84e309941 100644
--- a/man7/fanotify.7
+++ b/man7/fanotify.7
@@ -907,9 +907,9 @@ in the response structure is not valid.
 This may occur when a response for the permission event has already been
 written.
 .SH VERSIONS
-The fanotify API was introduced in version 2.6.36 of the Linux kernel and
-enabled in version 2.6.37.
-Fdinfo support was added in version 3.8.
+The fanotify API was introduced in Linux 2.6.36 and
+enabled in Linux 2.6.37.
+Fdinfo support was added in Linux 3.8.
 .SH STANDARDS
 The fanotify API is Linux-specific.
 .SH NOTES
diff --git a/man7/feature_test_macros.7 b/man7/feature_test_macros.7
index 6e704f0163..c8f2486a29 100644
--- a/man7/feature_test_macros.7
+++ b/man7/feature_test_macros.7
@@ -515,21 +515,21 @@ Defining this macro (with any value) implicitly defines
 .BR _POSIX_SOURCE ,
 .B _POSIX_C_SOURCE
 with the value 200809L
-(200112L in glibc versions before 2.10;
-199506L in glibc versions before 2.5;
-199309L in glibc versions before 2.1)
+(200112L before glibc 2.10;
+199506L before glibc 2.5;
+199309L before glibc 2.1)
 and
 .B _XOPEN_SOURCE
 with the value 700
-(600 in glibc versions before 2.10;
-500 in glibc versions before 2.2).
+(600 before glibc 2.10;
+500 before glibc 2.2).
 In addition, various GNU-specific extensions are also exposed.
 .IP
 Since glibc 2.19, defining
 .B _GNU_SOURCE
 also has the effect of implicitly defining
 .BR _DEFAULT_SOURCE .
-In glibc versions before 2.20, defining
+Before glibc 2.20, defining
 .B _GNU_SOURCE
 also had the effect of implicitly defining
 .B _BSD_SOURCE
@@ -657,7 +657,7 @@ can now be fortified.
 .IP
 Use of this macro requires compiler support, available with
 .BR gcc (1)
-since version 4.0.
+since glibc 4.0.
 .IP
 Use of
 .B _FORTIFY_SOURCE
@@ -676,9 +676,9 @@ then the following feature test macros are defined by default:
 .BR _POSIX_SOURCE ,
 and
 .BR _POSIX_C_SOURCE =200809L
-(200112L in glibc versions before 2.10;
-199506L in glibc versions before 2.4;
-199309L in glibc versions before 2.1).
+(200112L before glibc 2.10;
+199506L before glibc 2.4;
+199309L before glibc 2.1).
 .PP
 If any of
 .BR __STRICT_ANSI__ ,
@@ -752,8 +752,8 @@ If
 is undefined, then the setting of
 .B _POSIX_C_SOURCE
 depends on the glibc version:
-199506L, in glibc versions before 2.4;
-200112L, in glibc 2.4 to 2.9; and
+199506L, before glibc 2.4;
+200112L, since glibc 2.4 to glibc 2.9; and
 200809L, since glibc 2.10.
 .RE
 .PP
diff --git a/man7/icmp.7 b/man7/icmp.7
index f96d4d1a53..4f151e79d3 100644
--- a/man7/icmp.7
+++ b/man7/icmp.7
@@ -52,8 +52,8 @@ cleared after a burst.
 A jiffy is a system dependent unit, usually 10ms on i386 and
 about 1ms on alpha and ia64.
 .TP
-.IR icmp_destunreach_rate " (Linux 2.2 to 2.4.9)"
-.\" Precisely: from 2.1.102
+.IR icmp_destunreach_rate " (Linux 2.2 to Linux 2.4.9)"
+.\" Precisely: from Linux 2.1.102
 Maximum rate to send ICMP Destination Unreachable packets.
 This limits the rate at which packets are sent to any individual
 route or destination.
@@ -68,13 +68,13 @@ If this value is nonzero, Linux will ignore all
 requests.
 .TP
 .IR icmp_echo_ignore_broadcasts " (since Linux 2.2)"
-.\" Precisely: from 2.1.68
+.\" Precisely: from Linux 2.1.68
 If this value is nonzero, Linux will ignore all
 .B ICMP_ECHO
 packets sent to broadcast addresses.
 .TP
-.IR icmp_echoreply_rate " (Linux 2.2 to 2.4.9)"
-.\" Precisely: from 2.1.102
+.IR icmp_echoreply_rate " (Linux 2.2 to Linux 2.4.9)"
+.\" Precisely: from Linux 2.1.102
 Maximum rate for sending
 .B ICMP_ECHOREPLY
 packets in response to
@@ -82,7 +82,7 @@ packets in response to
 packets.
 .TP
 .IR icmp_errors_use_inbound_ifaddr " (Boolean; default: disabled; since Linux 2.6.12)"
-.\" The following taken from 2.6.28-rc4 Documentation/networking/ip-sysctl.txt
+.\" The following taken from Linux 2.6.28-rc4 Documentation/networking/ip-sysctl.txt
 If disabled, ICMP error messages are sent with the primary address of
 the exiting interface.
 .IP
@@ -97,22 +97,22 @@ then the primary address of the first non-loopback interface that
 has one will be used regardless of this setting.
 .TP
 .IR icmp_ignore_bogus_error_responses " (Boolean; default: disabled; since Linux 2.2)"
-.\" precisely: since 2.1.32
-.\" The following taken from 2.6.28-rc4 Documentation/networking/ip-sysctl.txt
+.\" precisely: since Linux 2.1.32
+.\" The following taken from Linux 2.6.28-rc4 Documentation/networking/ip-sysctl.txt
 Some routers violate RFC1122 by sending bogus responses to broadcast frames.
 Such violations are normally logged via a kernel warning.
 If this parameter is enabled, the kernel will not give such warnings,
 which will avoid log file clutter.
 .TP
-.IR icmp_paramprob_rate " (Linux 2.2 to 2.4.9)"
-.\" Precisely: from 2.1.102
+.IR icmp_paramprob_rate " (Linux 2.2 to Linux 2.4.9)"
+.\" Precisely: from Linux 2.1.102
 Maximum rate for sending
 .B ICMP_PARAMETERPROB
 packets.
 These packets are sent when a packet arrives with an invalid IP header.
 .TP
 .IR icmp_ratelimit " (integer; default: 1000; since Linux 2.4.10)"
-.\" The following taken from 2.6.28-rc4 Documentation/networking/ip-sysctl.txt
+.\" The following taken from Linux 2.6.28-rc4 Documentation/networking/ip-sysctl.txt
 Limit the maximum rates for sending ICMP packets whose type matches
 .I icmp_ratemask
 (see below) to specific targets.
@@ -120,7 +120,7 @@ Limit the maximum rates for sending ICMP packets whose type matches
 otherwise the minimum space between responses in milliseconds.
 .TP
 .IR icmp_ratemask " (integer; default: see below; since Linux 2.4.10)"
-.\" The following taken from 2.6.28-rc4 Documentation/networking/ip-sysctl.txt
+.\" The following taken from Linux 2.6.28-rc4 Documentation/networking/ip-sysctl.txt
 Mask made of ICMP types for which rates are being limited.
 .IP
 Significant bits: IHGFEDCBA9876543210
@@ -151,7 +151,7 @@ I Address Mask Reply
 The bits marked with an asterisk are rate limited by default
 (see the default mask above).
 .TP
-.IR icmp_timeexceed_rate " (Linux 2.2 to 2.4.9)"
+.IR icmp_timeexceed_rate " (Linux 2.2 to Linux 2.4.9)"
 Maximum rate for sending
 .B ICMP_TIME_EXCEEDED
 packets.
@@ -166,7 +166,7 @@ means no group is allowed to create ICMP Echo sockets.
 .SH VERSIONS
 Support for the
 .B ICMP_ADDRESS
-request was removed in 2.2.
+request was removed in Linux 2.2.
 .PP
 Support for
 .B ICMP_SOURCE_QUENCH
diff --git a/man7/inotify.7 b/man7/inotify.7
index 8821e136f0..13b4fa4197 100644
--- a/man7/inotify.7
+++ b/man7/inotify.7
@@ -142,9 +142,9 @@ structure is thus
 The behavior when the buffer given to
 .BR read (2)
 is too small to return information about the next event depends
-on the kernel version: in kernels before 2.6.21,
+on the kernel version: before Linux 2.6.21,
 .BR read (2)
-returns 0; since kernel 2.6.21,
+returns 0; since Linux 2.6.21,
 .BR read (2)
 fails with the error
 .BR EINVAL .
@@ -576,13 +576,13 @@ that can be created per real user ID.
 This specifies an upper limit on the number of watches
 that can be created per real user ID.
 .SH VERSIONS
-Inotify was merged into the 2.6.13 Linux kernel.
-The required library interfaces were added to glibc in version 2.4.
+Inotify was merged into Linux 2.6.13.
+The required library interfaces were added in glibc 2.4.
 .RB ( IN_DONT_FOLLOW ,
 .BR IN_MASK_ADD ,
 and
 .B IN_ONLYDIR
-were added in glibc version 2.5.)
+were added in glibc 2.5.)
 .SH STANDARDS
 The inotify API is Linux-specific.
 .SH NOTES
@@ -805,9 +805,9 @@ generate
 events.
 .PP
 .\" FIXME . kernel commit 611da04f7a31b2208e838be55a42c7a1310ae321
-.\" implies that unmount events were buggy 2.6.11 to 2.6.36
+.\" implies that unmount events were buggy since Linux 2.6.11 to Linux 2.6.36
 .\"
-In kernels before 2.6.16, the
+Before Linux 2.6.16, the
 .B IN_ONESHOT
 .I mask
 flag does not work.
@@ -822,7 +822,7 @@ since Linux 2.6.36, an
 .B IN_IGNORED
 event is generated in this case.
 .PP
-Before kernel 2.6.25,
+Before Linux 2.6.25,
 .\" commit 1c17d18e3775485bf1e0ce79575eb637a94494a2
 the kernel code that was intended to coalesce successive identical events
 (i.e., the two most recent events could potentially be coalesced
diff --git a/man7/ip.7 b/man7/ip.7
index 243426ad45..010c30d3ee 100644
--- a/man7/ip.7
+++ b/man7/ip.7
@@ -323,7 +323,7 @@ is valid only for
 .BR setsockopt (2).
 .\"
 .TP
-.BR IP_ADD_SOURCE_MEMBERSHIP " (since Linux 2.4.22 / 2.5.68)"
+.BR IP_ADD_SOURCE_MEMBERSHIP " (since Linux 2.4.22 / Linux 2.5.68)"
 Join a multicast group and allow receiving data only
 from a specified source.
 Argument is an
@@ -411,7 +411,7 @@ structure as described under
 .BR IP_ADD_SOURCE_MEMBERSHIP .
 .TP
 .BR IP_FREEBIND " (since Linux 2.4)"
-.\" Precisely: 2.4.0-test10
+.\" Precisely: since Linux 2.4.0-test10
 If enabled, this boolean option allows binding to an IP address
 that is nonlocal or does not (yet) exist.
 This permits listening on a socket,
@@ -478,7 +478,7 @@ For the full description of multicast source filtering
 refer to RFC 3376.
 .TP
 .BR IP_MTU " (since Linux 2.2)"
-.\" Precisely: 2.1.124
+.\" Precisely: since Linux 2.1.124
 Retrieve the current known path MTU of the current socket.
 Returns an integer.
 .IP
@@ -488,7 +488,7 @@ is valid only for
 and can be employed only when the socket has been connected.
 .TP
 .BR IP_MTU_DISCOVER " (since Linux 2.2)"
-.\" Precisely: 2.1.124
+.\" Precisely: since Linux 2.1.124
 Set or receive the Path MTU Discovery setting for a socket.
 When enabled, Linux will perform Path MTU Discovery
 as defined in RFC\ 1191 on
@@ -633,7 +633,7 @@ This option is valid only for
 sockets.
 .TP
 .BR IP_OPTIONS " (since Linux 2.0)"
-.\" Precisely: 1.3.30
+.\" Precisely: since Linux 1.3.30
 Set or get the IP options to be sent with every packet from this socket.
 The arguments are a pointer to a memory buffer containing the options
 and the option length.
@@ -701,7 +701,7 @@ is
 and this is never used for a control message type.
 .TP
 .BR IP_PKTINFO " (since Linux 2.2)"
-.\" Precisely: 2.1.68
+.\" Precisely: since Linux 2.1.68
 Pass an
 .B IP_PKTINFO
 ancillary message that contains a
@@ -751,7 +751,7 @@ index overwrites
 for the routing table lookup.
 .TP
 .BR IP_RECVERR " (since Linux 2.2)"
-.\" Precisely: 2.1.15
+.\" Precisely: since Linux 2.1.15
 Enable extended reliable error message passing.
 When enabled on a datagram socket, all
 generated errors will be queued in a per-socket error queue.
@@ -890,7 +890,7 @@ It sets or retrieves an integer boolean flag.
 defaults to off.
 .TP
 .BR IP_RECVOPTS " (since Linux 2.2)"
-.\" Precisely: 2.1.15
+.\" Precisely: since Linux 2.1.15
 Pass all incoming IP options to the user in a
 .B IP_OPTIONS
 control message.
@@ -912,7 +912,7 @@ The ancillary message contains a
 .IR "struct sockaddr_in" .
 .TP
 .BR IP_RECVTOS " (since Linux 2.2)"
-.\" Precisely: 2.1.68
+.\" Precisely: since Linux 2.1.68
 If enabled, the
 .B IP_TOS
 ancillary message is passed with incoming packets.
@@ -921,7 +921,7 @@ field of the packet header.
 Expects a boolean integer flag.
 .TP
 .BR IP_RECVTTL " (since Linux 2.2)"
-.\" Precisely: 2.1.68
+.\" Precisely: since Linux 2.1.68
 When this flag is set, pass a
 .B IP_TTL
 control message with the time-to-live
@@ -931,14 +931,14 @@ Not supported for
 sockets.
 .TP
 .BR IP_RETOPTS " (since Linux 2.2)"
-.\" Precisely: 2.1.15
+.\" Precisely: since Linux 2.1.15
 Identical to
 .BR IP_RECVOPTS ,
 but returns raw unprocessed options with timestamp and route record
 options not filled in for this hop.
 .TP
 .BR IP_ROUTER_ALERT " (since Linux 2.2)"
-.\" Precisely: 2.1.68
+.\" Precisely: since Linux 2.1.68
 Pass all to-be forwarded packets with the
 IP Router Alert option set to this socket.
 Valid only for raw sockets.
@@ -1090,10 +1090,10 @@ meaning that the option is disabled.
 .\"
 .TP
 .IR ip_always_defrag " (Boolean; since Linux 2.2.13)"
-[New with kernel 2.2.13; in earlier kernel versions this feature
+[New with Linux 2.2.13; in earlier kernel versions this feature
 was controlled at compile time by the
 .B CONFIG_IP_ALWAYS_DEFRAG
-option; this option is not present in 2.4.x and later]
+option; this option is not present in Linux 2.4.x and later]
 .IP
 When this boolean flag is enabled (not equal 0), incoming fragments
 (parts of IP packets
@@ -1113,14 +1113,14 @@ This is automagically turned on when masquerading or transparent
 proxying are configured.
 .\"
 .TP
-.IR ip_autoconfig " (since Linux 2.2 to 2.6.17)"
-.\" Precisely: since 2.1.68
+.IR ip_autoconfig " (since Linux 2.2 to Linux 2.6.17)"
+.\" Precisely: since Linux 2.1.68
 .\" FIXME document ip_autoconfig
 Not documented.
 .\"
 .TP
 .IR ip_default_ttl " (integer; default: 64; since Linux 2.2)"
-.\" Precisely: 2.1.15
+.\" Precisely: since Linux 2.1.15
 Set the default time-to-live value of outgoing packets.
 This can be changed per socket with the
 .B IP_TTL
@@ -1140,7 +1140,7 @@ IP forwarding can be also set on a per-interface basis.
 .\"
 .TP
 .IR ip_local_port_range " (since Linux 2.2)"
-.\" Precisely: since 2.1.68
+.\" Precisely: since Linux 2.1.68
 This file contains two integers that define the default local port range
 allocated to sockets that are not explicitly bound to a port number\(emthat
 is, the range used for
@@ -1188,7 +1188,7 @@ It is better to fix the broken routers on the path than to turn off
 Path MTU Discovery globally, because not doing it incurs a high cost
 to the network.
 .\"
-.\" The following is from 2.6.12: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.12: Documentation/networking/ip-sysctl.txt
 .TP
 .IR ip_nonlocal_bind " (Boolean; default: disabled; since Linux 2.4)"
 .\" Precisely: patch-2.4.0-test10
@@ -1197,12 +1197,12 @@ If set, allows processes to
 to nonlocal IP addresses,
 which can be quite useful, but may break some applications.
 .\"
-.\" The following is from 2.6.12: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.12: Documentation/networking/ip-sysctl.txt
 .TP
 .IR ip6frag_time " (integer; default: 30)"
 Time in seconds to keep an IPv6 fragment in memory.
 .\"
-.\" The following is from 2.6.12: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.12: Documentation/networking/ip-sysctl.txt
 .TP
 .IR ip6frag_secret_interval " (integer; default: 600)"
 Regeneration interval (in seconds) of the hash secret (or lifetime
diff --git a/man7/ipv6.7 b/man7/ipv6.7
index 64c167215c..7fe2d8d993 100644
--- a/man7/ipv6.7
+++ b/man7/ipv6.7
@@ -33,53 +33,53 @@
 .\"		IPV6_RECVRTHDR (2.6.14)
 .\"		IPV6_RECVDSTOPTS (2.6.14)
 .\"
-.\"	IPV6_RECVPATHMTU (2.6.35, flag value added in 2.6.14)
+.\"	IPV6_RECVPATHMTU (Linux 2.6.35, flag value added in Linux 2.6.14)
 .\"	    commit 793b14731686595a741d9f47726ad8b9a235385a
 .\"	    Author: Brian Haley <brian.haley@hp.com>
-.\"	IPV6_PATHMTU (2.6.35, flag value added in 2.6.14)
+.\"	IPV6_PATHMTU (Linux 2.6.35, flag value added in Linux 2.6.14)
 .\"	    commit 793b14731686595a741d9f47726ad8b9a235385a
 .\"	    Author: Brian Haley <brian.haley@hp.com>
-.\"	IPV6_DONTFRAG (2.6.35, flag value added in 2.6.14)
+.\"	IPV6_DONTFRAG (Linux 2.6.35, flag value added in Linux 2.6.14)
 .\"	    commit 793b14731686595a741d9f47726ad8b9a235385a
 .\"	    Author: Brian Haley <brian.haley@hp.com>
 .\"	    commit 4b340ae20d0e2366792abe70f46629e576adaf5e
 .\"	    Author: Brian Haley <brian.haley@hp.com>
 .\"
-.\"	IPV6_RECVTCLASS (2.6.14)
+.\"	IPV6_RECVTCLASS (Linux 2.6.14)
 .\"	    commit 41a1f8ea4fbfcdc4232f023732584aae2220de31
 .\"	    Author: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
 .\"		Based on patch from David L Stevens <dlstevens@us.ibm.com>
 .\"
-.\"	IPV6_CHECKSUM (2.2)
-.\"	IPV6_NEXTHOP (2.2)
-.\"	IPV6_JOIN_ANYCAST (2.4.21 / 2.6)
-.\"	IPV6_LEAVE_ANYCAST (2.4.21 / 2.6)
-.\"	IPV6_FLOWLABEL_MGR (2.2.7 / 2.4)
-.\"	IPV6_FLOWINFO_SEND (2.2.7 / 2.4)
-.\"	IPV6_IPSEC_POLICY (2.6)
-.\"	IPV6_XFRM_POLICY (2.6)
-.\"	IPV6_TCLASS (2.6)
+.\"	IPV6_CHECKSUM (Linux 2.2)
+.\"	IPV6_NEXTHOP (Linux 2.2)
+.\"	IPV6_JOIN_ANYCAST (Linux 2.4.21 / Linux 2.6)
+.\"	IPV6_LEAVE_ANYCAST (Linux 2.4.21 / Linux 2.6)
+.\"	IPV6_FLOWLABEL_MGR (Linux 2.2.7 / Linux 2.4)
+.\"	IPV6_FLOWINFO_SEND (Linux 2.2.7 / Linux 2.4)
+.\"	IPV6_IPSEC_POLICY (Linux 2.6)
+.\"	IPV6_XFRM_POLICY (Linux 2.6)
+.\"	IPV6_TCLASS (Linux 2.6)
 .\"
-.\"	IPV6_ADDR_PREFERENCES (2.6.26)
+.\"	IPV6_ADDR_PREFERENCES (Linux 2.6.26)
 .\"	    commit 7cbca67c073263c179f605bdbbdc565ab29d801d
 .\"	    Author: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
-.\"	IPV6_MINHOPCOUNT (2.6.35)
+.\"	IPV6_MINHOPCOUNT (Linux 2.6.35)
 .\"	    commit e802af9cabb011f09b9c19a82faef3dd315f27eb
 .\"	    Author: Stephen Hemminger <shemminger@vyatta.com>
-.\"	IPV6_ORIGDSTADDR (2.6.37)
+.\"	IPV6_ORIGDSTADDR (Linux 2.6.37)
 .\"	    Actually a CMSG rather than a sockopt?
 .\"	    In header file, we have IPV6_RECVORIGDSTADDR == IPV6_ORIGDSTADDR
 .\"	    commit 6c46862280c5f55eda7750391bc65cd7e08c7535
 .\"	    Author: Balazs Scheidler <bazsi@balabit.hu>
-.\"	IPV6_RECVORIGDSTADDR (2.6.37)
+.\"	IPV6_RECVORIGDSTADDR (Linux 2.6.37)
 .\"	    commit 6c46862280c5f55eda7750391bc65cd7e08c7535
 .\"	    Author: Balazs Scheidler <bazsi@balabit.hu>
 .\"	        Support for IPV6_RECVORIGDSTADDR sockopt for UDP sockets
 .\"		were contributed by Harry Mason.
-.\"	IPV6_TRANSPARENT (2.6.37)
+.\"	IPV6_TRANSPARENT (Linux 2.6.37)
 .\"	    commit 6c46862280c5f55eda7750391bc65cd7e08c7535
 .\"	    Author: Balazs Scheidler <bazsi@balabit.hu>
-.\"	IPV6_UNICAST_IF (3.4)
+.\"	IPV6_UNICAST_IF (Linux 3.4)
 .\"	    commit c4062dfc425e94290ac427a98d6b4721dd2bc91f
 .\"	    Author: Erich E. Hoover <ehoover@mines.edu>
 .\"
@@ -146,7 +146,7 @@ struct sockaddr_in6 {
     in_port_t       sin6_port;     /* port number */
     uint32_t        sin6_flowinfo; /* IPv6 flow information */
     struct in6_addr sin6_addr;     /* IPv6 address */
-    uint32_t        sin6_scope_id; /* Scope ID (new in 2.4) */
+    uint32_t        sin6_scope_id; /* Scope ID (new in Linux 2.4) */
 };
 
 struct in6_addr {
diff --git a/man7/locale.7 b/man7/locale.7
index 301fea9055..3a613dc668 100644
--- a/man7/locale.7
+++ b/man7/locale.7
@@ -295,8 +295,7 @@ struct lconv {
 .in
 .SS POSIX.1-2008 extensions to the locale API
 POSIX.1-2008 standardized a number of extensions to the locale API,
-based on implementations that first appeared in version 2.3
-of the GNU C library.
+based on implementations that first appeared in glibc 2.3.
 These extensions are designed to address the problem that
 the traditional locale APIs do not mix well with multithreaded applications
 and with applications that must deal with multiple locales.
diff --git a/man7/man-pages.7 b/man7/man-pages.7
index 73c0522d11..0d58f81d5e 100644
--- a/man7/man-pages.7
+++ b/man7/man-pages.7
@@ -353,8 +353,8 @@ Patches to remedy this are welcome,
 but, from the perspective of programmers writing new code,
 this information probably matters only in the case of kernel
 interfaces that have been added in Linux 2.4 or later
-(i.e., changes since kernel 2.2),
-and library functions that have been added to glibc since version 2.1
+(i.e., changes since Linux 2.2),
+and library functions that have been added to glibc since glibc 2.1
 (i.e., changes since glibc 2.0).
 .IP
 The
diff --git a/man7/math_error.7 b/man7/math_error.7
index c288c9618f..b2ff1c75d0 100644
--- a/man7/math_error.7
+++ b/man7/math_error.7
@@ -177,7 +177,7 @@ exceptions retrievable via
 is in use.
 The standards require that at least one be in use,
 but permit both to be available.
-The current (version 2.8) situation under glibc is messy.
+The current (glibc 2.8) situation under glibc is messy.
 Most (but not all) functions raise exceptions on errors.
 Some also set
 .IR errno .
diff --git a/man7/mount_namespaces.7 b/man7/mount_namespaces.7
index dec0dedb9c..e9dea19553 100644
--- a/man7/mount_namespaces.7
+++ b/man7/mount_namespaces.7
@@ -1013,7 +1013,7 @@ in the new namespace,
 .BR unshare (1)
 (since
 .I util\-linux
-version 2.27) in turn reverses the step performed by
+ 2.27) in turn reverses the step performed by
 .BR systemd (1),
 by making all mounts private in the new namespace.
 That is,
diff --git a/man7/mq_overview.7 b/man7/mq_overview.7
index 8e3081917e..4e7ca8c67c 100644
--- a/man7/mq_overview.7
+++ b/man7/mq_overview.7
@@ -97,8 +97,8 @@ mq_unlink(3)	mq_unlink(2)
 .TE
 .RE
 .SS Versions
-POSIX message queues have been supported on Linux since kernel 2.6.6.
-Glibc support has been provided since version 2.3.4.
+POSIX message queues have been supported since Linux 2.6.6.
+Glibc support has been provided since glibc 2.3.4.
 .SS Kernel configuration
 Support for POSIX message queues is configurable via the
 .B CONFIG_POSIX_MQUEUE
@@ -136,7 +136,7 @@ value will be the smaller of
 .I msg_default
 and
 .IR msg_max .
-Up until Linux 2.6.28, the default
+Before Linux 2.6.28, the default
 .I mq_maxmsg
 was 10;
 from Linux 2.6.28 to Linux 3.4, the default was the value defined for the
@@ -153,7 +153,7 @@ argument given to
 The default value for
 .I msg_max
 is 10.
-The minimum value is 1 (10 in kernels before 2.6.28).
+The minimum value is 1 (10 before Linux 2.6.28).
 The upper limit is
 .BR HARD_MSGMAX .
 The
@@ -172,7 +172,7 @@ has changed across kernel versions:
 Up to Linux 2.6.32:
 .I 131072\~/\~sizeof(void\~*)
 .IP \(bu
-Linux 2.6.33 to 3.4:
+Linux 2.6.33 to Linux 3.4:
 .I (32768\~*\~sizeof(void\~*) / 4)
 .IP \(bu
 Since Linux 3.5:
@@ -200,7 +200,7 @@ a new queue's default
 value is capped to the
 .I msgsize_max
 limit.
-Up until Linux 2.6.28, the default
+Before Linux 2.6.28, the default
 .I mq_msgsize
 was 8192;
 from Linux 2.6.28 to Linux 3.4, the default was the value defined for the
@@ -217,7 +217,7 @@ argument given to
 The default value for
 .I msgsize_max
 is 8192 bytes.
-The minimum value is 128 (8192 in kernels before 2.6.28).
+The minimum value is 128 (8192 before Linux 2.6.28).
 The upper limit for
 .I msgsize_max
 has varied across kernel versions:
@@ -226,7 +226,7 @@ has varied across kernel versions:
 Before Linux 2.6.28, the upper limit is
 .BR INT_MAX .
 .IP \(bu
-From Linux 2.6.28 to 3.4, the limit is 1,048,576.
+From Linux 2.6.28 to Linux 3.4, the limit is 1,048,576.
 .IP \(bu
 Since Linux 3.5, the limit is 16,777,216
 .RB ( HARD_MSGSIZEMAX ).
@@ -344,17 +344,17 @@ System V message queues;
 on the other hand POSIX message queues are less widely available
 (especially on older systems) than System V message queues.
 .PP
-Linux does not currently (2.6.26) support the use of access control
+Linux does not currently (Linux 2.6.26) support the use of access control
 lists (ACLs) for POSIX message queues.
 .SH BUGS
-In Linux versions 3.5 to 3.14, the kernel imposed a ceiling of 1024
+Since Linux 3.5 to Linux 3.14, the kernel imposed a ceiling of 1024
 .RB ( HARD_QUEUESMAX )
 on the value to which the
 .I queues_max
 limit could be raised,
 and the ceiling was enforced even for privileged processes.
 This ceiling value was removed in Linux 3.14,
-and patches to stable kernels 3.5.x to 3.13.x also removed the ceiling.
+and patches to stable Linux 3.5.x to Linux 3.13.x also removed the ceiling.
 .PP
 As originally implemented (and documented),
 the QSIZE field displayed the total number of (user-supplied)
diff --git a/man7/netdevice.7 b/man7/netdevice.7
index 67537aaff0..5fe93dce37 100644
--- a/man7/netdevice.7
+++ b/man7/netdevice.7
@@ -358,7 +358,7 @@ or
 structures,
 .B EFAULT
 will be returned.
-.\" Slaving isn't supported in 2.2
+.\" Slaving isn't supported in Linux 2.2
 .\" .
 .\" .TP
 .\" .BR SIOCGIFSLAVE ", " SIOCSIFSLAVE
diff --git a/man7/netlink.7 b/man7/netlink.7
index a69c8cb53c..f57eb83f2c 100644
--- a/man7/netlink.7
+++ b/man7/netlink.7
@@ -47,7 +47,7 @@ neighbor setups, queueing disciplines, traffic classes, and
 packet classifiers (see
 .BR rtnetlink (7)).
 .TP
-.BR NETLINK_W1 " (Linux 2.6.13 to 2.16.17)"
+.BR NETLINK_W1 " (Linux 2.6.13 to Linux 2.16.17)"
 Messages from 1-wire subsystem.
 .TP
 .B NETLINK_USERSOCK
@@ -104,7 +104,7 @@ See
 (or
 .I /Documentation/connector/connector.*
 .\" commit baa293e9544bea71361950d071579f0e4d5713ed
-in kernel 5.2 and earlier)
+in Linux 5.2 and earlier)
 in the Linux kernel source tree for further information.
 .TP
 .BR NETLINK_NETFILTER " (since Linux 2.6.14)"
diff --git a/man7/path_resolution.7 b/man7/path_resolution.7
index 9e091e68c5..6f44d21474 100644
--- a/man7/path_resolution.7
+++ b/man7/path_resolution.7
@@ -103,7 +103,7 @@ exceeded ("Too many levels of symbolic links").
 As currently implemented on Linux, the maximum number
 .\" MAXSYMLINKS is 40
 of symbolic links that will be followed while resolving a pathname is 40.
-In kernels before 2.6.18, the limit on the recursion depth was 5.
+Before Linux 2.6.18, the limit on the recursion depth was 5.
 Starting with Linux 2.6.18, this limit
 .\" MAX_NESTED_LINKS
 was raised to 8.
diff --git a/man7/pipe.7 b/man7/pipe.7
index 852cbd94fb..8af8932f38 100644
--- a/man7/pipe.7
+++ b/man7/pipe.7
@@ -110,7 +110,7 @@ an application should be designed so that a reading process consumes data
 as soon as it is available,
 so that a writing process does not remain blocked.
 .PP
-In Linux versions before 2.6.11, the capacity of a pipe was the same as
+Before Linux 2.6.11, the capacity of a pipe was the same as
 the system page size (e.g., 4096 bytes on i386).
 Since Linux 2.6.11, the pipe capacity is 16 pages
 (i.e., 65,536 bytes in a system with a page size of 4096 bytes).
@@ -315,7 +315,7 @@ The target for delivery of signals must be set using the
 command.
 On Linux,
 .B O_ASYNC
-is supported for pipes and FIFOs only since kernel 2.6.
+is supported for pipes and FIFOs only since Linux 2.6.
 .SS Portability notes
 On some systems (but not Linux), pipes are bidirectional:
 data can be transmitted in both directions between the pipe ends.
diff --git a/man7/pthreads.7 b/man7/pthreads.7
index 606085d8eb..0058cd1216 100644
--- a/man7/pthreads.7
+++ b/man7/pthreads.7
@@ -811,26 +811,26 @@ The information returned by
 .BR times (2)
 and
 .BR getrusage (2)
-is per-thread rather than process-wide (fixed in kernel 2.6.9).
+is per-thread rather than process-wide (fixed in Linux 2.6.9).
 .IP \(bu
-Threads do not share resource limits (fixed in kernel 2.6.10).
+Threads do not share resource limits (fixed in Linux 2.6.10).
 .IP \(bu
-Threads do not share interval timers (fixed in kernel 2.6.12).
+Threads do not share interval timers (fixed in Linux 2.6.12).
 .IP \(bu
 Only the main thread is permitted to start a new session using
 .BR setsid (2)
-(fixed in kernel 2.6.16).
+(fixed in Linux 2.6.16).
 .IP \(bu
 Only the main thread is permitted to make the process into a
 process group leader using
 .BR setpgid (2)
-(fixed in kernel 2.6.16).
+(fixed in Linux 2.6.16).
 .IP \(bu
 Threads have distinct alternate signal stack settings.
 However, a new thread's alternate signal stack settings
 are copied from the thread that created it, so that
 the threads initially share an alternate signal stack
-(fixed in kernel 2.6.16).
+(fixed in Linux 2.6.16).
 .PP
 Note the following further points about the NPTL implementation:
 .IP \(bu 3
diff --git a/man7/pty.7 b/man7/pty.7
index 79e646a866..bef60e9318 100644
--- a/man7/pty.7
+++ b/man7/pty.7
@@ -47,7 +47,7 @@ pseudoterminals.
 System V-style terminals are commonly called UNIX 98 pseudoterminals
 on Linux systems.
 .PP
-Since kernel 2.6.4, BSD-style pseudoterminals are considered deprecated:
+Since Linux 2.6.4, BSD-style pseudoterminals are considered deprecated:
 support can be disabled when building the kernel by disabling the
 .B CONFIG_LEGACY_PTYS
 option.
@@ -74,12 +74,12 @@ in a call to
 .PP
 The Linux kernel imposes a limit on the number of available
 UNIX 98 pseudoterminals.
-In kernels up to and including 2.6.3, this limit is configured
+Up to and including Linux 2.6.3, this limit is configured
 at kernel compilation time
 .RB ( CONFIG_UNIX98_PTYS ),
 and the permitted number of pseudoterminals can be up to 2048,
 with a default setting of 256.
-Since kernel 2.6.4, the limit is dynamically adjustable via
+Since Linux 2.6.4, the limit is dynamically adjustable via
 .IR /proc/sys/kernel/pty/max ,
 and a corresponding file,
 .IR /proc/sys/kernel/pty/nr ,
diff --git a/man7/rtnetlink.7 b/man7/rtnetlink.7
index be43227743..270c78acc1 100644
--- a/man7/rtnetlink.7
+++ b/man7/rtnetlink.7
@@ -117,7 +117,7 @@ in Linux 2.4 and earlier).
 Add, remove, or receive information about an IP address associated with
 an interface.
 In Linux 2.2, an interface can carry multiple IP addresses,
-this replaces the alias device concept in 2.0.
+this replaces the alias device concept in Linux 2.0.
 In Linux 2.2, these messages
 support IPv4 and IPv6 addresses.
 They contain an
diff --git a/man7/sched.7 b/man7/sched.7
index a157c35ac9..8b50f54613 100644
--- a/man7/sched.7
+++ b/man7/sched.7
@@ -178,8 +178,8 @@ changes to a thread's priority (or policy) using any mechanism other than
 .BR pthread_setschedprio (3)
 should result in the thread being placed at the end of
 the list for its priority.
-.\" In 2.2.x and 2.4.x, the thread is placed at the front of the queue
-.\" In 2.0.x, the Right Thing happened: the thread went to the back -- MTK
+.\" In Linux 2.2.x and Linux 2.4.x, the thread is placed at the front of the queue
+.\" In Linux 2.0.x, the Right Thing happened: the thread went to the back -- MTK
 .IP \(bu
 A thread calling
 .BR sched_yield (2)
@@ -213,7 +213,7 @@ retrieved using
 .\" by the process nice value -- MTK
 .\"
 .SS SCHED_DEADLINE: Sporadic task model deadline scheduling
-Since version 3.14, Linux provides a deadline scheduling policy
+Since Linux 3.14, Linux provides a deadline scheduling policy
 .RB ( SCHED_DEADLINE ).
 This policy is currently implemented using
 GEDF (Global Earliest Deadline First)
@@ -421,16 +421,16 @@ The range of the nice value
 varies across UNIX systems.
 On modern Linux, the range is \-20 (high priority) to +19 (low priority).
 On some other systems, the range is \-20..20.
-Very early Linux kernels (Before Linux 2.0) had the range \-infinity..15.
+Very early Linux kernels (before Linux 2.0) had the range \-infinity..15.
 .\" Linux before 1.3.36 had \-infinity..15.
-.\" Since kernel 1.3.43, Linux has the range \-20..19.
+.\" Since Linux 1.3.43, Linux has the range \-20..19.
 .PP
 The degree to which the nice value affects the relative scheduling of
 .B SCHED_OTHER
 processes likewise varies across UNIX systems and
 across Linux kernel versions.
 .PP
-With the advent of the CFS scheduler in kernel 2.6.23,
+With the advent of the CFS scheduler in Linux 2.6.23,
 Linux adopted an algorithm that causes
 relative differences in nice values to have a much stronger effect.
 In the current implementation, each unit of difference in the
@@ -544,7 +544,7 @@ This flag is disabled in child processes created by
 .BR fork (2).
 .\"
 .SS Privileges and resource limits
-In Linux kernels before 2.6.12, only privileged
+Before Linux 2.6.12, only privileged
 .RB ( CAP_SYS_NICE )
 threads can set a nonzero static priority (i.e., set a real-time
 scheduling policy).
@@ -593,12 +593,12 @@ matches the real or effective user ID of the target thread.
 Special rules apply for the
 .B SCHED_IDLE
 policy.
-In Linux kernels before 2.6.39,
+Before Linux 2.6.39,
 an unprivileged thread operating under this policy cannot
 change its policy, regardless of the value of its
 .B RLIMIT_RTPRIO
 resource limit.
-In Linux kernels since 2.6.39,
+Since Linux 2.6.39,
 .\" commit c02aa73b1d18e43cfd79c2f193b225e84ca497c8
 an unprivileged thread can switch to either the
 .B SCHED_BATCH
@@ -627,7 +627,7 @@ or
 .B SCHED_DEADLINE
 policy can potentially block all other threads from accessing
 the CPU forever.
-Prior to Linux 2.6.25, the only way of preventing a runaway real-time
+Before Linux 2.6.25, the only way of preventing a runaway real-time
 process from freezing the system was to run (at the console)
 a shell scheduled under a higher static priority than the tested application.
 This allows an emergency kill of tested
@@ -643,7 +643,7 @@ See
 .BR getrlimit (2)
 for details.
 .PP
-Since version 2.6.25, Linux also provides two
+Since Linux 2.6.25, Linux also provides two
 .I /proc
 files that can be used to reserve a certain amount of CPU time
 to be used by non-real-time processes.
@@ -667,7 +667,7 @@ The value in this file can range from \-1 to
 .BR INT_MAX \-1.
 Specifying \-1 makes the run time the same as the period;
 that is, no CPU time is set aside for non-real-time processes
-(which was the Linux behavior before kernel 2.6.25).
+(which was the behavior before Linux 2.6.25).
 The default value in this file is 950,000 (0.95 seconds),
 meaning that 5% of the CPU time is reserved for processes that
 don't run under a real-time or deadline scheduling policy.
@@ -895,7 +895,7 @@ $ \fBecho 10 > /proc/self/autogroup\fP
 .SS Real-time features in the mainline Linux kernel
 .\" FIXME . Probably this text will need some minor tweaking
 .\" ask Carsten Emde about this.
-Since kernel version 2.6.18, Linux is gradually
+Since Linux 2.6.18, Linux is gradually
 becoming equipped with real-time capabilities,
 most of which are derived from the former
 .I realtime\-preempt
@@ -942,11 +942,11 @@ Originally, Standard Linux was intended as a general-purpose operating
 system being able to handle background processes, interactive
 applications, and less demanding real-time applications (applications that
 need to usually meet timing deadlines).
-Although the Linux kernel 2.6
+Although the Linux 2.6
 allowed for kernel preemption and the newly introduced O(1) scheduler
 ensures that the time needed to schedule is fixed and deterministic
 irrespective of the number of active tasks, true real-time computing
-was not possible up to kernel version 2.6.17.
+was not possible up to Linux 2.6.17.
 .SH SEE ALSO
 .ad l
 .nh
diff --git a/man7/sem_overview.7 b/man7/sem_overview.7
index 31bb048a66..1dfcf68ad4 100644
--- a/man7/sem_overview.7
+++ b/man7/sem_overview.7
@@ -85,7 +85,7 @@ the semaphore should be destroyed using
 The remainder of this section describes some specific details
 of the Linux implementation of POSIX semaphores.
 .SS Versions
-Prior to kernel 2.6, Linux supported only unnamed,
+Before Linux 2.6, Linux supported only unnamed,
 thread-shared semaphores.
 On a system with Linux 2.6 and a glibc that provides the NPTL
 threading implementation,
diff --git a/man7/shm_overview.7 b/man7/shm_overview.7
index 14eb2ef5d5..ee3d7b3b6b 100644
--- a/man7/shm_overview.7
+++ b/man7/shm_overview.7
@@ -75,7 +75,7 @@ On Linux, shared memory objects are created in a
 .RB ( tmpfs (5))
 virtual filesystem, normally mounted under
 .IR /dev/shm .
-Since kernel 2.6.19, Linux supports the use of access control lists (ACLs)
+Since Linux 2.6.19, Linux supports the use of access control lists (ACLs)
 to control the permissions of objects in the virtual filesystem.
 .SH NOTES
 Typically, processes must synchronize their access to a shared
diff --git a/man7/signal.7 b/man7/signal.7
index 05d5cc9e19..06dc54324c 100644
--- a/man7/signal.7
+++ b/man7/signal.7
@@ -527,7 +527,7 @@ Signal 29 is
 on SPARC.
 .\"
 .SS Real-time signals
-Starting with version 2.2,
+Starting with Linux 2.2,
 Linux supports real-time signals as originally defined in the POSIX.1b
 real-time extensions (and now included in POSIX.1-2001).
 The range of supported real-time signals is defined by the macros
@@ -612,7 +612,7 @@ According to POSIX, an implementation should permit at least
 (32) real-time signals to be queued to
 a process.
 However, Linux does things differently.
-In kernels up to and including 2.6.7, Linux imposes
+Up to and including Linux 2.6.7, Linux imposes
 a system-wide limit on the number of queued real-time signals
 for all processes.
 This limit can be viewed and (with privilege) changed via the
@@ -706,7 +706,7 @@ Socket interfaces:
 .\" If a timeout (setsockopt()) is in effect on the socket, then these
 .\" system calls switch to using EINTR.  Consequently, they and are not
 .\" automatically restarted, and they show the stop/cont behavior
-.\" described below.  (Verified from 2.6.26 source, and by experiment; mtk)
+.\" described below.  (Verified from Linux 2.6.26 source, and by experiment; mtk)
 .BR accept (2),
 .BR connect (2),
 .BR recv (2),
diff --git a/man7/socket.7 b/man7/socket.7
index 2b191c7836..f957e18555 100644
--- a/man7/socket.7
+++ b/man7/socket.7
@@ -814,9 +814,9 @@ indicate a socket as readable only if at least
 bytes are available.
 .TP
 .BR SO_RCVTIMEO " and " SO_SNDTIMEO
-.\" Not implemented in 2.0.
-.\" Implemented in 2.1.11 for getsockopt: always return a zero struct.
-.\" Implemented in 2.3.41 for setsockopt, and actually used.
+.\" Not implemented in Linux 2.0.
+.\" Implemented in Linux 2.1.11 for getsockopt: always return a zero struct.
+.\" Implemented in Linux 2.3.41 for setsockopt, and actually used.
 Specify the receiving or sending timeouts until reporting an error.
 The argument is a
 .IR "struct timeval" .
diff --git a/man7/tcp.7 b/man7/tcp.7
index 2430a084ca..1d8a26818e 100644
--- a/man7/tcp.7
+++ b/man7/tcp.7
@@ -74,7 +74,7 @@
 .\"	    Author: Pavel Emelyanov <xemul@parallels.com>
 .\"
 .\"     TCP_FASTOPEN (3.6)
-.\"         (Fast Open server side implementation completed in 3.7)
+.\"         (Fast Open server side implementation completed in Linux 3.7)
 .\"	    http://lwn.net/Articles/508865/
 .\"
 .\"     TCP_TIMESTAMP (3.9)
@@ -258,9 +258,9 @@ the corresponding option is enabled, and a zero value ("false")
 meaning that the option is disabled.
 .TP
 .IR tcp_abc " (Integer; default: 0; Linux 2.6.15 to Linux 3.8)"
-.\" Since 2.6.15; removed in 3.9
+.\" Since Linux 2.6.15; removed in Linux 3.9
 .\" commit ca2eb5679f8ddffff60156af42595df44a315ef0
-.\" The following is from 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
 Control the Appropriate Byte Count (ABC), defined in RFC 3465.
 ABC is a way of increasing the congestion window
 .RI ( cwnd )
@@ -286,7 +286,7 @@ of two segments to compensate for delayed acknowledgements.
 .RE
 .TP
 .IR tcp_abort_on_overflow " (Boolean; default: disabled; since Linux 2.4)"
-.\" Since 2.3.41
+.\" Since Linux 2.3.41
 Enable resetting connections if the listening service is too
 slow and unable to keep up and accept them.
 It means that if overflow occurred due
@@ -298,7 +298,7 @@ cannot be tuned to accept connections faster.
 Enabling this option can harm the clients of your server.
 .TP
 .IR tcp_adv_win_scale " (integer; default: 2; since Linux 2.4)"
-.\" Since 2.4.0-test7
+.\" Since Linux 2.4.0-test7
 Count buffering overhead as
 .IR "bytes/2^tcp_adv_win_scale" ,
 if
@@ -323,7 +323,7 @@ default value of 2 implies that the space
 used for the application buffer is one fourth that of the total.
 .TP
 .IR tcp_allowed_congestion_control " (String; default: see text; since Linux 2.4.20)"
-.\" The following is from 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
 Show/set the congestion control algorithm choices available to unprivileged
 processes (see the description of the
 .B TCP_CONGESTION
@@ -353,7 +353,7 @@ socket option to obtain optimal behavior
 when they know how/when to uncork their sockets.
 .TP
 .IR tcp_available_congestion_control " (String; read-only; since Linux 2.4.20)"
-.\" The following is from 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
 Show a list of the congestion-control algorithms
 that are registered.
 The items in the list are separated by white space and
@@ -364,7 +364,7 @@ More congestion-control algorithms may be available as modules,
 but not loaded.
 .TP
 .IR tcp_app_win  " (integer; default: 31; since Linux 2.4)"
-.\" Since 2.4.0-test7
+.\" Since Linux 2.4.0-test7
 This variable defines how many
 bytes of the TCP window are reserved for buffering overhead.
 .IP
@@ -372,7 +372,7 @@ A maximum of (\fIwindow/2^tcp_app_win\fP, mss) bytes in the window
 are reserved for the application buffer.
 A value of 0 implies that no amount is reserved.
 .\"
-.\" The following is from 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
 .TP
 .IR tcp_base_mss " (Integer; default: 512; since Linux 2.6.17)"
 The initial value of
@@ -381,9 +381,9 @@ to be used by the packetization layer Path MTU discovery (MTU probing).
 If MTU probing is enabled,
 this is the initial MSS used by the connection.
 .\"
-.\" The following is from 2.6.12: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.12: Documentation/networking/ip-sysctl.txt
 .TP
-.IR tcp_bic " (Boolean; default: disabled; Linux 2.4.27/2.6.6 to 2.6.13)"
+.IR tcp_bic " (Boolean; default: disabled; Linux 2.4.27/2.6.6 to Linux 2.6.13)"
 Enable BIC TCP congestion control algorithm.
 BIC-TCP is a sender-side-only change that ensures a linear RTT
 fairness under large windows while offering both scalability and
@@ -395,21 +395,21 @@ increment ensures linear RTT fairness as well as good scalability.
 Under small congestion windows, binary search
 increase provides TCP friendliness.
 .\"
-.\" The following is from 2.6.12: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.12: Documentation/networking/ip-sysctl.txt
 .TP
-.IR tcp_bic_low_window " (integer; default: 14; Linux 2.4.27/2.6.6 to 2.6.13)"
+.IR tcp_bic_low_window " (integer; default: 14; Linux 2.4.27/2.6.6 to Linux 2.6.13)"
 Set the threshold window (in packets) where BIC TCP starts to
 adjust the congestion window.
 Below this threshold BIC TCP behaves the same as the default TCP Reno.
 .\"
-.\" The following is from 2.6.12: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.12: Documentation/networking/ip-sysctl.txt
 .TP
-.IR tcp_bic_fast_convergence " (Boolean; default: enabled; Linux 2.4.27/2.6.6 to 2.6.13)"
+.IR tcp_bic_fast_convergence " (Boolean; default: enabled; Linux 2.4.27/2.6.6 to Linux 2.6.13)"
 Force BIC TCP to more quickly respond to changes in congestion window.
 Allows two flows sharing the same connection to converge more rapidly.
 .TP
 .IR tcp_congestion_control " (String; default: see text; since Linux 2.4.13)"
-.\" The following is from 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
 Set the default congestion-control algorithm to be used for new connections.
 The algorithm "reno" is always available,
 but additional choices may be available depending on kernel configuration.
@@ -423,7 +423,7 @@ and the kernel was configured with the
 option.
 .TP
 .IR tcp_dsack " (Boolean; default: enabled; since Linux 2.4)"
-.\" Since 2.4.0-test7
+.\" Since Linux 2.4.0-test7
 Enable RFC\ 2883 TCP Duplicate SACK support.
 .TP
 .IR tcp_fastopen " (Bitmask; default: 0x1; since Linux 3.7)"
@@ -454,7 +454,7 @@ Set server side RFC\~7413 Fast Open key to generate Fast Open cookie
 when server side Fast Open support is enabled.
 .TP
 .IR tcp_ecn " (Integer; default: see below; since Linux 2.4)"
-.\" Since 2.4.0-test7
+.\" Since Linux 2.4.0-test7
 Enable RFC\ 3168 Explicit Congestion Notification.
 .IP
 This file can have one of the following values:
@@ -492,21 +492,21 @@ normal SYN retransmission timeout will be resent with CWR and
 ECE cleared.
 .TP
 .IR tcp_fack " (Boolean; default: enabled; since Linux 2.2)"
-.\" Since 2.1.92
+.\" Since Linux 2.1.92
 Enable TCP Forward Acknowledgement support.
 .TP
 .IR tcp_fin_timeout " (integer; default: 60; since Linux 2.2)"
-.\" Since 2.1.53
+.\" Since Linux 2.1.53
 This specifies how many seconds to wait for a final FIN packet before the
 socket is forcibly closed.
 This is strictly a violation of the TCP specification,
 but required to prevent denial-of-service attacks.
 In Linux 2.2, the default value was 180.
 .\"
-.\" The following is from 2.6.12: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.12: Documentation/networking/ip-sysctl.txt
 .TP
 .IR tcp_frto " (integer; default: see below; since Linux 2.4.21/2.6)"
-.\" Since 2.4.21/2.5.43
+.\" Since Linux 2.4.21/2.5.43
 Enable F-RTO, an enhanced recovery algorithm for TCP retransmission
 timeouts (RTOs).
 It is particularly beneficial in wireless environments
@@ -572,17 +572,17 @@ are restored to the values prior to timeout.
 .RE
 .TP
 .IR tcp_keepalive_intvl " (integer; default: 75; since Linux 2.4)"
-.\" Since 2.3.18
+.\" Since Linux 2.3.18
 The number of seconds between TCP keep-alive probes.
 .TP
 .IR tcp_keepalive_probes " (integer; default: 9; since Linux 2.2)"
-.\" Since 2.1.43
+.\" Since Linux 2.1.43
 The maximum number of TCP keep-alive probes to send
 before giving up and killing the connection if
 no response is obtained from the other end.
 .TP
 .IR tcp_keepalive_time " (integer; default: 7200; since Linux 2.2)"
-.\" Since 2.1.43
+.\" Since Linux 2.1.43
 The number of seconds a connection needs to be idle
 before TCP begins sending out keep-alive probes.
 Keep-alives are sent only when the
@@ -596,11 +596,11 @@ of 75 seconds apart) when keep-alive is enabled.
 Note that underlying connection tracking mechanisms and
 application timeouts may be much shorter.
 .\"
-.\" The following is from 2.6.12: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.12: Documentation/networking/ip-sysctl.txt
 .TP
 .IR tcp_low_latency  " (Boolean; default: disabled; since Linux 2.4.21/2.6; \
 obsolete since Linux 4.14)"
-.\" Since 2.4.21/2.5.60
+.\" Since Linux 2.4.21/2.5.60
 If enabled, the TCP stack makes decisions that prefer lower
 latency as opposed to higher throughput.
 It this option is disabled, then higher throughput is preferred.
@@ -611,7 +611,7 @@ Since Linux 4.14,
 this file still exists, but its value is ignored.
 .TP
 .IR tcp_max_orphans  " (integer; default: see below; since Linux 2.4)"
-.\" Since 2.3.41
+.\" Since Linux 2.3.41
 The maximum number of orphaned (not attached to any user file
 handle) TCP sockets allowed in the system.
 When this number is exceeded,
@@ -625,7 +625,7 @@ The default initial value is set equal to the kernel parameter NR_FILE.
 This initial default is adjusted depending on the memory in the system.
 .TP
 .IR tcp_max_syn_backlog " (integer; default: see below; since Linux 2.2)"
-.\" Since 2.1.53
+.\" Since Linux 2.1.53
 The maximum number of queued connection requests which have
 still not received an acknowledgement from the connecting client.
 If this number is exceeded, the kernel will begin
@@ -635,7 +635,7 @@ The default value of 256 is increased to
 greater (>= 128\ MB), and reduced to 128 for those systems with
 very low memory (<= 32\ MB).
 .IP
-Prior to Linux 2.6.20,
+Before Linux 2.6.20,
 .\" commit 72a3effaf633bcae9034b7e176bdbd78d64a71db
 it was recommended that if this needed to be increased above 1024,
 the size of the SYNACK hash table
@@ -657,7 +657,7 @@ In Linux 2.6.20, the fixed sized
 was removed in favor of dynamic sizing.
 .TP
 .IR tcp_max_tw_buckets " (integer; default: see below; since Linux 2.4)"
-.\" Since 2.3.41
+.\" Since Linux 2.3.41
 The maximum number of sockets in TIME_WAIT state allowed in
 the system.
 This limit exists only to prevent simple denial-of-service attacks.
@@ -667,14 +667,14 @@ If this number is
 exceeded, the socket is closed and a warning is printed.
 .TP
 .IR tcp_moderate_rcvbuf " (Boolean; default: enabled; since Linux 2.4.17/2.6.7)"
-.\" The following is from 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
 If enabled, TCP performs receive buffer auto-tuning,
 attempting to automatically size the buffer (no greater than
 .IR tcp_rmem[2] )
 to match the size required by the path for full throughput.
 .TP
 .IR tcp_mem " (since Linux 2.4)"
-.\" Since 2.4.0-test7
+.\" Since Linux 2.4.0-test7
 This is a vector of 3 integers: [low, pressure, high].
 These bounds, measured in units of the system page size,
 are used by TCP to track its memory usage.
@@ -705,7 +705,7 @@ This value overrides any other limits imposed by the kernel.
 .RE
 .TP
 .IR tcp_mtu_probing " (integer; default: 0; since Linux 2.6.17)"
-.\" The following is from 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
 This parameter controls TCP Packetization-Layer Path MTU Discovery.
 The following values may be assigned to the file:
 .RS
@@ -722,7 +722,7 @@ Always enabled, use initial MSS of
 .RE
 .TP
 .IR tcp_no_metrics_save " (Boolean; default: disabled; since Linux 2.6.6)"
-.\" The following is from 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
 By default, TCP saves various connection metrics in the route cache
 when the connection closes, so that connections established in the
 near future can use these to set initial conditions.
@@ -733,12 +733,12 @@ If
 is enabled, TCP will not cache metrics on closing connections.
 .TP
 .IR tcp_orphan_retries " (integer; default: 8; since Linux 2.4)"
-.\" Since 2.3.41
+.\" Since Linux 2.3.41
 The maximum number of attempts made to probe the other
 end of a connection which has been closed by our end.
 .TP
 .IR tcp_reordering " (integer; default: 3; since Linux 2.4)"
-.\" Since 2.4.0-test7
+.\" Since Linux 2.4.0-test7
 The maximum a packet can be reordered in a TCP packet stream
 without TCP assuming packet loss and going into slow start.
 It is not advisable to change this number.
@@ -747,11 +747,11 @@ minimize unnecessary back off and retransmits provoked by
 reordering of packets on a connection.
 .TP
 .IR tcp_retrans_collapse " (Boolean; default: enabled; since Linux 2.2)"
-.\" Since 2.1.96
+.\" Since Linux 2.1.96
 Try to send full-sized packets during retransmit.
 .TP
 .IR tcp_retries1 " (integer; default: 3; since Linux 2.2)"
-.\" Since 2.1.43
+.\" Since Linux 2.1.43
 The number of times TCP will attempt to retransmit a
 packet on an established connection normally,
 without the extra effort of getting the network layers involved.
@@ -761,7 +761,7 @@ update the route if possible before each new retransmit.
 The default is the RFC specified minimum of 3.
 .TP
 .IR tcp_retries2 " (integer; default: 15; since Linux 2.2)"
-.\" Since 2.1.43
+.\" Since Linux 2.1.43
 The maximum number of times a TCP packet is retransmitted
 in established state before giving up.
 The default value is 15, which corresponds to a duration of
@@ -771,7 +771,7 @@ The RFC\ 1122 specified
 minimum limit of 100 seconds is typically deemed too short.
 .TP
 .IR tcp_rfc1337 " (Boolean; default: disabled; since Linux 2.2)"
-.\" Since 2.1.90
+.\" Since Linux 2.1.90
 Enable TCP behavior conformant with RFC\ 1337.
 When disabled,
 if a RST is received in TIME_WAIT state, we close
@@ -779,7 +779,7 @@ the socket immediately without waiting for the end
 of the TIME_WAIT period.
 .TP
 .IR tcp_rmem " (since Linux 2.4)"
-.\" Since 2.4.0-test7
+.\" Since Linux 2.4.0-test7
 This is a vector of 3 integers: [min, default, max].
 These parameters are used by TCP to regulate receive buffer sizes.
 TCP dynamically adjusts the size of the
@@ -836,11 +836,11 @@ lowered to 87380 in low-memory systems).
 .RE
 .TP
 .IR tcp_sack " (Boolean; default: enabled; since Linux 2.2)"
-.\" Since 2.1.36
+.\" Since Linux 2.1.36
 Enable RFC\ 2018 TCP Selective Acknowledgements.
 .TP
 .IR tcp_slow_start_after_idle " (Boolean; default: enabled; since Linux 2.6.18)"
-.\" The following is from 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.28-rc4: Documentation/networking/ip-sysctl.txt
 If enabled, provide RFC 2861 behavior and time out the congestion
 window after an idle period.
 An idle period is defined as the current RTO (retransmission timeout).
@@ -848,7 +848,7 @@ If disabled, the congestion window will not
 be timed out after an idle period.
 .TP
 .IR tcp_stdurg " (Boolean; default: disabled; since Linux 2.2)"
-.\" Since 2.1.44
+.\" Since Linux 2.1.44
 If this option is enabled, then use the RFC\ 1122 interpretation
 of the TCP urgent-pointer field.
 .\" RFC 793 was ambiguous in its specification of the meaning of the
@@ -862,7 +862,7 @@ the urgent pointer points to the first byte after the urgent data.
 Enabling this option may lead to interoperability problems.
 .TP
 .IR tcp_syn_retries  " (integer; default: 6; since Linux 2.2)"
-.\" Since 2.1.38
+.\" Since Linux 2.1.38
 The maximum number of times initial SYNs for an active TCP
 connection attempt will be retransmitted.
 This value should not be higher than 255.
@@ -875,13 +875,13 @@ the default value was 5, which
 corresponded to approximately 180 seconds.
 .TP
 .IR tcp_synack_retries " (integer; default: 5; since Linux 2.2)"
-.\" Since 2.1.38
+.\" Since Linux 2.1.38
 The maximum number of times a SYN/ACK segment
 for a passive TCP connection will be retransmitted.
 This number should not be higher than 255.
 .TP
 .IR tcp_syncookies " (integer; default: 1; since Linux 2.2)"
-.\" Since 2.1.43
+.\" Since Linux 2.1.43
 Enable TCP syncookies.
 The kernel must be compiled with
 .BR CONFIG_SYN_COOKIES .
@@ -915,7 +915,7 @@ This can be useful for network testing.
 .RE
 .TP
 .IR tcp_timestamps " (integer; default: 1; since Linux 2.2)"
-.\" Since 2.1.36
+.\" Since Linux 2.1.36
 Set to one of the following values to enable or disable RFC\ 1323
 TCP timestamps:
 .RS
@@ -941,9 +941,9 @@ can be consumed by a single TCP Segmentation Offload (TSO) frame.
 The setting of this parameter is a tradeoff between burstiness and
 building larger TSO frames.
 .TP
-.IR tcp_tw_recycle " (Boolean; default: disabled; Linux 2.4 to 4.11)"
-.\" Since 2.3.15
-.\" removed in 4.12; commit 4396e46187ca5070219b81773c4e65088dac50cc
+.IR tcp_tw_recycle " (Boolean; default: disabled; Linux 2.4 to Linux 4.11)"
+.\" Since Linux 2.3.15
+.\" removed in Linux 4.12; commit 4396e46187ca5070219b81773c4e65088dac50cc
 Enable fast recycling of TIME_WAIT sockets.
 Enabling this option is
 not recommended as the remote IP may not use monotonically increasing
@@ -951,18 +951,18 @@ timestamps (devices behind NAT, devices with per-connection timestamp
 offsets).
 See RFC 1323 (PAWS) and RFC 6191.
 .\"
-.\" The following is from 2.6.12: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.12: Documentation/networking/ip-sysctl.txt
 .TP
 .IR tcp_tw_reuse " (Boolean; default: disabled; since Linux 2.4.19/2.6)"
-.\" Since 2.4.19/2.5.43
+.\" Since Linux 2.4.19/2.5.43
 Allow to reuse TIME_WAIT sockets for new connections when it is
 safe from protocol viewpoint.
 It should not be changed without advice/request of technical experts.
 .\"
-.\" The following is from 2.6.12: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.12: Documentation/networking/ip-sysctl.txt
 .TP
-.IR tcp_vegas_cong_avoid  " (Boolean; default: disabled; Linux 2.2 to 2.6.13)"
-.\" Since 2.1.8; removed in 2.6.13
+.IR tcp_vegas_cong_avoid  " (Boolean; default: disabled; Linux 2.2 to Linux 2.6.13)"
+.\" Since Linux 2.1.8; removed in Linux 2.6.13
 Enable TCP Vegas congestion avoidance algorithm.
 TCP Vegas is a sender-side-only change to TCP that anticipates
 the onset of congestion by estimating the bandwidth.
@@ -970,9 +970,9 @@ TCP Vegas adjusts the sending rate by modifying the congestion window.
 TCP Vegas should provide less packet loss, but it is
 not as aggressive as TCP Reno.
 .\"
-.\" The following is from 2.6.12: Documentation/networking/ip-sysctl.txt
+.\" The following is from Linux 2.6.12: Documentation/networking/ip-sysctl.txt
 .TP
-.IR tcp_westwood " (Boolean; default: disabled; Linux 2.4.26/2.6.3 to 2.6.13)"
+.IR tcp_westwood " (Boolean; default: disabled; Linux 2.4.26/2.6.3 to Linux 2.6.13)"
 Enable TCP Westwood+ congestion control algorithm.
 TCP Westwood+ is a sender-side-only modification of the TCP Reno
 protocol stack that optimizes the performance of TCP congestion control.
@@ -985,7 +985,7 @@ TCP Westwood+ significantly increases fairness with respect to
 TCP Reno in wired networks and throughput over wireless links.
 .TP
 .IR tcp_window_scaling " (Boolean; default: enabled; since Linux 2.2)"
-.\" Since 2.1.36
+.\" Since Linux 2.1.36
 Enable RFC\ 1323 TCP window scaling.
 This feature allows the use of a large window
 (> 64\ kB) on a TCP connection, should the other end support it.
@@ -999,7 +999,7 @@ is disabled, TCP will not negotiate the use of window
 scaling with the other end during connection setup.
 .TP
 .IR tcp_wmem " (since Linux 2.4)"
-.\" Since 2.4.0-test7
+.\" Since Linux 2.4.0-test7
 This is a vector of 3 integers: [min, default, max].
 These parameters are used by TCP to regulate send buffer sizes.
 TCP dynamically adjusts the size of the send buffer from the
@@ -1096,7 +1096,7 @@ can choose from any of the available congestion-control algorithms
 above).
 .TP
 .BR TCP_CORK " (since Linux 2.2)"
-.\" precisely: since 2.1.127
+.\" precisely: since Linux 2.1.127
 If set, don't send out partial frames.
 All queued partial frames are sent when the option is cleared again.
 This is useful for prepending headers before calling
@@ -1112,7 +1112,7 @@ only since Linux 2.5.71.
 This option should not be used in code intended to be portable.
 .TP
 .BR TCP_DEFER_ACCEPT " (since Linux 2.4)"
-.\" Precisely: since 2.3.38
+.\" Precisely: since Linux 2.3.38
 .\" Useful references:
 .\" http://www.techrepublic.com/article/take-advantage-of-tcp-ip-options-to-optimize-data-transmission/
 .\" http://unix.stackexchange.com/questions/94104/real-world-use-of-tcp-defer-accept
@@ -1129,14 +1129,14 @@ The kernel returns a \fIstruct tcp_info\fP as defined in the file
 This option should not be used in code intended to be portable.
 .TP
 .BR TCP_KEEPCNT " (since Linux 2.4)"
-.\" Precisely: since 2.3.18
+.\" Precisely: since Linux 2.3.18
 The maximum number of keepalive probes TCP should send
 before dropping the connection.
 This option should not be
 used in code intended to be portable.
 .TP
 .BR TCP_KEEPIDLE " (since Linux 2.4)"
-.\" Precisely: since 2.3.18
+.\" Precisely: since Linux 2.3.18
 The time (in seconds) the connection needs to remain idle
 before TCP starts sending keepalive probes, if the socket
 option
@@ -1145,12 +1145,12 @@ has been set on this socket.
 This option should not be used in code intended to be portable.
 .TP
 .BR TCP_KEEPINTVL " (since Linux 2.4)"
-.\" Precisely: since 2.3.18
+.\" Precisely: since Linux 2.3.18
 The time (in seconds) between individual keepalive probes.
 This option should not be used in code intended to be portable.
 .TP
 .BR TCP_LINGER2 " (since Linux 2.4)"
-.\" Precisely: since 2.3.41
+.\" Precisely: since Linux 2.3.41
 The lifetime of orphaned FIN_WAIT2 state sockets.
 This option can be used to override the system-wide setting in the file
 .I /proc/sys/net/ipv4/tcp_fin_timeout
@@ -1204,7 +1204,7 @@ This option should not be used in code intended to be
 portable.
 .TP
 .BR TCP_SYNCNT " (since Linux 2.4)"
-.\" Precisely: since 2.3.18
+.\" Precisely: since Linux 2.3.18
 Set the number of SYN retransmits that TCP should send before
 aborting the attempt to connect.
 It cannot exceed 255.
@@ -1257,7 +1257,7 @@ Further details on the user timeout feature can be found in
 RFC\ 793 and RFC\ 5482 ("TCP User Timeout Option").
 .TP
 .BR TCP_WINDOW_CLAMP " (since Linux 2.4)"
-.\" Precisely: since 2.3.41
+.\" Precisely: since Linux 2.3.41
 Bound the size of the advertised window to this value.
 The kernel imposes a minimum size of SOCK_MIN_RCVBUF/2.
 This option should not be used in code intended to be
@@ -1386,7 +1386,7 @@ It is possible to peek at out-of-band data using the
 .B MSG_PEEK
 flag.
 .PP
-Since version 2.4, Linux supports the use of
+Since Linux 2.4, Linux supports the use of
 .B MSG_TRUNC
 in the
 .I flags
@@ -1522,9 +1522,9 @@ or the generic socket layer may also be returned for TCP.
 Support for Explicit Congestion Notification, zero-copy
 .BR sendfile (2),
 reordering support and some SACK extensions
-(DSACK) were introduced in 2.4.
+(DSACK) were introduced in Linux 2.4.
 Support for forward acknowledgement (FACK), TIME_WAIT recycling,
-and per-connection keepalive socket options were introduced in 2.3.
+and per-connection keepalive socket options were introduced in Linux 2.3.
 .SH BUGS
 Not all errors are documented.
 .PP
diff --git a/man7/time.7 b/man7/time.7
index 358bc7f9e5..c10e0a0873 100644
--- a/man7/time.7
+++ b/man7/time.7
@@ -67,10 +67,10 @@ on kernels up to and including 2.4.x, HZ was 100,
 giving a jiffy value of 0.01 seconds;
 starting with 2.6.0, HZ was raised to 1000, giving a jiffy of
 0.001 seconds.
-Since kernel 2.6.13, the HZ value is a kernel
+Since Linux 2.6.13, the HZ value is a kernel
 configuration parameter and can be 100, 250 (the default) or 1000,
 yielding a jiffies value of, respectively, 0.01, 0.004, or 0.001 seconds.
-Since kernel 2.6.20, a further frequency is available:
+Since Linux 2.6.20, a further frequency is available:
 300, a number that divides evenly for the common video
 frame rates (PAL, 25 Hz; NTSC, 30 Hz).
 .PP
diff --git a/man7/udp.7 b/man7/udp.7
index 130d16c949..5822bc551f 100644
--- a/man7/udp.7
+++ b/man7/udp.7
@@ -198,7 +198,7 @@ is accumulated into a single datagram that is transmitted when
 the option is disabled.
 This option should not be used in code intended to be
 portable.
-.\" FIXME document UDP_ENCAP (new in kernel 2.5.67)
+.\" FIXME document UDP_ENCAP (new in Linux 2.5.67)
 .\" From include/linux/udp.h:
 .\"     UDP_ENCAP_ESPINUDP_NON_IKE draft-ietf-ipsec-nat-t-ike-00/01
 .\"     UDP_ENCAP_ESPINUDP draft-ietf-ipsec-udp-encaps-06
diff --git a/man7/unix.7 b/man7/unix.7
index f11a70ebc2..b290117fcc 100644
--- a/man7/unix.7
+++ b/man7/unix.7
@@ -519,9 +519,8 @@ to fail with the error
 .BR EINVAL .
 .B SCM_MAX_FD
 has the value 253
-(or 255 in kernels
 .\" commit bba14de98753cb6599a2dae0e520714b2153522d
-before 2.6.38).
+(or 255 before Linux 2.6.38).
 .TP
 .B SCM_CREDENTIALS
 Send or receive UNIX credentials.
diff --git a/man7/user_namespaces.7 b/man7/user_namespaces.7
index fff6e2caab..b08e6a8f7d 100644
--- a/man7/user_namespaces.7
+++ b/man7/user_namespaces.7
@@ -47,7 +47,7 @@ with the
 .B CLONE_NEWUSER
 flag.
 .PP
-The kernel imposes (since version 3.11) a limit of 32 nested levels of
+The kernel imposes (since Linux 3.11) a limit of 32 nested levels of
 .\" commit 8742f229b635bf1c1c84a3dfe5e47c814c20b5c8
 user namespaces.
 .\" FIXME Explain the rationale for this limit. (What is the rationale?)
diff --git a/man7/vdso.7 b/man7/vdso.7
index 20e4bc063b..8f69f191ae 100644
--- a/man7/vdso.7
+++ b/man7/vdso.7
@@ -394,7 +394,7 @@ __kernel_sync_dicache_p5	LINUX_2.6.15
 .ft P
 \}
 .PP
-In kernel versions before Linux 5.6,
+Before Linux 5.6,
 .\" commit 654abc69ef2e69712e6d4e8a6cb9292b97a4aa39
 the
 .B CLOCK_REALTIME_COARSE
@@ -434,7 +434,7 @@ __kernel_sync_dicache_p5	LINUX_2.6.15
 .ft P
 \}
 .PP
-In kernel versions before Linux 4.16,
+Before Linux 4.16,
 .\" commit 5c929885f1bb4b77f85b1769c49405a0e0f154a1
 the
 .B CLOCK_REALTIME_COARSE