From e75a45425742d0cfe9236b02f8b0df7e2fd3c305 Mon Sep 17 00:00:00 2001
From: Michael Kerrisk <mtk.manpages@gmail.com>
Date: Mon, 18 Jul 2005 15:54:49 +0000
Subject: [PATCH] gid --> GID

---
 man2/shmctl.2   | 2 +-
 man2/stat.2     | 2 +-
 man3/getgrnam.3 | 2 +-
 man3/getpw.3    | 2 +-
 man5/ipc.5      | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/man2/shmctl.2 b/man2/shmctl.2
index dd99438e8..079a9bea0 100644
--- a/man2/shmctl.2
+++ b/man2/shmctl.2
@@ -238,7 +238,7 @@ soft resource limit (see
 .BR setrlimit (2)).
 .TP
 .B EOVERFLOW
-\fBIPC_STAT\fP is attempted, and the gid or uid value
+\fBIPC_STAT\fP is attempted, and the GID or UID value
 is too large to be stored in the structure pointed to by
 .IR buf .
 .TP
diff --git a/man2/stat.2 b/man2/stat.2
index 464cdbb3e..bddd0f8c1 100644
--- a/man2/stat.2
+++ b/man2/stat.2
@@ -348,7 +348,7 @@ e000	S_IFWHT	w%	160000	BSD whiteout (not used for inode)
 				On non-directories: don't cache this file (SunOS)
 				On directories: restricted deletion flag (SVID-v4.2)
 0400	S_ISGID		002000	set group ID on execution (V7)
-				for directories: use BSD semantics for propagation of gid
+				for directories: use BSD semantics for propagation of GID
 0400	S_ENFMT		002000	SysV file locking enforcement (shared with S_ISGID)
 0800	S_ISUID		004000	set-user-ID on execution (V7)
 0800	S_CDF		004000	directory is a context dependent file (HP-UX)
diff --git a/man3/getgrnam.3 b/man3/getgrnam.3
index 979095b81..2a591c774 100644
--- a/man3/getgrnam.3
+++ b/man3/getgrnam.3
@@ -93,7 +93,7 @@ The \fIgroup\fP structure is defined in \fI<grp.h>\fP as follows:
 struct group {
     char   *gr_name;       /* group name */
     char   *gr_passwd;     /* group password */
-    gid_t   gr_gid;        /* group id */
+    gid_t   gr_gid;        /* group ID */
     char  **gr_mem;        /* group members */
 };
 .fi
diff --git a/man3/getpw.3 b/man3/getpw.3
index 072ecfeec..d73026fa6 100644
--- a/man3/getpw.3
+++ b/man3/getpw.3
@@ -55,7 +55,7 @@ struct passwd {
         char    *pw_name;		/* user name */
         char    *pw_passwd;		/* user password */
         uid_t   pw_uid;			/* user ID */
-        gid_t   pw_gid;			/* group id */
+        gid_t   pw_gid;			/* group ID */
         char    *pw_gecos;      	/* real name */
         char    *pw_dir;  		/* home directory */
         char    *pw_shell;      	/* shell program */
diff --git a/man5/ipc.5 b/man5/ipc.5
index 51cd3f689..9112a38fa 100644
--- a/man5/ipc.5
+++ b/man5/ipc.5
@@ -57,19 +57,19 @@ system header file, includes the following members:
 .sp
 .B
 	ushort cuid;	 
-/* creator user id */
+/* creator user ID */
 .br
 .B
 	ushort cgid;	 
-/* creator group id */
+/* creator group ID */
 .br
 .B
 	ushort uid;	 
-/* owner user id */
+/* owner user ID */
 .br
 .B
 	ushort gid;	
-/* owner group id */
+/* owner group ID */
 .br
 .B
 	ushort mode;