From 357cf3fe9713e7120a176aab84504d3a8563b604 Mon Sep 17 00:00:00 2001 From: Michael Kerrisk Date: Mon, 18 Jul 2005 16:02:32 +0000 Subject: [PATCH] id --> ID --- man1/install.1 | 2 +- man2/shmget.2 | 2 +- man2/statvfs.2 | 2 +- man3/mktemp.3 | 2 +- man3/sysconf.3 | 2 +- man3/updwtmp.3 | 2 +- man4/tty_ioctl.4 | 2 +- man5/proc.5 | 2 +- man5/utmp.5 | 2 +- man7/ddp.7 | 7 ++++--- man7/ip.7 | 8 ++++---- man7/ipv6.7 | 6 +++--- man7/mdoc.samples.7 | 6 +++--- man7/netdevice.7 | 2 +- man7/raw.7 | 4 ++-- man7/rtnetlink.7 | 2 +- man7/socket.7 | 4 ++-- 17 files changed, 29 insertions(+), 28 deletions(-) diff --git a/man1/install.1 b/man1/install.1 index 09bf47c3c..378f7cbab 100644 --- a/man1/install.1 +++ b/man1/install.1 @@ -87,7 +87,7 @@ Set the group ownership of installed files or directories to .IR group . The default is the process's current group. .I group -may be either a group name or a numeric group id. +may be either a group name or a numeric group ID. .TP .BI "\-m " "mode" ", \-\-mode=" "mode" Set the permissions for the installed file or directory to diff --git a/man2/shmget.2 b/man2/shmget.2 index 511e261fe..f2c08ee7c 100644 --- a/man2/shmget.2 +++ b/man2/shmget.2 @@ -206,7 +206,7 @@ was not specified. No memory could be allocated for segment overhead. .TP .B ENOSPC -All possible shared memory id's have been taken +All possible shared memory IDs have been taken .RB ( SHMMNI ), or allocating a segment of the requested .I size diff --git a/man2/statvfs.2 b/man2/statvfs.2 index bcaeef231..c1103bb95 100644 --- a/man2/statvfs.2 +++ b/man2/statvfs.2 @@ -55,7 +55,7 @@ structure defined approximately as follows: fsfilcnt_t f_files; /* # inodes */ fsfilcnt_t f_ffree; /* # free inodes */ fsfilcnt_t f_favail; /* # free inodes for non-root */ - unsigned long f_fsid; /* file system id */ + unsigned long f_fsid; /* file system ID */ unsigned long f_flag; /* mount flags */ unsigned long f_namemax; /* maximum filename length */ }; diff --git a/man3/mktemp.3 b/man3/mktemp.3 index 7643d796b..1d781e708 100644 --- a/man3/mktemp.3 +++ b/man3/mktemp.3 @@ -68,7 +68,7 @@ and has the prototype in .IR . .SH BUGS Never use \fBmktemp()\fP. Some implementations follow 4.3BSD -and replace XXXXXX by the current process id and a single letter, +and replace XXXXXX by the current process ID and a single letter, so that at most 26 different names can be returned. Since on the one hand the names are easy to guess, and on the other hand there is a race between testing whether the name exists and diff --git a/man3/sysconf.3 b/man3/sysconf.3 index bc3db274e..a84e30258 100644 --- a/man3/sysconf.3 +++ b/man3/sysconf.3 @@ -130,7 +130,7 @@ family of functions. Must not be less than _POSIX_ARG_MAX (4096). .TP .BR CHILD_MAX " - " _SC_CHILD_MAX -The max number of simultaneous processes per user id. +The max number of simultaneous processes per user ID. Must not be less than _POSIX_CHILD_MAX (25). .TP .BR HOST_NAME_MAX " - " _SC_HOST_NAME_MAX diff --git a/man3/updwtmp.3 b/man3/updwtmp.3 index 716e7fe61..d812873e9 100644 --- a/man3/updwtmp.3 +++ b/man3/updwtmp.3 @@ -37,7 +37,7 @@ to the wtmp file. .PP \fBlogwtmp\fR() constructs an utmp structure using .IR line ", " name ", " host , -current time and current process id. +current time and current process ID. Then it calls \fBupdwtmp\fR() to append the structure to the utmp file. .SH AVAILABILITY Both functions are available under glibc2, but not under libc5. diff --git a/man4/tty_ioctl.4 b/man4/tty_ioctl.4 index 8ba000e12..e7428d8e8 100644 --- a/man4/tty_ioctl.4 +++ b/man4/tty_ioctl.4 @@ -232,7 +232,7 @@ Get the process group ID of the foreground process group on this tty. Equivalent to .IR "tcsetpgrp(fd, *argp)" . .br -Set the foreground process group id of this tty. +Set the foreground process group ID of this tty. .TP .BI "TIOCGSID pid_t *" argp Get the session ID of the given tty. This will fail with ENOTTY diff --git a/man5/proc.5 b/man5/proc.5 index 4da22a4f2..0dbc1d7b8 100644 --- a/man5/proc.5 +++ b/man5/proc.5 @@ -220,7 +220,7 @@ format specifiers, are: .RS .TP \fIpid\fP %d -The process id. +The process ID. .TP \fIcomm\fP %s The filename of the executable, in parentheses. This is visible diff --git a/man5/utmp.5 b/man5/utmp.5 index c11b2b412..32755bd77 100644 --- a/man5/utmp.5 +++ b/man5/utmp.5 @@ -142,7 +142,7 @@ clears \fIut_user\fP, \fIut_host\fP and \fIut_time\fP with null bytes. and other terminal emulators directly create a \fBUSER_PROCESS\fP record and generate the \fIut_id\fP by using the last two letters of \fI/dev/ttyp\fP\fI%c\fP or by using \fIp\fP\fI%d\fP for -\fI/dev/pts/\fP\fI%d\fP. If they find a \fBDEAD_PROCESS\fP for this id, +\fI/dev/pts/\fP\fI%d\fP. If they find a \fBDEAD_PROCESS\fP for this ID, they recycle it, otherwise they create a new entry. If they can, they will mark it as \fBDEAD_PROCESS\fP on exiting and it is advised that they null \fIut_line\fP, \fIut_time\fP, \fIut_user\fP, and \fIut_host\fP diff --git a/man7/ddp.7 b/man7/ddp.7 index 5a874fb08..99fe67bd1 100644 --- a/man7/ddp.7 +++ b/man7/ddp.7 @@ -48,7 +48,8 @@ is the Appletalk protocol to be received or sent. For you must specify .BR ATPROTO_DDP . .PP -Raw sockets may be only opened by a process with effective user id 0 or when the process has the +Raw sockets may be only opened by a process with effective user ID 0 +or when the process has the .B CAP_NET_RAW capability. .SH "ADDRESS FORMAT" @@ -78,7 +79,7 @@ is always set to .I sat_port contains the port. The port numbers below 129 are known as .B reserved ports. -Only processes with the effective user id 0 or the +Only processes with the effective user ID 0 or the .B CAP_NET_BIND_SERVICE capability may .BR bind (2) @@ -165,7 +166,7 @@ Datagram is bigger than the DDP MTU. .B EACCES The user tried to execute an operation without the necessary permissions. These include sending to a broadcast address without having the broadcast flag set, -and trying to bind to a reserved port without effective user id 0 or +and trying to bind to a reserved port without effective user ID 0 or .BR CAP_NET_BIND_SERVICE . .TP .B EADDRINUSE diff --git a/man7/ip.7 b/man7/ip.7 index 4a03254d1..d61929ab1 100644 --- a/man7/ip.7 +++ b/man7/ip.7 @@ -134,7 +134,7 @@ when this setting is missing. .I sin_port contains the port in network byte order. The port numbers below 1024 are called .IR "reserved ports" . -Only processes with effective user id 0 or the +Only processes with effective user ID 0 or the .B CAP_NET_BIND_SERVICE capability may .BR bind (2) @@ -327,7 +327,7 @@ Linux sends datagrams first by default, but the exact behaviour depends on the configured queueing discipline. .\" XXX elaborate on this -Some high priority levels may require an effective user id of 0 or the +Some high priority levels may require an effective user ID of 0 or the .B CAP_NET_ADMIN capability. The priority can also be set in a protocol independent way by the @@ -817,10 +817,10 @@ Sending a packet via a route. Modifying firewall settings without .B CAP_NET_ADMIN -or effective user id 0. +or effective user ID 0. Binding to a reserved port without the .B CAP_NET_BIND_SERVICE -capability or effective user id 0. +capability or effective user ID 0. .TP .B EADDRINUSE diff --git a/man7/ipv6.7 b/man7/ipv6.7 index 6b4eeafef..3c65bb3a3 100644 --- a/man7/ipv6.7 +++ b/man7/ipv6.7 @@ -65,7 +65,7 @@ struct sockaddr_in6 { u_int16_t sin6_port; /* port number */ u_int32_t sin6_flowinfo; /* IPv6 flow information */ struct in6_addr sin6_addr; /* IPv6 address */ - u_int32_t sin6_scope_id; /* Scope id (new in 2.4) */ + u_int32_t sin6_scope_id; /* Scope ID (new in 2.4) */ }; struct in6_addr { @@ -88,7 +88,7 @@ is the IPv6 flow identifier; .B sin6_addr is the 128bit IPv6 address. .B sin6_scope_id -is an id of depending of on the scope of the address. It is new in Linux 2.4. +is an ID of depending of on the scope of the address. It is new in Linux 2.4. Linux only supports it for link scope addresses, in that case .I sin6_scope_id contains the interface index (see @@ -170,7 +170,7 @@ delivers the destination options, .I IPV6_HOPOPTS delivers the hop options, .I IPV6_FLOWINFO -delivers an integer containing the flow id, +delivers an integer containing the flow ID, .I IPV6_HOPLIMIT delivers an integer containing the hop count of the packet. The control messages have the same type as the socket option. All these diff --git a/man7/mdoc.samples.7 b/man7/mdoc.samples.7 index 3ece7837d..dea353fb6 100644 --- a/man7/mdoc.samples.7 +++ b/man7/mdoc.samples.7 @@ -2570,7 +2570,7 @@ by the process to pages not loaded in core. .It UID numerical user-id of process owner .It PPID -numerical id of parent of process process priority +numerical ID of parent of process process priority (non-positive when in non-interruptible wait) .El .Pp @@ -2585,9 +2585,9 @@ The raw text: \&resulting from references \&by the process to pages not loaded in core. \&.It UID -\&numerical user-id of process owner +\&numerical user ID of process owner \&.It PPID -\&numerical id of parent of process process priority +\&numerical ID of parent of process process priority \&(non-positive when in non-interruptible wait) \&.El .Ed diff --git a/man7/netdevice.7 b/man7/netdevice.7 index 6b63a56c8..d41445590 100644 --- a/man7/netdevice.7 +++ b/man7/netdevice.7 @@ -62,7 +62,7 @@ share memory. .SH IOCTLS If an ioctl is marked as privileged then using it requires an effective -user id of 0 or the +user ID of 0 or the .B CAP_NET_ADMIN capability. If this is not the case .B EPERM diff --git a/man7/raw.7 b/man7/raw.7 index 10cb218ea..b1cdcfa8f 100644 --- a/man7/raw.7 +++ b/man7/raw.7 @@ -28,7 +28,7 @@ socket option is enabled on the socket. When it is enabled, the packet must contain an IP header. For receiving the IP header is always included in the packet. -Only processes with an effective user id of 0 or the +Only processes with an effective user ID of 0 or the .B CAP_NET_RAW capability are allowed to open raw sockets. @@ -215,7 +215,7 @@ Invalid argument. .TP .B EPERM The user doesn't have permission to open raw sockets. Only processes -with a effective user id of 0 or the +with a effective user ID of 0 or the .B CAP_NET_RAW attribute may do that. diff --git a/man7/rtnetlink.7 b/man7/rtnetlink.7 index 53e503427..fdfa4f44d 100644 --- a/man7/rtnetlink.7 +++ b/man7/rtnetlink.7 @@ -194,7 +194,7 @@ struct rtmsg unsigned char rtm_src_len; /* Length of destination */ unsigned char rtm_tos; /* TOS filter */ - unsigned char rtm_table; /* Routing table id */ + unsigned char rtm_table; /* Routing table ID */ unsigned char rtm_protocol; /* Routing protocol; see below */ unsigned char rtm_scope; /* See below */ unsigned char rtm_type; /* See below */ diff --git a/man7/socket.7 b/man7/socket.7 index 67bfd33a8..58e47e994 100644 --- a/man7/socket.7 +++ b/man7/socket.7 @@ -291,7 +291,7 @@ there). .B SO_DEBUG Enable socket debugging. Only allowed for processes with the .B CAP_NET_ADMIN -capability or an effective user id of 0. +capability or an effective user ID of 0. .TP .B SO_REUSEADDR Indicates that the rules used in validating addresses supplied in a @@ -508,7 +508,7 @@ asynchronous I/O operation has finished or urgent data is available. The argument is a pointer to a .BR pid_t . If the argument is positive, send the signals to that process. If the -argument is negative, send the signals to the process group with the id +argument is negative, send the signals to the process group with the ID of the absolute value of the argument. The process may only choose itself or its own process group to receive signals unless it has the