Add missing serial commas

diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index 002584b9416f168b5fa5918ce1a7751b13149dc4..02b7fdd49435b5a25c00226a9518341cd73bfc7f 100644 (file)
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -425,7 +425,7 @@ ProcedureCreate(const char *procedureName,
                     : errmsg("cannot change return type of existing function"),
 
            /*
-            * translator: first %s is DROP FUNCTION, DROP PROCEDURE or DROP
+            * translator: first %s is DROP FUNCTION, DROP PROCEDURE, or DROP
             * AGGREGATE
             */
                     errhint("Use %s %s first.",

diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c
index b8e7c32dba72307b978006eda190c2c4c66db90a..b591fcc864a674018a59656ca23fd368505d7615 100644 (file)
--- a/src/bin/pg_checksums/pg_checksums.c
+++ b/src/bin/pg_checksums/pg_checksums.c
@@ -72,7 +72,7 @@ static pg_time_t last_progress_report = 0;
 static void
 usage(void)
 {
-   printf(_("%s enables, disables or verifies data checksums in a PostgreSQL database cluster.\n\n"), progname);
+   printf(_("%s enables, disables, or verifies data checksums in a PostgreSQL database cluster.\n\n"), progname);
    printf(_("Usage:\n"));
    printf(_("  %s [OPTION]... [DATADIR]\n"), progname);
    printf(_("\nOptions:\n"));

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 8909a45d618d3170d59e7faae50d238bff0887ef..b07d58c4a8f26599f1dcc7694d73272244ed2d08 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -662,7 +662,7 @@ main(int argc, char **argv)
     * --rows-per-insert were specified.
     */
    if (dopt.do_nothing && dopt.dump_inserts == 0)
-       fatal("option --on-conflict-do-nothing requires option --inserts, --rows-per-insert or --column-inserts");
+       fatal("option --on-conflict-do-nothing requires option --inserts, --rows-per-insert, or --column-inserts");
 
    /* Identify archive format to emit */
    archiveFormat = parseArchiveFormat(format, &archiveMode);

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 24719cefe28ac193d46bc0fb7e4e7f6b05e33639..66e0a610ab75d5b4a8f1406af5a383475e30f27e 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -354,7 +354,7 @@ main(int argc, char *argv[])
    if (database_exclude_patterns.head != NULL &&
        (globals_only || roles_only || tablespaces_only))
    {
-       pg_log_error("option --exclude-database cannot be used together with -g/--globals-only, -r/--roles-only or -t/--tablespaces-only");
+       pg_log_error("option --exclude-database cannot be used together with -g/--globals-only, -r/--roles-only, or -t/--tablespaces-only");
        fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
                progname);
        exit_nicely(1);

diff --git a/src/bin/pg_dump/t/001_basic.pl b/src/bin/pg_dump/t/001_basic.pl
index 049d5e43f2fdc55ec55f7db8c60107e92a704079..9ca8a8e60880d139e79372d8b00c0e7d1bce90d0 100644 (file)
--- a/src/bin/pg_dump/t/001_basic.pl
+++ b/src/bin/pg_dump/t/001_basic.pl
@@ -123,7 +123,7 @@ command_fails_like(
 
 command_fails_like(
    [ 'pg_dump', '--on-conflict-do-nothing' ],
-   qr/pg_dump: error: option --on-conflict-do-nothing requires option --inserts, --rows-per-insert or --column-inserts/,
+   qr/pg_dump: error: option --on-conflict-do-nothing requires option --inserts, --rows-per-insert, or --column-inserts/,
    'pg_dump: --on-conflict-do-nothing requires --inserts, --rows-per-insert, --column-inserts'
 );