diff options
| -rw-r--r-- | doc/src/sgml/ref/pg_combinebackup.sgml | 2 | ||||
| -rw-r--r-- | src/bin/pg_combinebackup/pg_combinebackup.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/sgml/ref/pg_combinebackup.sgml b/doc/src/sgml/ref/pg_combinebackup.sgml index d1f70ba2358..375307d57bd 100644 --- a/doc/src/sgml/ref/pg_combinebackup.sgml +++ b/doc/src/sgml/ref/pg_combinebackup.sgml @@ -128,7 +128,7 @@ PostgreSQL documentation Relocates the tablespace in directory <replaceable>olddir</replaceable> to <replaceable>newdir</replaceable> during the backup. <replaceable>olddir</replaceable> is the absolute path of the tablespace - as it exists in the first backup specified on the command line, + as it exists in the final backup specified on the command line, and <replaceable>newdir</replaceable> is the absolute path to use for the tablespace in the reconstructed backup. If either path needs to contain an equal sign (<literal>=</literal>), precede that with a backslash. diff --git a/src/bin/pg_combinebackup/pg_combinebackup.c b/src/bin/pg_combinebackup/pg_combinebackup.c index 232ba5b0697..027a16a26ca 100644 --- a/src/bin/pg_combinebackup/pg_combinebackup.c +++ b/src/bin/pg_combinebackup/pg_combinebackup.c @@ -126,7 +126,7 @@ main(int argc, char *argv[]) {"dry-run", no_argument, NULL, 'n'}, {"no-sync", no_argument, NULL, 'N'}, {"output", required_argument, NULL, 'o'}, - {"tablespace-mapping", no_argument, NULL, 'T'}, + {"tablespace-mapping", required_argument, NULL, 'T'}, {"manifest-checksums", required_argument, NULL, 1}, {"no-manifest", no_argument, NULL, 2}, {"sync-method", required_argument, NULL, 3}, @@ -163,7 +163,7 @@ main(int argc, char *argv[]) opt.copy_method = COPY_METHOD_COPY; /* process command-line options */ - while ((c = getopt_long(argc, argv, "dnNPo:T:", + while ((c = getopt_long(argc, argv, "dnNo:T:", long_options, &optindex)) != -1) { switch (c) @@ -749,7 +749,7 @@ help(const char *progname) printf(_(" %s [OPTION]... DIRECTORY...\n"), progname); printf(_("\nOptions:\n")); printf(_(" -d, --debug generate lots of debugging output\n")); - printf(_(" -n, --dry-run don't actually do anything\n")); + printf(_(" -n, --dry-run do not actually do anything\n")); printf(_(" -N, --no-sync do not wait for changes to be written safely to disk\n")); printf(_(" -o, --output output directory\n")); printf(_(" -T, --tablespace-mapping=OLDDIR=NEWDIR\n" |