aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kerrisk <mtk.manpages@gmail.com>2014-01-18 23:58:39 +1300
committerMichael Kerrisk <mtk.manpages@gmail.com>2014-01-18 23:58:39 +1300
commitf78ed33a652edc0be422a8dbd9a16d17656d4691 (patch)
treed19b7ed5e51d35884ef63c608d87dbeca6087645
parent14d707135923a56f53979a90ddc278a13f482cb7 (diff)
downloadman-pages-f78ed33a652edc0be422a8dbd9a16d17656d4691.tar.gz
madvise.2, perf_event_open.2, query_module.2, stat.2, sem_init.3, hpsa.4, rtc.4, st.4, elf.5, filesystems.5, proc.5, environ.7, man-pages.7, regex.7, units.7: Reword to avoid use of "etc."
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
-rw-r--r--man2/madvise.23
-rw-r--r--man2/perf_event_open.22
-rw-r--r--man2/query_module.22
-rw-r--r--man2/stat.22
-rw-r--r--man3/sem_init.32
-rw-r--r--man4/hpsa.42
-rw-r--r--man4/rtc.42
-rw-r--r--man4/st.42
-rw-r--r--man5/elf.52
-rw-r--r--man5/filesystems.54
-rw-r--r--man5/proc.510
-rw-r--r--man7/environ.74
-rw-r--r--man7/man-pages.72
-rw-r--r--man7/regex.73
-rw-r--r--man7/units.72
15 files changed, 23 insertions, 21 deletions
diff --git a/man2/madvise.2 b/man2/madvise.2
index 780168e99c..c2ba0be724 100644
--- a/man2/madvise.2
+++ b/man2/madvise.2
@@ -329,7 +329,8 @@ POSIX.1-2001 describes
.\" FIXME . Write a posix_madvise(3) page.
with constants
.BR POSIX_MADV_NORMAL ,
-etc.,
+.BR POSIX_MADV_RANDOM ,
+and so on,
with a behavior close to that described here.
There is a similar
.BR posix_fadvise (2)
diff --git a/man2/perf_event_open.2 b/man2/perf_event_open.2
index 8d61cf35ab..11692edea9 100644
--- a/man2/perf_event_open.2
+++ b/man2/perf_event_open.2
@@ -124,7 +124,7 @@ An event group is scheduled onto the CPU as a unit: it will
be put onto the CPU only if all of the events in the group can be put onto
the CPU.
This means that the values of the member events can be
-meaningfully compared, added, divided (to get ratios), etc., with each
+meaningfully compared, added, divided (to get ratios), and so on, with each
other, since they have counted events for the same set of executed
instructions.
.P
diff --git a/man2/query_module.2 b/man2/query_module.2
index 8481c5a901..17d4e4f721 100644
--- a/man2/query_module.2
+++ b/man2/query_module.2
@@ -119,7 +119,7 @@ is the size of the module in bytes, and
is a mask of
.BR MOD_RUNNING ,
.BR MOD_AUTOCLEAN ,
-etc., that indicates the current status of the module
+and so on, that indicates the current status of the module
(see the Linux kernel source file
.IR include/linux/module.h ).
.I ret
diff --git a/man2/stat.2 b/man2/stat.2
index f6dfeb898e..aa55c85a68 100644
--- a/man2/stat.2
+++ b/man2/stat.2
@@ -424,7 +424,7 @@ POSIX.1-1990 did not describe the
constants, but instead demanded the use of
the macros
.BR S_ISDIR (),
-etc.
+and so on.
The
.BR S_IF*
constants are present in POSIX.1-2001 and later.
diff --git a/man3/sem_init.3 b/man3/sem_init.3
index 35b64cb66a..d7f55cd6df 100644
--- a/man3/sem_init.3
+++ b/man3/sem_init.3
@@ -70,7 +70,7 @@ Any process that can access the shared memory region
can operate on the semaphore using
.BR sem_post (3),
.BR sem_wait (3),
-etc.
+and so on.
Initializing a semaphore that has already been initialized
results in undefined behavior.
diff --git a/man4/hpsa.4 b/man4/hpsa.4
index 3aa2730bea..d33d33ab06 100644
--- a/man4/hpsa.4
+++ b/man4/hpsa.4
@@ -169,7 +169,7 @@ Returns driver version in three bytes encoded as:
.BR CCISS_PASSTHRU ", " CCISS_BIG_PASSTHRU
Allows "BMIC" and "CISS" commands to be passed through to the Smart Array.
These are used extensively by the HP Array Configuration Utility,
-SNMP storage agents, etc.
+SNMP storage agents, and so on.
See
.I cciss_vol_status
at
diff --git a/man4/rtc.4 b/man4/rtc.4
index 2bca01d2e5..9f05647140 100644
--- a/man4/rtc.4
+++ b/man4/rtc.4
@@ -58,7 +58,7 @@ a software clock maintained by the kernel and used to implement
.BR gettimeofday (2)
and
.BR time (2),
-as well as setting timestamps on files, etc.
+as well as setting timestamps on files, and so on.
The system clock reports seconds and microseconds since a start point,
defined to be the POSIX Epoch: 1970-01-01 00:00:00 +0000 (UTC).
(One common implementation counts timer interrupts, once
diff --git a/man4/st.4 b/man4/st.4
index c94c16c2cd..bab276d5cd 100644
--- a/man4/st.4
+++ b/man4/st.4
@@ -211,7 +211,7 @@ is used.
The reasons for not using direct transfers include improper alignment
of the user buffer (default is 512 bytes but this can be changed by the HBA
driver), one or more pages of the user buffer not reachable by the
-SCSI adapter, etc.
+SCSI adapter, and so on.
.PP
A filemark is automatically written to tape if the last tape operation
before close was a write.
diff --git a/man5/elf.5 b/man5/elf.5
index 7fed2167fb..c36c3ad192 100644
--- a/man5/elf.5
+++ b/man5/elf.5
@@ -130,7 +130,7 @@ All data structures that the file format defines follow the
size and alignment guidelines for the relevant class.
If necessary,
data structures contain explicit padding to ensure 4-byte alignment
-for 4-byte objects, to force structure sizes to a multiple of 4, etc.
+for 4-byte objects, to force structure sizes to a multiple of 4, and so on.
.PP
The ELF header is described by the type
.I Elf32_Ehdr
diff --git a/man5/filesystems.5 b/man5/filesystems.5
index 2b5081c21b..34d2aa1659 100644
--- a/man5/filesystems.5
+++ b/man5/filesystems.5
@@ -53,8 +53,8 @@ Below a short description of a few of the available filesystems.
.B "minix"
is the filesystem used in the Minix operating system, the first to run
under Linux.
-It has a number of shortcomings: a 64MB partition size
-limit, short filenames, a single timestamp, etc.
+It has a number of shortcomings, including a 64MB partition size
+limit, short filenames, and a single timestamp.
It remains useful for floppies and RAM disks.
.TP
.B ext
diff --git a/man5/proc.5 b/man5/proc.5
index 457b0951a5..296cf36a9e 100644
--- a/man5/proc.5
+++ b/man5/proc.5
@@ -224,7 +224,7 @@ option can be used to locate the file.
This is a subdirectory containing one entry for each file which the
process has open, named by its file descriptor, and which is a
symbolic link to the actual file.
-Thus, 0 is standard input, 1 standard output, 2 standard error, etc.
+Thus, 0 is standard input, 1 standard output, 2 standard error, and so on.
For file descriptors for pipes and sockets,
the entries will be symbolic links whose content is the
@@ -1524,9 +1524,9 @@ file that resulted when configuring the kernel (using
.IR "make config" ,
or similar).
The file contents are compressed; view or search them using
-.BR zcat (1),
-.BR zgrep (1),
-etc.
+.BR zcat (1)
+and
+.BR zgrep (1).
As long as no changes have been made to the following file,
the contents of
.I /proc/config.gz
@@ -2243,7 +2243,7 @@ Every host-file is named after the number the host was assigned during
initialization.
Reading these files will usually show driver and host configuration,
-statistics, etc.
+statistics, and so on.
Writing to these files allows different things on different hosts.
For example, with the \fIlatency\fP and \fInolatency\fP commands,
diff --git a/man7/environ.7 b/man7/environ.7
index 2864b046d1..75587e16c6 100644
--- a/man7/environ.7
+++ b/man7/environ.7
@@ -159,9 +159,9 @@ and
.B TMPDIR
influences the path prefix of names created by
.BR tmpnam (3)
-and other routines, the temporary directory used by
+and other routines, and the temporary directory used by
.BR sort (1)
-and other programs, etc.
+and other programs.
.LP
.BR LD_LIBRARY_PATH ", " LD_PRELOAD
and other LD_* variables influence
diff --git a/man7/man-pages.7 b/man7/man-pages.7
index 7bd812a473..3f74ea2694 100644
--- a/man7/man-pages.7
+++ b/man7/man-pages.7
@@ -588,7 +588,7 @@ Foe example:
.SS Unicode under Linux
-.SS Indentation of structure definitions, shell session logs, etc.
+.SS Indentation of structure definitions, shell session logs, and so on
When structure definitions, shell session logs, and so on are included
in running text, indent them by 4 spaces (i.e., a block enclosed by
.I ".in\ +4n"
diff --git a/man7/regex.7 b/man7/regex.7
index c54539d81b..a2a0c5c7d5 100644
--- a/man7/regex.7
+++ b/man7/regex.7
@@ -57,7 +57,8 @@ separated by \(aq|\(aq.
It matches anything that matches one of the branches.
.PP
A branch is one\*(dg or more \fIpieces\fR, concatenated.
-It matches a match for the first, followed by a match for the second, etc.
+It matches a match for the first, followed by a match for the second,
+and so on.
.PP
A piece is an \fIatom\fR possibly followed
by a single\*(dg \(aq*\(aq, \(aq+\(aq, \(aq?\(aq, or \fIbound\fR.
diff --git a/man7/units.7 b/man7/units.7
index 127cd04834..d11c24be85 100644
--- a/man7/units.7
+++ b/man7/units.7
@@ -109,7 +109,7 @@ standard, namely k=1000, M=1000k, G=1000M.
The situation was messy: in the 14k4 modems, k=1000; in the 1.44MB
.\" also common: 14.4k modem
-diskettes, M=1024000; etc.
+diskettes, M=1024000; and so on.
In 1998 the IEC approved the standard
that defines the binary prefixes given above, enabling people
to be precise and unambiguous.