Misc message style and doc fixes.

Euler Taveira

diff --git a/doc/src/sgml/ref/pg_recvlogical.sgml b/doc/src/sgml/ref/pg_recvlogical.sgml
index 4170c8ef9f7db41d430b2533f544b4952ca444c9..edc52c0d694bacedca4fadea65bf34aaf724fb1e 100644 (file)
--- a/doc/src/sgml/ref/pg_recvlogical.sgml
+++ b/doc/src/sgml/ref/pg_recvlogical.sgml
@@ -226,13 +226,12 @@ PostgreSQL documentation
       <term><option>--fsync-interval=<replaceable>interval_seconds</replaceable></option></term>
       <listitem>
        <para>
-        How often should
-        <link linkend="app-pgreceivexlog"><application>pg_receivexlog</application></link>
-        issue sync commands to ensure the <parameter>--outputfile</parameter>
-        is safely flushed to disk without being asked by the server to do
-        so. Specifying an interval of <literal>0</literal> disables issuing
-        fsyncs altogether, while still reporting progress the server.
-        In this case, data may be lost in the event of a crash.
+        How often should <application>pg_recvlogical</application> issue sync
+        commands to ensure the <parameter>--outputfile</parameter> is safely
+        flushed to disk without being asked by the server to do so. Specifying
+        an interval of <literal>0</literal> disables issuing fsyncs altogether,
+        while still reporting progress the server.  In this case, data may be
+        lost in the event of a crash.
        </para>
       </listitem>
      </varlistentry>

diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
index 7bc761db8f49ebe4f2d75e4726e24d3bb2a9afde..65e95c59f02f9b88cfc07b43eb88bc607e12a7d8 100644 (file)
--- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
+++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -139,7 +139,7 @@ libpqrcv_identify_system(TimeLineID *primary_tli)
                PQclear(res);
                ereport(ERROR,
                                (errmsg("invalid response from primary server"),
-                                errdetail("Could not identify system: Got %d rows and %d fields, expected %d rows and %d or more fields.",
+                                errdetail("Could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields.",
                                                   ntuples, nfields, 3, 1)));
        }
        primary_sysid = PQgetvalue(res, 0, 0);

diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 154c52d190915114fe23deb8953635554f8aa597..b119fc088ccb196d9f952198ab8b788f8f52b7ba 100644 (file)
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -187,14 +187,14 @@ tablespace_list_append(const char *arg)
         */
        if (!is_absolute_path(cell->old_dir))
        {
-               fprintf(stderr, _("%s: old directory not absolute in tablespace mapping: %s\n"),
+               fprintf(stderr, _("%s: old directory is not an absolute path in tablespace mapping: %s\n"),
                                progname, cell->old_dir);
                exit(1);
        }
 
        if (!is_absolute_path(cell->new_dir))
        {
-               fprintf(stderr, _("%s: new directory not absolute in tablespace mapping: %s\n"),
+               fprintf(stderr, _("%s: new directory is not an absolute path in tablespace mapping: %s\n"),
                                progname, cell->new_dir);
                exit(1);
        }
@@ -676,7 +676,7 @@ parse_max_rate(char *src)
        if (*after_num != '\0')
        {
                fprintf(stderr,
-                               _("%s: invalid --max-rate units: \"%s\"\n"),
+                               _("%s: invalid --max-rate unit: \"%s\"\n"),
                                progname, suffix);
                exit(1);
        }

diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
index 194d10faa5c755976cf9a02857dcaab1e7eaef2f..2bd1ad4663044e9d7d15ad8e01301a9b10948e3a 100644 (file)
--- a/src/bin/pg_basebackup/pg_recvlogical.c
+++ b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -80,14 +80,14 @@ usage(void)
        printf(_("  -w, --no-password      never prompt for password\n"));
        printf(_("  -W, --password         force password prompt (should happen automatically)\n"));
        printf(_("\nReplication options:\n"));
-       printf(_("  -F  --fsync-interval=INTERVAL\n"
-                        "                         frequency of syncs to the output file (in seconds, defaults to 10)\n"));
+       printf(_("  -F  --fsync-interval=SECS\n"
+                        "                         frequency of syncs to the output file (default: %d)\n"), (fsync_interval / 1000));
        printf(_("  -o, --option=NAME[=VALUE]\n"
                         "                         Specify option NAME with optional value VALUE, to be passed\n"
                         "                         to the output plugin\n"));
-       printf(_("  -P, --plugin=PLUGIN    use output plugin PLUGIN (defaults to test_decoding)\n"));
-       printf(_("  -s, --status-interval=INTERVAL\n"
-                        "                         time between status packets sent to server (in seconds, defaults to 10)\n"));
+       printf(_("  -P, --plugin=PLUGIN    use output plugin PLUGIN (default: %s)\n"), plugin);
+       printf(_("  -s, --status-interval=SECS\n"
+                        "                         time between status packets sent to server (default: %d)\n"), (standby_message_timeout / 1000));
        printf(_("  -S, --slot=SLOT        use existing replication slot SLOT instead of starting a new one\n"));
        printf(_("  -I, --startpos=PTR     Where in an existing slot should the streaming start\n"));
        printf(_("\nAction to be performed:\n"));
@@ -253,7 +253,7 @@ StreamLog(void)
        res = PQexec(conn, query->data);
        if (PQresultStatus(res) != PGRES_COPY_BOTH)
        {
-               fprintf(stderr, _("%s: could not send replication command \"%s\": %s\n"),
+               fprintf(stderr, _("%s: could not send replication command \"%s\": %s"),
                                progname, query->data, PQresultErrorMessage(res));
                PQclear(res);
                goto error;
@@ -263,7 +263,7 @@ StreamLog(void)
 
        if (verbose)
                fprintf(stderr,
-                               _("%s: initiated streaming\n"),
+                               _("%s: streaming initiated\n"),
                                progname);
 
        while (!time_to_abort)
@@ -817,7 +817,7 @@ main(int argc, char **argv)
 
        if (do_drop_slot && (do_create_slot || do_start_slot))
        {
-               fprintf(stderr, _("%s: --stop cannot be combined with --init or --start\n"), progname);
+               fprintf(stderr, _("%s: cannot use --init or --start together with --stop\n"), progname);
                fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
                                progname);
                exit(1);
@@ -825,7 +825,7 @@ main(int argc, char **argv)
 
        if (startpos && (do_create_slot || do_drop_slot))
        {
-               fprintf(stderr, _("%s: --startpos cannot be combined with --init or --stop\n"), progname);
+               fprintf(stderr, _("%s: cannot use --init or --stop together with --startpos\n"), progname);
                fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
                                progname);
                exit(1);
@@ -895,7 +895,7 @@ main(int argc, char **argv)
                if (PQntuples(res) != 0 || PQnfields(res) != 0)
                {
                        fprintf(stderr,
-                                       _("%s: could not stop logical rep: got %d rows and %d fields, expected %d rows and %d fields\n"),
+                                       _("%s: could not stop logical replication: got %d rows and %d fields, expected %d rows and %d fields\n"),
                                        progname, PQntuples(res), PQnfields(res), 0, 0);
                        disconnect_and_exit(1);
                }
@@ -930,7 +930,7 @@ main(int argc, char **argv)
                if (PQntuples(res) != 1 || PQnfields(res) != 4)
                {
                        fprintf(stderr,
-                                       _("%s: could not init logical rep: got %d rows and %d fields, expected %d rows and %d fields\n"),
+                                       _("%s: could not init logical replication: got %d rows and %d fields, expected %d rows and %d fields\n"),
                                        progname, PQntuples(res), PQnfields(res), 1, 4);
                        disconnect_and_exit(1);
                }
@@ -965,14 +965,14 @@ main(int argc, char **argv)
                }
                else if (noloop)
                {
-                       fprintf(stderr, _("%s: disconnected.\n"), progname);
+                       fprintf(stderr, _("%s: disconnected\n"), progname);
                        exit(1);
                }
                else
                {
                        fprintf(stderr,
                        /* translator: check source for value for %d */
-                                       _("%s: disconnected. Waiting %d seconds to try again.\n"),
+                                       _("%s: disconnected; waiting %d seconds to try again\n"),
                                        progname, RECONNECT_SLEEP_TIME);
                        pg_usleep(RECONNECT_SLEEP_TIME * 1000000);
                }

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index e49cf445b374997ccf8acbef460f10aebcb81434..cede72a5d6cc18d9eb282dbc5784c1b6db641eec 100644 (file)
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -2552,7 +2552,7 @@ printPsetInfo(const char *param, struct printQueryOpt *popt)
                else if (popt->topt.pager == 2)
                        printf(_("Pager (%s) is always used.\n"), param);
                else
-                       printf(_("Pager (%s) usage is off.\n"), param);
+                       printf(_("Pager usage (%s) is off.\n"), param);
        }
 
        /* show record separator for unaligned text */
@@ -2576,7 +2576,7 @@ printPsetInfo(const char *param, struct printQueryOpt *popt)
        else if (strcmp(param, "T") == 0 || strcmp(param, "tableattr") == 0)
        {
                if (popt->topt.tableAttr)
-                       printf(_("Table attribute (%s) is \"%s\".\n"), param,
+                       printf(_("Table attributes (%s) are \"%s\".\n"), param,
                                   popt->topt.tableAttr);
                else
                        printf(_("Table attributes (%s) unset.\n"), param);