Capitalization fixes

petere · petere · commit 8a8fbe7e799c · 2011-06-19T00:37:30.000+03:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -6116,7 +6116,7 @@ myEventProc(PGEventId evtId, void evtInfo, void passThrough)`
`6116`	`6116`	`break;`
`6117`	`6117`	`}`
`6118`	`6118`
`6119`		`- /* unknown event id, just return TRUE. */`
	`6119`	`+ /* unknown event ID, just return TRUE. */`
`6120`	`6120`	`default:`
`6121`	`6121`	`break;`
`6122`	`6122`	`}`
`@@ -7553,7 +7553,7 @@ main(int argc, char **argv)`
`7553`	`7553`	`while ((notify = PQnotifies(conn)) != NULL)`
`7554`	`7554`	`{`
`7555`	`7555`	`fprintf(stderr,`
`7556`		`- "ASYNC NOTIFY of '%s' received from backend pid %d\n",`
	`7556`	`+ "ASYNC NOTIFY of '%s' received from backend PID %d\n",`
`7557`	`7557`	`notify->relname, notify->be_pid);`
`7558`	`7558`	`PQfreemem(notify);`
`7559`	`7559`	`nnotifies++;`
Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ Boot_CreateStmt:`
`248`	`248`	`(Datum) 0,`
`249`	`249`	`false,`
`250`	`250`	`true);`
`251`		`- elog(DEBUG4, "relation created with oid %u", id);`
	`251`	`+ elog(DEBUG4, "relation created with OID %u", id);`
`252`	`252`	`}`
`253`	`253`	`do_end();`
`254`	`254`	`}`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ main(int argc, char **argv)`
`303`	`303`	`proc_exit(1);`
`304`	`304`	`}`
`305`	`305`
`306`		`- printf("forked child pid %d OK\n", cpid);`
	`306`	`+ printf("forked child PID %d OK\n", cpid);`
`307`	`307`
`308`	`308`	`if (storage->flag != 1234)`
`309`	`309`	`printf("Wrong value found in shared memory!\n");`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ pqsignal(int signum, pqsigfunc handler)`
`171`	`171`	`return prevfunc;`
`172`	`172`	`}`
`173`	`173`
`174`		`-/* Create the signal listener pipe for specified pid */`
	`174`	`+/* Create the signal listener pipe for specified PID */`
`175`	`175`	`HANDLE`
`176`	`176`	`pgwin32_create_signal_listener(pid_t pid)`
`177`	`177`	`{`
`@@ -186,7 +186,7 @@ pgwin32_create_signal_listener(pid_t pid)`
`186`	`186`
`187`	`187`	`if (pipe == INVALID_HANDLE_VALUE)`
`188`	`188`	`ereport(ERROR,`
`189`		`- (errmsg("could not create signal listener pipe for pid %d: error code %d",`
	`189`	`+ (errmsg("could not create signal listener pipe for PID %d: error code %d",`
`190`	`190`	`(int) pid, (int) GetLastError())));`
`191`	`191`
`192`	`192`	`return pipe;`
Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ SharedInvalBackendInit(bool sendOnly)`
`323`	`323`	`/* register exit routine to mark my entry inactive at exit */`
`324`	`324`	`on_shmem_exit(CleanupInvalidationState, PointerGetDatum(segP));`
`325`	`325`
`326`		`- elog(DEBUG4, "my backend id is %d", MyBackendId);`
	`326`	`+ elog(DEBUG4, "my backend ID is %d", MyBackendId);`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`/*`