Put options on man page and in help output in slightly better order

diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml
index cec66559ce3bfe7260a86e807a8078704f6cf104..a951d6b0f043961b998b1c76851b9f6f3e6e22b0 100644 (file)
--- a/doc/src/sgml/ref/pg_basebackup.sgml
+++ b/doc/src/sgml/ref/pg_basebackup.sgml
@@ -188,6 +188,17 @@ PostgreSQL documentation
       
      
 
+     
+      -x
+      --xlog
+      
+       
+        Using this option is equivalent of using -X with
+        method fetch.
+       
+      
+     
+
      
       -X method
       --xlog-method=method
@@ -240,17 +251,6 @@ PostgreSQL documentation
       
      
 
-     
-      -x
-      --xlog
-      
-       
-        Using this option is equivalent of using -X with
-        method fetch.
-       
-      
-     
-
      
       -z
       --gzip
@@ -344,20 +344,6 @@ PostgreSQL documentation
     The following command-line options control the database connection parameters.
 
     
-     
-      -s interval
-      --status-interval=interval
-      
-       
-        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.
-       
-      
-     
-
      
       -h host
       --host=host
@@ -385,6 +371,20 @@ PostgreSQL documentation
       
      
 
+     
+      -s interval
+      --status-interval=interval
+      
+       
+        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.
+       
+      
+     
+
      
       -U username
       --username=username

diff --git a/doc/src/sgml/ref/pg_receivexlog.sgml b/doc/src/sgml/ref/pg_receivexlog.sgml
index 64cb81d2ef86e2d4ba5cbcc8b5909a93dd836637..7f62fd9e6156133e238d9c01a7efbcba78738114 100644 (file)
--- 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.
 
     
-     
-      -s interval
-      --status-interval=interval
-      
-       
-        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.
-       
-      
-     
-
      
       -h host
       --host=host
@@ -162,6 +149,19 @@ PostgreSQL documentation
       
      
 
+     
+      -s interval
+      --status-interval=interval
+      
+       
+        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.
+       
+      
+     
+
      
       -U username
       --username=username

diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 25f67da0e2566b8eb34375652a08c2780dadbe4f..4fe716cfd2d5332987c12b63d03e92a4785c38c6 100644 (file)
--- 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 3a30a1354034701ef6cdbb96b5a8b780cd83d786..4c01e9fa660bc33201e5fa31a3f223bfed26fb76 100644 (file)
--- 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"));