summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kerrisk2016-12-04 20:51:32 +0100
committerKarel Zak2016-12-09 13:45:09 +0100
commita72fa61a7781a576cbb24673dacf23fb8306471b (patch)
tree881b80da7e8996a9674302f5ace8e556af42c6e9
parentdocs: various pages: Use "PID" not "pid" in man-pages (diff)
downloadkernel-qcow2-util-linux-a72fa61a7781a576cbb24673dacf23fb8306471b.tar.gz
kernel-qcow2-util-linux-a72fa61a7781a576cbb24673dacf23fb8306471b.tar.xz
kernel-qcow2-util-linux-a72fa61a7781a576cbb24673dacf23fb8306471b.zip
docs: various pages: Use 'UID" and "GID", not "uid" and "gid" in man pages
Signed-off-by: Michael Kerrisk <mtk.man-pages@gmail.com>
-rw-r--r--misc-utils/kill.12
-rw-r--r--sys-utils/mount.816
-rw-r--r--sys-utils/setpriv.14
-rw-r--r--term-utils/wall.12
4 files changed, 12 insertions, 12 deletions
diff --git a/misc-utils/kill.1 b/misc-utils/kill.1
index 8cc31cd5e..a0aca8bf1 100644
--- a/misc-utils/kill.1
+++ b/misc-utils/kill.1
@@ -94,7 +94,7 @@ numbers.
.TP
\fB\-a\fR, \fB\-\-all\fR
Do not restrict the command-name-to-PID conversion to processes with the same
-uid as the present process.
+UID as the present process.
.TP
\fB\-p\fR, \fB\-\-pid\fR
Only print the process ID (PID) of the named processes, do not send any
diff --git a/sys-utils/mount.8 b/sys-utils/mount.8
index 5927963db..22e250a8d 100644
--- a/sys-utils/mount.8
+++ b/sys-utils/mount.8
@@ -1198,7 +1198,7 @@ but with option
.B uid
or
.B gid
-without specified value, the uid and gid of the current process are taken).
+without specified value, the UID and GID of the current process are taken).
.TP
\fBsetuid=\fP\,\fIvalue\fP and \fBsetgid=\fP\,\fIvalue\fP
Set the owner and group of all files.
@@ -1214,7 +1214,7 @@ The value is given in octal.
Do not allow any changes to the protection bits on the filesystem.
.TP
.B usemp
-Set uid and gid of the root of the filesystem to the uid and gid
+Set UID and GID of the root of the filesystem to the UID and GID
of the mount point upon the first sync or umount, and then
clear this option. Strange...
.TP
@@ -1599,7 +1599,7 @@ When
.B grpid
is set, it takes the group ID of the directory in which it is created;
otherwise (the default) it takes the fsgid of the current process, unless
-the directory has the set-group-ID bit set, in which case it takes the gid
+the directory has the set-group-ID bit set, in which case it takes the GID
from the parent directory, and also gets the set-group-ID bit set
if it is a directory itself.
.TP
@@ -1622,7 +1622,7 @@ space (by default 5%, see
and
.BR tune2fs (8)).
These options determine who can use the reserved blocks.
-(Roughly: whoever has the specified uid, or belongs to the specified group.)
+(Roughly: whoever has the specified UID, or belongs to the specified group.)
.TP
.BI sb= n
Instead of block 1, use block
@@ -1901,7 +1901,7 @@ Set blocksize (default 512). This option is obsolete.
.TP
\fBuid=\fP\,\fIvalue\fP and \fBgid=\fP\,\fIvalue\fP
Set the owner and group of all files.
-(Default: the uid and gid of the current process.)
+(Default: the UID and GID of the current process.)
.TP
.BI umask= value
Set the umask (the bitmask of the permissions that are
@@ -1938,7 +1938,7 @@ is also allowed. I.e.\& \s+3~\s0dmask & 022)
Normally
.BR utime (2)
checks current process is owner of the file, or it has
-CAP_FOWNER capability. But FAT filesystem doesn't have uid/gid on disk, so
+CAP_FOWNER capability. But FAT filesystem doesn't have UID/GID on disk, so
normal check is too inflexible. With this option you can relax it.
.RE
.TP
@@ -2130,7 +2130,7 @@ used for creating new files. Default values: '????'.
.TP
.BI uid= n ", gid=" n
Set the owner and group of all files.
-(Default: the uid and gid of the current process.)
+(Default: the UID and GID of the current process.)
.TP
.BI dir_umask= n ", file_umask=" n ", umask=" n
Set the umask used for all directories, all regular files, or all
@@ -2152,7 +2152,7 @@ Don't complain about invalid mount options.
.SS "Mount options for hpfs"
.TP
\fBuid=\fP\,\fIvalue\fP and \fBgid=\fP\,\fIvalue\fP
-Set the owner and group of all files. (Default: the uid and gid
+Set the owner and group of all files. (Default: the UID and GID
of the current process.)
.TP
.BI umask= value
diff --git a/sys-utils/setpriv.1 b/sys-utils/setpriv.1
index 23c147685..c65c402d7 100644
--- a/sys-utils/setpriv.1
+++ b/sys-utils/setpriv.1
@@ -74,7 +74,7 @@ in the Linux kernel source.
The no_new_privs bit is supported since Linux 3.5.
.TP
.BI \-\-rgid " gid\fR, " \-\-egid " gid\fR, " \-\-regid " gid"
-Set the real, effective, or both gids. The \fIgid\fR argument can be
+Set the real, effective, or both GIDs. The \fIgid\fR argument can be
given as textual group name.
.sp
For safety, you must specify one of
@@ -85,7 +85,7 @@ if you set any primary
.IR gid .
.TP
.BI \-\-ruid " uid\fR, " \-\-euid " uid\fR, " \-\-reuid " uid"
-Set the real, effective, or both uids. The \fIuid\fR argument can be
+Set the real, effective, or both UIDs. The \fIuid\fR argument can be
given as textual login name.
.sp
Setting a
diff --git a/term-utils/wall.1 b/term-utils/wall.1
index 939810cc4..922d85f0c 100644
--- a/term-utils/wall.1
+++ b/term-utils/wall.1
@@ -74,7 +74,7 @@ modem lines.
.BR \-g , " \-\-group " \fIgroup\fR
Limit printing message to members of group defined as a
.I group
-argument. The argument can be group name or gid.
+argument. The argument can be group name or GID.
.TP
.BR \-V , " \-\-version"
Display version information and exit.