Improve use of prepositions in messages

*in* database, *in* cluster, *on* server; and some related fixes

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 5db4f5761d7abaef7f8074d875764acbab21a44b..fa1d569f0f871ad1b3a20520f0a43a2107913c17 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -1032,8 +1032,8 @@ help(const char *progname)
    printf(_("  --extra-float-digits=NUM     override default setting for extra_float_digits\n"));
    printf(_("  --if-exists                  use IF EXISTS when dropping objects\n"));
    printf(_("  --include-foreign-data=PATTERN\n"
-            "                               include data of foreign tables in\n"
-            "                               foreign servers matching PATTERN\n"));
+            "                               include data of foreign tables on foreign\n"
+            "                               servers matching PATTERN\n"));
    printf(_("  --inserts                    dump data as INSERT commands, rather than COPY\n"));
    printf(_("  --load-via-partition-root    load partitions via the root table\n"));
    printf(_("  --no-comments                do not dump comments\n"));

diff --git a/src/bin/pg_rewind/libpq_fetch.c b/src/bin/pg_rewind/libpq_fetch.c
index 7fd73b882eb6ebd64b4f037cd9bd9e72fb841cea..a17799a5d711abfd585e870f5579dfce8b34fc4d 100644 (file)
--- a/src/bin/pg_rewind/libpq_fetch.c
+++ b/src/bin/pg_rewind/libpq_fetch.c
@@ -108,7 +108,7 @@ run_simple_query(const char *sql)
    res = PQexec(conn, sql);
 
    if (PQresultStatus(res) != PGRES_TUPLES_OK)
-       pg_fatal("error running query (%s) in source server: %s",
+       pg_fatal("error running query (%s) on source server: %s",
                 sql, PQresultErrorMessage(res));
 
    /* sanity check the result set */

diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index 630fb3b9f56bc32585a7cf83e31568b9c6b5e2f6..0015d3b461a71781ca4e7a314455347ee1ce6f4b 100644 (file)
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -873,7 +873,7 @@ getRestoreCommand(const char *argv0)
    (void) pg_strip_crlf(cmd_output);
 
    if (strcmp(cmd_output, "") == 0)
-       pg_fatal("restore_command is not set on the target cluster");
+       pg_fatal("restore_command is not set in the target cluster");
 
    restore_command = pg_strdup(cmd_output);
 
@@ -936,7 +936,7 @@ ensureCleanShutdown(const char *argv0)
 
    if (system(cmd) != 0)
    {
-       pg_log_error("postgres single-user mode of target instance failed");
+       pg_log_error("postgres single-user mode in target cluster failed");
        pg_fatal("Command was: %s", cmd);
    }
 }

diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index 54e46181fe71a8ac5f0d4f1bd0da0a7ea2e76b30..b7b19ccc1ca9c2457ebca08130b2915582021996 100644 (file)
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -567,7 +567,7 @@ run_reindex_command(PGconn *conn, ReindexType type, const char *name,
                             name, PQdb(conn), PQerrorMessage(conn));
                break;
            case REINDEX_SYSTEM:
-               pg_log_error("reindexing of system catalogs on database \"%s\" failed: %s",
+               pg_log_error("reindexing of system catalogs in database \"%s\" failed: %s",
                             PQdb(conn), PQerrorMessage(conn));
                break;
            case REINDEX_TABLE: