opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add missing serial commas

This commit is contained in:
Peter Eisentraut 2019-07-01 13:07:14 +02:00
parent c74d49d41c
commit 1b29e990e3
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/catalog/pg_proc.c
View File

@ -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.",

2
src/bin/pg_checksums/pg_checksums.c
View File

@ -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"));

2
src/bin/pg_dump/pg_dump.c
View File

@ -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);

2
src/bin/pg_dump/pg_dumpall.c
View File

@ -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);

2
src/bin/pg_dump/t/001_basic.pl
View File

@ -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'
);