diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index e835e4bc9095c7b12553d490840f5a2f2fdee0f2..794aef4e6aad3c9556620d133505e2f59eb9346e 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -259,7 +259,7 @@ SET ENABLE_SEQSCAN TO OFF;
</indexterm>
<listitem>
<para>
- Specifies the name of an additional process-id (PID) file that the
+ Specifies the name of an additional process-ID (PID) file that the
server should create for use by server administration programs.
This parameter can only be set at server start.
</para>
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index b359000ab302e00217f0da4beef6e7597a234b4f..3a57295bd3aef4d35b938182b551350d18872249 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -6116,7 +6116,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
break;
}
- /* unknown event id, just return TRUE. */
+ /* unknown event ID, just return TRUE. */
default:
break;
}
@@ -7553,7 +7553,7 @@ main(int argc, char **argv)
while ((notify = PQnotifies(conn)) != NULL)
{
fprintf(stderr,
- "ASYNC NOTIFY of '%s' received from backend pid %d\n",
+ "ASYNC NOTIFY of '%s' received from backend PID %d\n",
notify->relname, notify->be_pid);
PQfreemem(notify);
nnotifies++;
diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index eea6ec58e320c24b89edf12fb070e7415ae59ebd..20bc99108362486bc5a1d48ef7878dda6538a200 100644
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -3174,7 +3174,7 @@ RAISE NOTICE 'Calling cs_create_job(%)', v_job_id;
and hint:
<programlisting>
RAISE EXCEPTION 'Nonexistent ID --> %', user_id
- USING HINT = 'Please check your user id';
+ USING HINT = 'Please check your user ID';
</programlisting>
</para>
diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml
index 512c96f9bde8a8609ce9c6f54267d2fe3708ca2f..0d65c78b08b599eb9e72bd5b3f3f3fe1c76de204 100644
--- a/doc/src/sgml/spi.sgml
+++ b/doc/src/sgml/spi.sgml
@@ -1231,7 +1231,7 @@ Oid SPI_getargtypeid(SPIPlanPtr <parameter>plan</parameter>, int <parameter>argI
<para>
<function>SPI_getargtypeid</function> returns the OID representing the type
- id for the <parameter>argIndex</parameter>'th argument of a plan prepared by
+ for the <parameter>argIndex</parameter>'th argument of a plan prepared by
<function>SPI_prepare</function>. First argument is at index zero.
</para>
</refsect1>
@@ -1263,7 +1263,7 @@ Oid SPI_getargtypeid(SPIPlanPtr <parameter>plan</parameter>, int <parameter>argI
<refsect1>
<title>Return Value</title>
<para>
- The type id of the argument at the given index.
+ The type OID of the argument at the given index.
If the <parameter>plan</parameter> is <symbol>NULL</symbol> or invalid,
or <parameter>argIndex</parameter> is less than 0 or
not less than the number of arguments declared for the
diff --git a/doc/src/sgml/storage.sgml b/doc/src/sgml/storage.sgml
index 90c3e061b24da06de02adb47b9b8940a0e1316ba..0a133bb7c7e815e91808419ac4786a66497855f6 100644
--- a/doc/src/sgml/storage.sgml
+++ b/doc/src/sgml/storage.sgml
@@ -121,7 +121,7 @@ last started with</entry>
<row>
<entry><filename>postmaster.pid</></entry>
- <entry>A lock file recording the current postmaster process id (PID),
+ <entry>A lock file recording the current postmaster process ID (PID),
cluster data directory path,
postmaster start timestamp,
port number,
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
index a9d242869897d1d23fb5c349219466dfd4b422d4..f3e85aa31bb78a26ade174cbe500c58f88bf8f42 100644
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -248,7 +248,7 @@ Boot_CreateStmt:
(Datum) 0,
false,
true);
- elog(DEBUG4, "relation created with oid %u", id);
+ elog(DEBUG4, "relation created with OID %u", id);
}
do_end();
}
diff --git a/src/backend/port/ipc_test.c b/src/backend/port/ipc_test.c
index b4bcf40a7aba6dfdc85f75950436137486fd820d..88b1b57549a69edc9937b67e108d628ea3a1ab36 100644
--- a/src/backend/port/ipc_test.c
+++ b/src/backend/port/ipc_test.c
@@ -303,7 +303,7 @@ main(int argc, char **argv)
proc_exit(1);
}
- printf("forked child pid %d OK\n", cpid);
+ printf("forked child PID %d OK\n", cpid);
if (storage->flag != 1234)
printf("Wrong value found in shared memory!\n");
diff --git a/src/backend/port/win32/signal.c b/src/backend/port/win32/signal.c
index b5675ec76f48dd43676d4d8004a646efa21a17df..92082a20b7a9b9adfa98cb74a6b8919ae5f38482 100644
--- a/src/backend/port/win32/signal.c
+++ b/src/backend/port/win32/signal.c
@@ -171,7 +171,7 @@ pqsignal(int signum, pqsigfunc handler)
return prevfunc;
}
-/* Create the signal listener pipe for specified pid */
+/* Create the signal listener pipe for specified PID */
HANDLE
pgwin32_create_signal_listener(pid_t pid)
{
@@ -186,7 +186,7 @@ pgwin32_create_signal_listener(pid_t pid)
if (pipe == INVALID_HANDLE_VALUE)
ereport(ERROR,
- (errmsg("could not create signal listener pipe for pid %d: error code %d",
+ (errmsg("could not create signal listener pipe for PID %d: error code %d",
(int) pid, (int) GetLastError())));
return pipe;
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index b12348b39dd4fd129130c8805d4bffed0621b4f7..5eb6186343687ee3466f76a81643c0137c2dbbed 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -952,7 +952,7 @@ MarkBufferDirty(Buffer buffer)
volatile BufferDesc *bufHdr;
if (!BufferIsValid(buffer))
- elog(ERROR, "bad buffer id: %d", buffer);
+ elog(ERROR, "bad buffer ID: %d", buffer);
if (BufferIsLocal(buffer))
{
@@ -2198,7 +2198,7 @@ ReleaseBuffer(Buffer buffer)
volatile BufferDesc *bufHdr;
if (!BufferIsValid(buffer))
- elog(ERROR, "bad buffer id: %d", buffer);
+ elog(ERROR, "bad buffer ID: %d", buffer);
ResourceOwnerForgetBuffer(CurrentResourceOwner, buffer);
@@ -2270,7 +2270,7 @@ SetBufferCommitInfoNeedsSave(Buffer buffer)
volatile BufferDesc *bufHdr;
if (!BufferIsValid(buffer))
- elog(ERROR, "bad buffer id: %d", buffer);
+ elog(ERROR, "bad buffer ID: %d", buffer);
if (BufferIsLocal(buffer))
{
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index 1df20c4732064d0d95b15fcaad74d856069e0237..4f446aab7a42e02e615f956f646806e90fbf1f2b 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -323,7 +323,7 @@ SharedInvalBackendInit(bool sendOnly)
/* register exit routine to mark my entry inactive at exit */
on_shmem_exit(CleanupInvalidationState, PointerGetDatum(segP));
- elog(DEBUG4, "my backend id is %d", MyBackendId);
+ elog(DEBUG4, "my backend ID is %d", MyBackendId);
}
/*
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index f898b795d5952b1a1ee7d37ff817100a877270f8..dd3e47c6b421b6bf6db90802b1bc2f231488c1ca 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -996,7 +996,7 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable)
{
int pid = autovac->pid;
- elog(DEBUG2, "sending cancel to blocking autovacuum pid = %d",
+ elog(DEBUG2, "sending cancel to blocking autovacuum PID %d",
pid);
/* don't hold the lock across the kill() syscall */
diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c
index ec3292afcd8114045a1011486de9899ae3ea1429..ea7bf496daf1addab47c3a77783eaa814a29f45e 100644
--- a/src/backend/storage/smgr/smgrtype.c
+++ b/src/backend/storage/smgr/smgrtype.c
@@ -54,7 +54,7 @@ smgrout(PG_FUNCTION_ARGS)
char *s;
if (i >= NStorageManagers || i < 0)
- elog(ERROR, "invalid storage manager id: %d", i);
+ elog(ERROR, "invalid storage manager ID: %d", i);
s = pstrdup(StorageManager[i].smgr_name);
PG_RETURN_CSTRING(s);
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index ebc83440deac2a89fdc6e577824ac4e1b28c4c3c..a5580bd92fb02f5bc2d7c4becf8b3c3cd9b06b8d 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -529,7 +529,7 @@ LocalExecuteInvalidationMessage(SharedInvalidationMessage *msg)
RelationMapInvalidate(false);
}
else
- elog(FATAL, "unrecognized SI message id: %d", msg->id);
+ elog(FATAL, "unrecognized SI message ID: %d", msg->id);
}
/*
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 75f510c16434380b05eecc1215cb09fc0030bdad..99e5f1d9fe616cbd10458d5457163205b2e97cb6 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -14,7 +14,7 @@
* These routines allow the parser/planner/executor to perform
* rapid lookups on the contents of the system catalogs.
*
- * see utils/syscache.h for a list of the cache id's
+ * see utils/syscache.h for a list of the cache IDs
*
*-------------------------------------------------------------------------
*/
@@ -842,7 +842,7 @@ SearchSysCache(int cacheId,
{
if (cacheId < 0 || cacheId >= SysCacheSize ||
!PointerIsValid(SysCache[cacheId]))
- elog(ERROR, "invalid cache id: %d", cacheId);
+ elog(ERROR, "invalid cache ID: %d", cacheId);
return SearchCatCache(SysCache[cacheId], key1, key2, key3, key4);
}
@@ -1026,7 +1026,7 @@ SysCacheGetAttr(int cacheId, HeapTuple tup,
*/
if (cacheId < 0 || cacheId >= SysCacheSize ||
!PointerIsValid(SysCache[cacheId]))
- elog(ERROR, "invalid cache id: %d", cacheId);
+ elog(ERROR, "invalid cache ID: %d", cacheId);
if (!PointerIsValid(SysCache[cacheId]->cc_tupdesc))
{
InitCatCachePhase2(SysCache[cacheId], false);
@@ -1047,7 +1047,7 @@ SearchSysCacheList(int cacheId, int nkeys,
{
if (cacheId < 0 || cacheId >= SysCacheSize ||
!PointerIsValid(SysCache[cacheId]))
- elog(ERROR, "invalid cache id: %d", cacheId);
+ elog(ERROR, "invalid cache ID: %d", cacheId);
return SearchCatCacheList(SysCache[cacheId], nkeys,
key1, key2, key3, key4);
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 8347f52ca8d5f1725416e5f5372ea2cdce217992..1476df4db285cd1982105f68230e5332a3e3a29b 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -489,7 +489,7 @@ InitPostgres(const char *in_dbname, Oid dboid, const char *username,
SharedInvalBackendInit(false);
if (MyBackendId > MaxBackends || MyBackendId <= 0)
- elog(FATAL, "bad backend id: %d", MyBackendId);
+ elog(FATAL, "bad backend ID: %d", MyBackendId);
/* Now that we have a BackendId, we can participate in ProcSignal */
ProcSignalInit(MyBackendId);
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index 970fa935099707c219325b0f7b4a28ea174e1fdc..81c1165ce2796fc3d70d258f2ecf7d69c55e8559 100644
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -1698,7 +1698,7 @@ ecpg_execute(struct statement * stmt)
notify = PQnotifies(stmt->connection->connection);
if (notify)
{
- ecpg_log("ecpg_execute on line %d: asynchronous notification of \"%s\" from backend pid %d received\n",
+ ecpg_log("ecpg_execute on line %d: asynchronous notification of \"%s\" from backend PID %d received\n",
stmt->lineno, notify->relname, notify->be_pid);
PQfreemem(notify);
}
diff --git a/src/test/examples/testlibpq2.c b/src/test/examples/testlibpq2.c
index f47c5e36bb9c26bfbc739d24ba7724eca20a0703..850993f6e82af05ac72dfbc4936307f8b3b63bd1 100644
--- a/src/test/examples/testlibpq2.c
+++ b/src/test/examples/testlibpq2.c
@@ -121,7 +121,7 @@ main(int argc, char **argv)
while ((notify = PQnotifies(conn)) != NULL)
{
fprintf(stderr,
- "ASYNC NOTIFY of '%s' received from backend pid %d\n",
+ "ASYNC NOTIFY of '%s' received from backend PID %d\n",
notify->relname, notify->be_pid);
PQfreemem(notify);
nnotifies++;
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 9fc9c1088ffb0abaf800da158f168d4b4b01f51c..1c5c176e1f25fd14ebf51879bb8bb7499f300571 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -2310,7 +2310,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
#else
#define ULONGPID(x) (unsigned long) (x)
#endif
- printf(_("running on port %d with pid %lu\n"),
+ printf(_("running on port %d with PID %lu\n"),
port, ULONGPID(postmaster_pid));
}
else