From 88879aebdd952edd138b118249a585b0cb33d6ea Mon Sep 17 00:00:00 2001 From: Michael Kerrisk Date: Wed, 1 Jan 2014 16:15:14 +1300 Subject: [PATCH] eventfd.2, set_mempolicy.2, timerfd_create.2, fwide.3, resolver.3, spufs.7, symlink.7, udplite.7, unicode.7: Replace uses of "i.e.," in main text with "that is" or similar Usual man-pages style is to use "i.e." only within parenthetical expressions. Signed-off-by: Michael Kerrisk --- man2/eventfd.2 | 4 ++-- man2/set_mempolicy.2 | 4 ++-- man2/timerfd_create.2 | 4 ++-- man3/fwide.3 | 4 ++-- man3/resolver.3 | 2 +- man7/spufs.7 | 2 +- man7/symlink.7 | 2 +- man7/udplite.7 | 4 ++-- man7/unicode.7 | 5 +++-- 9 files changed, 16 insertions(+), 15 deletions(-) diff --git a/man2/eventfd.2 b/man2/eventfd.2 index 287519fd9..e4fb6399c 100644 --- a/man2/eventfd.2 +++ b/man2/eventfd.2 @@ -86,8 +86,8 @@ if the size of the supplied buffer is less than 8 bytes. .IP The value returned by .BR read (2) -is in host byte order, -i.e., the native byte order for integers on the host machine. +is in host byte order\(emthat is, +the native byte order for integers on the host machine. .IP The semantics of .BR read (2) diff --git a/man2/set_mempolicy.2 b/man2/set_mempolicy.2 index 48c31f4ed..4dd9c9e32 100644 --- a/man2/set_mempolicy.2 +++ b/man2/set_mempolicy.2 @@ -156,8 +156,8 @@ The .B MPOL_DEFAULT mode specifies that any nondefault process memory policy be removed, so that the memory policy "falls back" to the system default policy. -The system default policy is "local allocation"-- -i.e., allocate memory on the node of the CPU that triggered the allocation. +The system default policy is "local allocation"\(emthat is, +allocate memory on the node of the CPU that triggered the allocation. .I nodemask must be specified as NULL. If the "local node" contains no free memory, the system will diff --git a/man2/timerfd_create.2 b/man2/timerfd_create.2 index a88748de8..c4293ad1c 100644 --- a/man2/timerfd_create.2 +++ b/man2/timerfd_create.2 @@ -220,8 +220,8 @@ then the buffer given to returns an unsigned 8-byte integer .RI ( uint64_t ) containing the number of expirations that have occurred. -(The returned value is in host byte order, -i.e., the native byte order for integers on the host machine.) +(The returned value is in host byte order\(emthat is, +the native byte order for integers on the host machine.) .IP If no timer expirations have occurred at the time of the .BR read (2), diff --git a/man3/fwide.3 b/man3/fwide.3 index e7bc9f5b2..5d6b97051 100644 --- a/man3/fwide.3 +++ b/man3/fwide.3 @@ -49,8 +49,8 @@ orientation of \fIstream\fP. It returns a positive value if \fIstream\fP is wide-character oriented, that is, if wide-character I/O is permitted but char I/O is disallowed. -It returns a negative value if \fIstream\fP is byte oriented, -i.e., if char I/O is permitted but wide-character I/O is disallowed. +It returns a negative value if \fIstream\fP is byte oriented\(emthat is, +if char I/O is permitted but wide-character I/O is disallowed. It returns zero if \fIstream\fP has no orientation yet; in this case the next I/O operation might change the orientation (to byte oriented if it is a char diff --git a/man3/resolver.3 b/man3/resolver.3 index e65a225b3..a3fd2e853 100644 --- a/man3/resolver.3 +++ b/man3/resolver.3 @@ -222,7 +222,7 @@ by the domain name server, not by If set, .BR res_search () will append the default domain name to -single component names, i.e., those that do not contain a dot. +single component names\(emthat is, those that do not contain a dot. [Enabled by default]. .TP .B RES_STAYOPEN diff --git a/man7/spufs.7 b/man7/spufs.7 index 037c55885..c8384a012 100644 --- a/man7/spufs.7 +++ b/man7/spufs.7 @@ -303,7 +303,7 @@ whenever space is available for writing. .TP .IR /mbox_stat ", " /ibox_stat ", " /wbox_stat These are read-only files that contain the length of the current -queue of each mailbox, i.e., how many words can be read from +queue of each mailbox\(emthat is, how many words can be read from .IR mbox " or " ibox or how many words can be written to .I wbox diff --git a/man7/symlink.7 b/man7/symlink.7 index 236b88bff..18948b3a0 100644 --- a/man7/symlink.7 +++ b/man7/symlink.7 @@ -262,7 +262,7 @@ The command is also an exception to this rule. For compatibility with historic systems (when .BR ls (1) -is not doing a tree walk, i.e., the +is not doing a tree walk\(emthat is, .I \-R option is not specified), the diff --git a/man7/udplite.7 b/man7/udplite.7 index 5c89c593b..b951c104b 100644 --- a/man7/udplite.7 +++ b/man7/udplite.7 @@ -52,8 +52,8 @@ If this option is not set, the only difference to UDP is in using a different IP protocol identifier (IANA number 136). The UDP-Lite implementation is a full extension of -.BR udp (7), -i.e., it shares the same API and API behaviour, and in addition +.BR udp (7)\(emthat +is, it shares the same API and API behaviour, and in addition offers two socket options to control the checksum coverage. .SS Address format UDP-Litev4 uses the diff --git a/man7/unicode.7 b/man7/unicode.7 index f143e9d86..a9d1d4df6 100644 --- a/man7/unicode.7 +++ b/man7/unicode.7 @@ -36,8 +36,9 @@ defines the .BR "Universal Character Set (UCS)" . UCS contains all characters of all other character set standards. It also guarantees -.BR "round-trip compatibility" , -i.e., conversion tables can be built such that no information is lost +.BR "round-trip compatibility"; +in other words, +conversion tables can be built such that no information is lost when a string is converted from any other encoding to UCS and back. UCS contains the characters required to represent practically all