diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml
index fc1edf4864..05cab862b7 100644
--- a/doc/src/sgml/ref/pg_basebackup.sgml
+++ b/doc/src/sgml/ref/pg_basebackup.sgml
@@ -486,6 +486,18 @@ PostgreSQL documentation
+
+
+
+
+
+ Enables verbose mode. Will output some extra steps during startup and
+ shutdown, as well as show the exact file name that is currently being
+ processed if progress reporting is also enabled.
+
+
+
+
@@ -507,33 +519,20 @@ PostgreSQL documentation
-
Disables verification of checksums, if they are enabled on the server
- the base backup is taken from.
+ the base backup is taken from.
- By default, checksums are verified and checksum failures will result in
- a non-zero exit status. However, the base backup will not be removed in
- this case, as if the --no-clean option was used.
+ By default, checksums are verified and checksum failures will result
+ in a non-zero exit status. However, the base backup will not be
+ removed in such a case, as if the option
+ had been used.
-
-
-
-
-
-
- Enables verbose mode. Will output some extra steps during startup and
- shutdown, as well as show the exact file name that is currently being
- processed if progress reporting is also enabled.
-
-
-
-
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index fb5b51d6be..ef4cfc4384 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -363,11 +363,11 @@ usage(void)
printf(_(" -N, --no-sync do not wait for changes to be written safely to disk\n"));
printf(_(" -P, --progress show progress information\n"));
printf(_(" -S, --slot=SLOTNAME replication slot to use\n"));
- printf(_(" --no-slot prevent creation of temporary replication slot\n"));
- printf(_(" -k, --no-verify-checksums\n"
- " do not verify checksums\n"));
printf(_(" -v, --verbose output verbose messages\n"));
printf(_(" -V, --version output version information, then exit\n"));
+ printf(_(" --no-slot prevent creation of temporary replication slot\n"));
+ printf(_(" --no-verify-checksums\n"
+ " do not verify checksums\n"));
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\nConnection options:\n"));
printf(_(" -d, --dbname=CONNSTR connection string\n"));
@@ -2159,7 +2159,7 @@ main(int argc, char **argv)
{"progress", no_argument, NULL, 'P'},
{"waldir", required_argument, NULL, 1},
{"no-slot", no_argument, NULL, 2},
- {"no-verify-checksums", no_argument, NULL, 'k'},
+ {"no-verify-checksums", no_argument, NULL, 3},
{NULL, 0, NULL, 0}
};
int c;
@@ -2328,7 +2328,7 @@ main(int argc, char **argv)
case 'P':
showprogress = true;
break;
- case 'k':
+ case 3:
verify_checksums = false;
break;
default:
diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
index 6b2e0286c4..aab2e1eecf 100644
--- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl
+++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
@@ -552,7 +552,7 @@ rmtree("$tempdir/backup_corrupt3");
# do not verify checksums, should return ok
$node->command_ok(
- [ 'pg_basebackup', '-D', "$tempdir/backup_corrupt4", '-k' ],
+ [ 'pg_basebackup', '-D', "$tempdir/backup_corrupt4", '--no-verify-checksums' ],
'pg_basebackup with -k does not report checksum mismatch');
rmtree("$tempdir/backup_corrupt4");