Wording improvements

src/backend/tsearch/ts_utils.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tsearch/ts_utils.c,v 1.7 2007/11/15 22:25:16 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/ts_utils.c,v 1.8 2007/12/27 13:02:48 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -69,7 +69,7 @@ comparestr(const void *a, const void *b)
 }
 
 /*
- * Reads a stopword file. Each word is run through 'wordop'
+ * Reads a stop-word file. Each word is run through 'wordop'
  * function, if given.	wordop may either modify the input in-place,
  * or palloc a new version.
  */
@@ -89,7 +89,7 @@ readstoplist(const char *fname, StopList *s, char *(*wordop) (const char *))
 		if ((hin = AllocateFile(filename, "r")) == NULL)
 			ereport(ERROR,
 					(errcode(ERRCODE_CONFIG_FILE_ERROR),
-					 errmsg("could not open stopword file \"%s\": %m",
+					 errmsg("could not open stop-word file \"%s\": %m",
 							filename)));
 
 		while ((line = t_readline(hin)) != NULL)

src/backend/utils/adt/tsquery.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.12 2007/11/28 21:56:30 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.13 2007/12/27 13:02:48 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -498,7 +498,7 @@ parse_tsquery(char *buf,
 	if (list_length(state.polstr) == 0)
 	{
 		ereport(NOTICE,
-				(errmsg("tsearch query doesn't contain lexeme(s): \"%s\"",
+				(errmsg("text-search query doesn't contain lexemes: \"%s\"",
 						state.buffer)));
 		query = (TSQuery) palloc(HDRSIZETQ);
 		SET_VARSIZE(query, HDRSIZETQ);

src/backend/utils/adt/tsquery_cleanup.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_cleanup.c,v 1.8 2007/11/28 21:56:30 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_cleanup.c,v 1.9 2007/12/27 13:02:48 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -282,7 +282,7 @@ clean_fakeval(QueryItem *ptr, int *len)
 	if (result != V_UNKNOWN)
 	{
 		ereport(NOTICE,
-				(errmsg("query contains only stopword(s) or doesn't contain lexeme(s), ignored")));
+				(errmsg("text-search query contains only stop words or doesn't contain lexemes, ignored")));
 		*len = 0;
 		return NULL;
 	}

src/backend/utils/adt/tsvector_op.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.10 2007/11/28 21:56:30 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.11 2007/12/27 13:02:48 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1324,7 +1324,7 @@ tsvector_update_trigger(PG_FUNCTION_ARGS, bool config_column)
 		if (config_attr_num == SPI_ERROR_NOATTRIBUTE)
 			ereport(ERROR,
 					(errcode(ERRCODE_UNDEFINED_COLUMN),
-					 errmsg("config column \"%s\" does not exist",
+					 errmsg("configuration column \"%s\" does not exist",
 							trigger->tgargs[1])));
 		if (SPI_gettypeid(rel->rd_att, config_attr_num) != REGCONFIGOID)
 			ereport(ERROR,
@@ -1336,7 +1336,7 @@ tsvector_update_trigger(PG_FUNCTION_ARGS, bool config_column)
 		if (isnull)
 			ereport(ERROR,
 					(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
-					 errmsg("config column \"%s\" must not be NULL",
+					 errmsg("configuration column \"%s\" must not be null",
 							trigger->tgargs[1])));
 		cfgId = DatumGetObjectId(datum);
 	}

src/backend/utils/misc/guc.c

@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.426 2007/11/15 21:14:41 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.427 2007/12/27 13:02:48 petere Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -2024,7 +2024,7 @@ static struct config_string ConfigureNamesString[] =
 		{"session_replication_role", PGC_SUSET, CLIENT_CONN_STATEMENT,
 			gettext_noop("Sets the sessions behavior for triggers and rewrite rules."),
 			gettext_noop("Each session can be either"
-						 " \"origin\", \"replica\" or \"local\".")
+						 " \"origin\", \"replica\", or \"local\".")
 		},
 		&session_replication_role_string,
 		"origin", assign_session_replication_role, NULL

src/port/open.c

@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/port/open.c,v 1.23 2007/12/20 20:27:53 mha Exp $
+ * $PostgreSQL: pgsql/src/port/open.c,v 1.24 2007/12/27 13:02:48 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -111,7 +111,7 @@ pgwin32_open(const char *fileName, int fileFlags,...)
 				    (errmsg("could not open file \"%s\": %s", fileName, 
 					  (err == ERROR_SHARING_VIOLATION)?_("sharing violation"):_("lock violation")),
 					 errdetail("Continuing to retry for 30 seconds."),
-					 errhint("You may have antivirus, backup or similar software interfering with the database.")));
+					 errhint("You may have antivirus, backup, or similar software interfering with the database system.")));
 #endif
 
 			if (loops < 300)