Message style improvements

petere · petere · commit 92d003fcbfb7 · 2013-08-07T22:53:50.000-04:00
diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
@@ -679,7 +679,7 @@ transformTableLikeClause(CreateStmtContext *cxt, TableLikeClause *table_like_cla
 	if (cxt->isforeign)
 		ereport(ERROR,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("LIKE is not supported for foreign tables")));
+				 errmsg("LIKE is not supported for creating foreign tables")));
 
 	relation = relation_openrv(table_like_clause->relation, AccessShareLock);
 
diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c
@@ -174,7 +174,7 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size)
 						 "memory configuration.") : 0,
 				 (errno == ENOMEM) ?
 				 errhint("This error usually means that PostgreSQL's request for a shared "
-						 "memory segment exceeded your kernel's SHMALL parameter.  You may need "
+						 "memory segment exceeded your kernel's SHMALL parameter.  You might need "
 						 "to reconfigure the kernel with larger SHMALL.\n"
 		"The PostgreSQL documentation contains more information about shared "
 						 "memory configuration.") : 0,
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -5165,7 +5165,7 @@ RegisterBackgroundWorker(BackgroundWorker *worker)
 
 	if (!IsUnderPostmaster)
 		ereport(LOG,
-			(errmsg("registering background worker: %s", worker->bgw_name)));
+			(errmsg("registering background worker \"%s\"", worker->bgw_name)));
 
 	if (!process_shared_preload_libraries_in_progress)
 	{
@@ -5277,7 +5277,7 @@ BackgroundWorkerInitializeConnection(char *dbname, char *username)
 	/* it had better not gotten out of "init" mode yet */
 	if (!IsInitProcessingMode())
 		ereport(ERROR,
-				(errmsg("invalid processing mode in bgworker")));
+				(errmsg("invalid processing mode in background worker")));
 	SetProcessingMode(NormalProcessing);
 }
 
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
@@ -1836,7 +1836,7 @@ populate_recordset_array_element_start(void *state, bool isnull)
 		_state->lex->token_type != JSON_TOKEN_OBJECT_START)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-			 errmsg("must call populate_recordset on an array of objects")));
+			 errmsg("must call json_populate_recordset on an array of objects")));
 }
 
 static void
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -1603,7 +1603,7 @@ static struct config_int ConfigureNamesInt[] =
 
 	{
 		{"wal_receiver_timeout", PGC_SIGHUP, REPLICATION_STANDBY,
-			gettext_noop("Sets the maximum wait time to receive data from master."),
+			gettext_noop("Sets the maximum wait time to receive data from the primary."),
 			NULL,
 			GUC_UNIT_MS
 		},

Original file line number	Diff line number	Diff line change
`@@ -5165,7 +5165,7 @@ RegisterBackgroundWorker(BackgroundWorker *worker)`
`5165`	`5165`
`5166`	`5166`	`if (!IsUnderPostmaster)`
`5167`	`5167`	`ereport(LOG,`
`5168`		`- (errmsg("registering background worker: %s", worker->bgw_name)));`
	`5168`	`+ (errmsg("registering background worker \"%s\"", worker->bgw_name)));`
`5169`	`5169`
`5170`	`5170`	`if (!process_shared_preload_libraries_in_progress)`
`5171`	`5171`	`{`
`@@ -5277,7 +5277,7 @@ BackgroundWorkerInitializeConnection(char dbname, char username)`
`5277`	`5277`	`/* it had better not gotten out of "init" mode yet */`
`5278`	`5278`	`if (!IsInitProcessingMode())`
`5279`	`5279`	`ereport(ERROR,`
`5280`		`- (errmsg("invalid processing mode in bgworker")));`
	`5280`	`+ (errmsg("invalid processing mode in background worker")));`
`5281`	`5281`	`SetProcessingMode(NormalProcessing);`
`5282`	`5282`	`}`
`5283`	`5283`
Original file line number	Diff line number	Diff line change
`@@ -1836,7 +1836,7 @@ populate_recordset_array_element_start(void *state, bool isnull)`
`1836`	`1836`	`_state->lex->token_type != JSON_TOKEN_OBJECT_START)`
`1837`	`1837`	`ereport(ERROR,`
`1838`	`1838`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`1839`		`- errmsg("must call populate_recordset on an array of objects")));`
	`1839`	`+ errmsg("must call json_populate_recordset on an array of objects")));`
`1840`	`1840`	`}`
`1841`	`1841`
`1842`	`1842`	`static void`
Original file line number	Diff line number	Diff line change
`@@ -1603,7 +1603,7 @@ static struct config_int ConfigureNamesInt[] =`
`1603`	`1603`
`1604`	`1604`	`{`
`1605`	`1605`	`{"wal_receiver_timeout", PGC_SIGHUP, REPLICATION_STANDBY,`
`1606`		`- gettext_noop("Sets the maximum wait time to receive data from master."),`
	`1606`	`+ gettext_noop("Sets the maximum wait time to receive data from the primary."),`
`1607`	`1607`	`NULL,`
`1608`	`1608`	`GUC_UNIT_MS`
`1609`	`1609`	`},`