From 406473b152338a015ad7e222f92b9b885f277fe8 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 24 Aug 2012 00:06:59 -0400 Subject: [PATCH] Put options on man page and in help output in slightly better order --- doc/src/sgml/ref/pg_basebackup.sgml | 50 +++++++++++++------------- doc/src/sgml/ref/pg_receivexlog.sgml | 26 +++++++------- src/bin/pg_basebackup/pg_basebackup.c | 4 +-- src/bin/pg_basebackup/pg_receivexlog.c | 4 +-- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml index cec66559ce..a951d6b0f0 100644 --- a/doc/src/sgml/ref/pg_basebackup.sgml +++ b/doc/src/sgml/ref/pg_basebackup.sgml @@ -188,6 +188,17 @@ PostgreSQL documentation + + + + + + Using this option is equivalent of using -X with + method fetch. + + + + @@ -240,17 +251,6 @@ PostgreSQL documentation - - - - - - Using this option is equivalent of using -X with - method fetch. - - - - @@ -344,20 +344,6 @@ PostgreSQL documentation The following command-line options control the database connection parameters. - - - - - - Specifies the number of seconds between status packets sent back to the - server. This is required when streaming the transaction log (using - --xlog=stream) if replication timeout is configured - on the server, and allows for easier monitoring. A value of zero disables - the status updates completely. The default value is 10 seconds. - - - - @@ -385,6 +371,20 @@ PostgreSQL documentation + + + + + + Specifies the number of seconds between status packets sent back to the + server. This is required when streaming the transaction log (using + --xlog=stream) if replication timeout is configured + on the server, and allows for easier monitoring. A value of zero disables + the status updates completely. The default value is 10 seconds. + + + + diff --git a/doc/src/sgml/ref/pg_receivexlog.sgml b/doc/src/sgml/ref/pg_receivexlog.sgml index 64cb81d2ef..7f62fd9e61 100644 --- a/doc/src/sgml/ref/pg_receivexlog.sgml +++ b/doc/src/sgml/ref/pg_receivexlog.sgml @@ -122,19 +122,6 @@ PostgreSQL documentation The following command-line options control the database connection parameters. - - - - - - Specifies the number of seconds between status packets sent back to the - server. This is required if replication timeout is configured on the - server, and allows for easier monitoring. A value of zero disables the - status updates completely. The default value is 10 seconds. - - - - @@ -162,6 +149,19 @@ PostgreSQL documentation + + + + + + Specifies the number of seconds between status packets sent back to the + server. This is required if replication timeout is configured on the + server, and allows for easier monitoring. A value of zero disables the + status updates completely. The default value is 10 seconds. + + + + diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index 25f67da0e2..4fe716cfd2 100644 --- a/src/bin/pg_basebackup/pg_basebackup.c +++ b/src/bin/pg_basebackup/pg_basebackup.c @@ -121,10 +121,10 @@ usage(void) printf(_(" -V, --version output version information, then exit\n")); printf(_(" -?, --help show this help, then exit\n")); printf(_("\nConnection options:\n")); - printf(_(" -s, --status-interval=INTERVAL\n" - " time between status packets sent to server (in seconds)\n")); printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); printf(_(" -p, --port=PORT database server port number\n")); + printf(_(" -s, --status-interval=INTERVAL\n" + " time between status packets sent to server (in seconds)\n")); printf(_(" -U, --username=NAME connect as specified database user\n")); printf(_(" -w, --no-password never prompt for password\n")); printf(_(" -W, --password force password prompt (should happen automatically)\n")); diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c index 3a30a13540..4c01e9fa66 100644 --- a/src/bin/pg_basebackup/pg_receivexlog.c +++ b/src/bin/pg_basebackup/pg_receivexlog.c @@ -65,10 +65,10 @@ usage(void) printf(_(" -V, --version output version information, then exit\n")); printf(_(" -?, --help show this help, then exit\n")); printf(_("\nConnection options:\n")); - printf(_(" -s, --status-interval=INTERVAL\n" - " time between status packets sent to server (in seconds)\n")); printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); printf(_(" -p, --port=PORT database server port number\n")); + printf(_(" -s, --status-interval=INTERVAL\n" + " time between status packets sent to server (in seconds)\n")); printf(_(" -U, --username=NAME connect as specified database user\n")); printf(_(" -w, --no-password never prompt for password\n")); printf(_(" -W, --password force password prompt (should happen automatically)\n")); -- 2.40.0