Capitalization fixes

13 files changed, 19 insertions, 19 deletions

diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
index a9d24286989..f3e85aa31bb 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 b4bcf40a7ab..88b1b57549a 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 b5675ec76f4..92082a20b7a 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 b12348b39dd..5eb61863436 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 1df20c47320..4f446aab7a4 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 f898b795d59..dd3e47c6b42 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 ec3292afcd8..ea7bf496daf 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 ebc83440dea..a5580bd92fb 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 75f510c1643..99e5f1d9fe6 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 8347f52ca8d..1476df4db28 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 970fa935099..81c1165ce27 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 f47c5e36bb9..850993f6e82 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 9fc9c1088ff..1c5c176e1f2 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