diff --git a/man2/cacheflush.2 b/man2/cacheflush.2
index 892e1d040..3df44e1a3 100644
--- a/man2/cacheflush.2
+++ b/man2/cacheflush.2
@@ -74,7 +74,7 @@ or
 .SH CONFORMING TO
 This Linux-specific system call is only available on MIPS based systems.
 .\" FIXME This system call was only on MIPS back in 1.2 days, but
-.\" by now it is on a number of other architectures (but not x86).
+.\" by now it is on a number of other architectures (but not i386).
 .\" Investigate the details and update this page.
 It should not be used in programs intended to be portable.
 .\" Irix 6.5 appears to have a cacheflush() syscall -- mtk
diff --git a/man2/clone.2 b/man2/clone.2
index f374e0d57..0e628d30a 100644
--- a/man2/clone.2
+++ b/man2/clone.2
@@ -668,7 +668,7 @@ together with
 disappeared.
 This flag is still defined, but has no effect.
 
-On x86,
+On i386,
 .BR clone ()
 should not be called through vsyscall, but directly through
 .IR "int $0x80" .
diff --git a/man2/fcntl.2 b/man2/fcntl.2
index 4ae388056..e2e3bdef5 100644
--- a/man2/fcntl.2
+++ b/man2/fcntl.2
@@ -998,7 +998,7 @@ alone is not going to be very useful if the process holding the lock
 may live on a different machine.
 .SH BUGS
 A limitation of the Linux system call conventions on some
-architectures (notably x86) means that if a (negative)
+architectures (notably i386) means that if a (negative)
 process group ID to be returned by
 .B F_GETOWN
 falls in the range \-1 to \-4095, then the return value is wrongly
@@ -1012,7 +1012,7 @@ will contain the (positive) process group ID.
 .\" mtk, Dec 04: some limited testing on alpha and ia64 seems to
 .\" indicate that ANY negative PGID value will cause F_GETOWN
 .\" to misinterpret the return as an error. Some other architectures
-.\" seem to have the same range check as x86.
+.\" seem to have the same range check as i386.
 
 In Linux 2.4 and earlier, there is bug that can occur
 when an unprivileged process uses
diff --git a/man2/getitimer.2 b/man2/getitimer.2
index 0a371dd5b..ec88ee67e 100644
--- a/man2/getitimer.2
+++ b/man2/getitimer.2
@@ -160,12 +160,12 @@ representation exceeds
 (defined in
 .IR include/linux/jiffies.h ),
 then the timer is silently truncated to this ceiling value.
-On Linux/x86 (where, since kernel 2.6.13,
+On Linux/i386 (where, since kernel 2.6.13,
 the default jiffy is 0.004 seconds),
 this means that the ceiling value for a timer is
 approximately 99.42 days.
 
-On certain systems (including x86),
+On certain systems (including i386),
 Linux kernels before version 2.6.12 have a bug which will produce
 premature timer expirations of up to one jiffy under some circumstances.
 This bug is fixed in kernel 2.6.12.
diff --git a/man2/getrlimit.2 b/man2/getrlimit.2
index dc843d252..84c79d569 100644
--- a/man2/getrlimit.2
+++ b/man2/getrlimit.2
@@ -250,7 +250,7 @@ structure specified as the fourth argument to
 
 The first addend in the formula, which includes
 .I "sizeof(struct msg_msg *)"
-(4 bytes on Linux/x86), ensures that the user cannot
+(4 bytes on Linux/i386), ensures that the user cannot
 create an unlimited number of zero-length messages (such messages
 nevertheless each consume some system memory for bookkeeping overhead).
 .TP
diff --git a/man2/mmap.2 b/man2/mmap.2
index df575ffad..cc2e54ebf 100644
--- a/man2/mmap.2
+++ b/man2/mmap.2
@@ -458,7 +458,7 @@ wrapper function invokes
 with a suitably adjusted value for
 .IR offset .
 
-On some hardware architectures (e.g., x86),
+On some hardware architectures (e.g., i386),
 .B PROT_WRITE
 implies
 .BR PROT_READ .
diff --git a/man2/mprotect.2 b/man2/mprotect.2
index 8b82e3de9..c1d175ff5 100644
--- a/man2/mprotect.2
+++ b/man2/mprotect.2
@@ -124,7 +124,7 @@ Whether
 has any effect different from
 .B PROT_READ
 is architecture and kernel version dependent.
-On some hardware architectures (e.g., x86),
+On some hardware architectures (e.g., i386),
 .B PROT_WRITE
 implies
 .BR PROT_READ .
diff --git a/man2/times.2 b/man2/times.2
index 2a6f3114a..012b5958d 100644
--- a/man2/times.2
+++ b/man2/times.2
@@ -188,7 +188,7 @@ for the struct members, because it had no type
 yet.
 .SH BUGS
 A limitation of the Linux system call conventions on some architectures
-(notably x86) means that on Linux 2.6 there is a small time window
+(notably i386) means that on Linux 2.6 there is a small time window
 (41 seconds) soon after boot when
 .BR times (2)
 can return \-1, falsely indicating that an error occurred.
diff --git a/man3/adjtime.3 b/man3/adjtime.3
index 3915aa9cc..04af65c68 100644
--- a/man3/adjtime.3
+++ b/man3/adjtime.3
@@ -116,7 +116,7 @@ In the glibc implementation,
 .I delta
 must be less than or equal to (INT_MAX / 1000000 \- 2)
 and greater than or equal to (INT_MIN / 1000000 + 2)
-(respectively 2145 and \-2145 seconds on x86).
+(respectively 2145 and \-2145 seconds on i386).
 .SH BUGS
 Currently, if
 .I delta
diff --git a/man3/byteorder.3 b/man3/byteorder.3
index 3cb4c4cea..c9776ea4c 100644
--- a/man3/byteorder.3
+++ b/man3/byteorder.3
@@ -64,7 +64,7 @@ The
 function converts the unsigned short integer \fInetshort\fP
 from network byte order to host byte order.
 .PP
-On the i80x86 the host byte order is Least Significant Byte first,
+On the i386 the host byte order is Least Significant Byte first,
 whereas the network byte order, as used on the Internet, is Most
 Significant Byte first.
 .SH "CONFORMING TO"
diff --git a/man3/inet.3 b/man3/inet.3
index 63643c047..ff3ee52eb 100644
--- a/man3/inet.3
+++ b/man3/inet.3
@@ -147,7 +147,7 @@ struct in_addr {
 .fi
 .in
 .PP
-Note that on the i80x86 the host byte order is Least Significant Byte
+Note that on the i386 the host byte order is Least Significant Byte
 first (little endian), whereas the network byte order, as used on the
 Internet, is Most Significant Byte first (big endian).
 .SH "CONFORMING TO"
diff --git a/man3/offsetof.3 b/man3/offsetof.3
index 24fb3efa2..8b0a89022 100644
--- a/man3/offsetof.3
+++ b/man3/offsetof.3
@@ -55,7 +55,7 @@ given type, in units of bytes.
 .SH "CONFORMING TO"
 C89, C99, POSIX.1-2001.
 .SH EXAMPLE
-On a Linux/x86 system, when compiled using the default
+On a Linux/i386 system, when compiled using the default
 .BR gcc (1)
 options, the program below produces the following output:
 .nf
diff --git a/man4/rtc.4 b/man4/rtc.4
index c253c9b90..43c6d9076 100644
--- a/man4/rtc.4
+++ b/man4/rtc.4
@@ -43,7 +43,7 @@ One of these usually has battery backup power so that it tracks the time
 even while the computer is turned off.
 RTCs often provide alarms and other interrupts.
 
-All x86 PCs, and ACPI based systems, have an RTC that is compatible with
+All i386 PCs, and ACPI based systems, have an RTC that is compatible with
 the Motorola MC146818 chip on the original PC/AT.
 Today such an RTC is usually integrated into the mainboard's chipset
 (south bridge), and uses a replaceable coin-sized backup battery.
diff --git a/man7/icmp.7 b/man7/icmp.7
index dbbcfa0c2..57ae4e086 100644
--- a/man7/icmp.7
+++ b/man7/icmp.7
@@ -45,7 +45,7 @@ Linux 2.2 uses a token bucket filter to limit ICMPs.
 .\" FIXME better description needed
 The value is the timeout in jiffies until the token bucket filter is
 cleared after a burst.
-A jiffy is a system dependent unit, usually 10ms on x86 and
+A jiffy is a system dependent unit, usually 10ms on i386 and
 about 1ms on alpha and ia64.
 .TP
 .B icmp_destunreach_rate
diff --git a/man7/pipe.7 b/man7/pipe.7
index 923f19123..716297300 100644
--- a/man7/pipe.7
+++ b/man7/pipe.7
@@ -128,7 +128,7 @@ as soon as it is available,
 so that a writing process does not remain blocked.
 
 In Linux versions before 2.6.11, the capacity of a pipe was the same as
-the system page size (e.g., 4096 bytes on x86).
+the system page size (e.g., 4096 bytes on i386).
 Since Linux 2.6.11, the pipe capacity is 65536 bytes.
 .SS PIPE_BUF
 POSIX.1-2001 says that
diff --git a/man7/time.7 b/man7/time.7
index 774e8b32b..9401ed170 100644
--- a/man7/time.7
+++ b/man7/time.7
@@ -66,7 +66,7 @@ The size of a jiffy is determined by the value of the kernel constant
 The value of
 .I HZ
 varies across kernel versions and hardware platforms.
-On x86 the situation is as follows:
+On i386 the situation is as follows:
 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