Wording improvements

diff --git a/src/backend/tsearch/ts_utils.c b/src/backend/tsearch/ts_utils.c
index 4aa27887995387c986e1f28d16d37bff8fc4f3b2..cbd06682842165ebf2c1e9cc5a4a229f6dfc672b 100644 (file)
--- a/src/backend/tsearch/ts_utils.c
+++ b/src/backend/tsearch/ts_utils.c
@@ -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)

diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
index 11ac62aff8e8abe169251f8ff35cf5c392890b05..75db46dab24366f46b86ccee9953b60018f8b3b7 100644 (file)
--- a/src/backend/utils/adt/tsquery.c
+++ b/src/backend/utils/adt/tsquery.c
@@ -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);

diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c
index 04360f9bce55ab0de13716bac1db9819f0712036..3b29ac0d0139de34b352d0570e98b79965d18097 100644 (file)
--- a/src/backend/utils/adt/tsquery_cleanup.c
+++ b/src/backend/utils/adt/tsquery_cleanup.c
@@ -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;
        }

diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c
index 0231589123d94a30011302bea4f7c16152edf322..3f4cec7f934572ff24113702df4f1ed1d176ed53 100644 (file)
--- a/src/backend/utils/adt/tsvector_op.c
+++ b/src/backend/utils/adt/tsvector_op.c
@@ -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);
        }

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 159a35493d06aca6d3d511843e7852e004913de0..a777c8cb24bb11188392ff90765ad33a75f1e0df 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -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

diff --git a/src/port/open.c b/src/port/open.c
index 550a9d6f3944d18e637e0e2a4eca46f6a0d33ee7..6ef0e21a02f94cbc44321f6e5cc7614bb74cc204 100644 (file)
--- a/src/port/open.c
+++ b/src/port/open.c
@@ -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)