From e360c3a9cf18948ec853eb7f02f4b729f33b4951 Mon Sep 17 00:00:00 2001 From: Michael Kerrisk Date: Tue, 19 Jul 2005 06:32:54 +0000 Subject: [PATCH] s/pid/PID/ --- Changes | 8 ++++---- man2/nice.2 | 2 +- man2/ptrace.2 | 6 +++--- man5/ipc.5 | 10 +++++----- man5/utmp.5 | 4 ++-- man7/netlink.7 | 6 +++--- man7/suffixes.7 | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Changes b/Changes index f21c0db9b..d69452653 100644 --- a/Changes +++ b/Changes @@ -20,21 +20,21 @@ Global changes The terms "set-user-ID" and "set-group-ID" are now used consistently (no abbreviations) across all manual pages. +Consistent use of "saved set-user-ID" and "saved set-group-ID" +(no more "saved user ID", "ved effective UID", saved group ID", etc.) + Classical BSD versions are now always named x.yBSD (formerly there was a mix of x.yBSD and BSD x.y). uid --> UID gid --> GID + pid --> PID id --> ID -Consistent use of "saved set-user-ID" and "saved set-group-ID" -(no more "saved user ID", "saved group ID", etc.) - Typographical or grammatical errors have been corrected in several places. - New pages --------- diff --git a/man2/nice.2 b/man2/nice.2 index 68f2ae06c..38dd46751 100644 --- a/man2/nice.2 +++ b/man2/nice.2 @@ -39,7 +39,7 @@ nice \- change process priority .BR nice () adds .I inc -to the nice value for the calling pid. +to the nice value for the calling process. (A large nice value means a low priority.) Only the super\%user may specify a negative increment, or priority increase. .SH "RETURN VALUE" diff --git a/man2/ptrace.2 b/man2/ptrace.2 index 79e52322b..59ce44618 100644 --- a/man2/ptrace.2 +++ b/man2/ptrace.2 @@ -167,7 +167,7 @@ notification of child events and appears in .BR ps (1) output as the child's parent), but a .BR getppid (2) -by the child will still return the pid of the original parent. The child is +by the child will still return the PID of the original parent. The child is sent a SIGSTOP, but will not necessarily have stopped by the completion of this call; use .BR wait @@ -191,7 +191,7 @@ undocumented behavior. .LP .BR init (8), -the process with pid 1, may not be traced. +the process with PID 1, may not be traced. .LP The layout of the contents of memory and the USER area are quite OS- and architecture-specific. @@ -252,7 +252,7 @@ cannot send signals to or those running set-user-ID/set-group-ID programs, for obvious reasons. Alternatively, the process may already be being traced, or be .BR init -(pid 1). +(PID 1). .TP .B ESRCH The specified process does not exist, or is not currently being traced by the diff --git a/man5/ipc.5 b/man5/ipc.5 index 9112a38fa..9fcb8808a 100644 --- a/man5/ipc.5 +++ b/man5/ipc.5 @@ -155,11 +155,11 @@ containing the following members: .br .B ushort msg_lspid; -/* pid of last msgsnd call */ +/* PID of last msgsnd call */ .br .B ushort msg_lrpid; -/* pid of last msgrcv call */ +/* PID of last msgrcv call */ .br .B time_t msg_stime; @@ -268,7 +268,7 @@ containing the following members: .br .B short sempid; -/* pid for last operation */ +/* PID for last operation */ .br .B ushort semncnt; @@ -312,11 +312,11 @@ containing the following members: .br .B ushort shm_cpid; -/* pid of creator */ +/* PID of creator */ .br .B ushort shm_lpid; -/* pid, last operation */ +/* PID, last operation */ .br .B short shm_nattch; diff --git a/man5/utmp.5 b/man5/utmp.5 index 32755bd77..f95ef0f9e 100644 --- a/man5/utmp.5 +++ b/man5/utmp.5 @@ -74,7 +74,7 @@ struct exit_status { struct utmp { short ut_type; /* type of login */ - pid_t ut_pid; /* pid of login process */ + pid_t ut_pid; /* PID of login process */ char ut_line[UT_LINESIZE]; /* device name of tty \- "/dev/" */ char ut_id[4]; /* init id or abbrev. ttyname */ char ut_user[UT_NAMESIZE]; /* user name */ @@ -119,7 +119,7 @@ sets \fIut_id\fP from the inittab, \fIut_pid\fP and \fIut_time\fP to the current values, and \fIut_type\fP to \fBINIT_PROCESS\fP. .PP .BR getty (8) -locates the entry by the pid, changes \fIut_type\fP to +locates the entry by the PID, changes \fIut_type\fP to \fBLOGIN_PROCESS\fP, changes \fIut_time\fP, sets \fIut_line\fP, and waits for connection to be established. .BR login (8), diff --git a/man7/netlink.7 b/man7/netlink.7 index 64be417af..243dbf5df 100644 --- a/man7/netlink.7 +++ b/man7/netlink.7 @@ -115,7 +115,7 @@ Only users with an effective UID of 0 or the capability may send or listen to a netlink multicast group. Any replies to a message received for a multicast group -should be sent back to the sending pid and the multicast group. +should be sent back to the sending PID and the multicast group. .RS .nf @@ -215,14 +215,14 @@ struct sockaddr_nl { sa_family_t nl_family; /* AF_NETLINK */ unsigned short nl_pad; /* zero */ - pid_t nl_pid; /* process pid */ + pid_t nl_pid; /* process ID */ __u32 nl_groups; /* multicast groups mask */ }; .fi .RE .B nl_pid -is the pid of the process owning the destination socket, or 0 if the +is the PID of the process owning the destination socket, or 0 if the destination is in the kernel. .B nl_groups is a bitmask with every bit representing a netlink group number. diff --git a/man7/suffixes.7 b/man7/suffixes.7 index 44d00a79f..42ebbbbdf 100644 --- a/man7/suffixes.7 +++ b/man7/suffixes.7 @@ -198,7 +198,7 @@ Suffix File type .ph Perl header file .php PHP program file .php3 PHP3 program file - .pid File to store daemon pid (e.g. crond.pid) + .pid File to store daemon PID (e.g. crond.pid) .pl TeX property list file or Perl library file .pm Perl module .png Portable Network Graphics file