Skip to content

Commit 406473b

Browse files
peterepetere
committed
Put options on man page and in help output in slightly better order
1 parent 4faf074 commit 406473b

File tree

4 files changed

+42
-42
lines changed

4 files changed

+42
-42
lines changed

‎doc/src/sgml/ref/pg_basebackup.sgml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,17 @@ PostgreSQL documentation
188188
</listitem>
189189
</varlistentry>
190190

191+
<varlistentry>
192+
<term><option>-x</option></term>
193+
<term><option>--xlog</option></term>
194+
<listitem>
195+
<para>
196+
Using this option is equivalent of using <literal>-X</literal> with
197+
method <literal>fetch</literal>.
198+
</para>
199+
</listitem>
200+
</varlistentry>
201+
191202
<varlistentry>
192203
<term><option>-X <replaceable class="parameter">method</replaceable></option></term>
193204
<term><option>--xlog-method=<replaceable class="parameter">method</replaceable></option></term>
@@ -240,17 +251,6 @@ PostgreSQL documentation
240251
</listitem>
241252
</varlistentry>
242253

243-
<varlistentry>
244-
<term><option>-x</option></term>
245-
<term><option>--xlog</option></term>
246-
<listitem>
247-
<para>
248-
Using this option is equivalent of using <literal>-X</literal> with
249-
method <literal>fetch</literal>.
250-
</para>
251-
</listitem>
252-
</varlistentry>
253-
254254
<varlistentry>
255255
<term><option>-z</option></term>
256256
<term><option>--gzip</option></term>
@@ -344,20 +344,6 @@ PostgreSQL documentation
344344
The following command-line options control the database connection parameters.
345345

346346
<variablelist>
347-
<varlistentry>
348-
<term><option>-s <replaceable class="parameter">interval</replaceable></option></term>
349-
<term><option>--status-interval=<replaceable class="parameter">interval</replaceable></option></term>
350-
<listitem>
351-
<para>
352-
Specifies the number of seconds between status packets sent back to the
353-
server. This is required when streaming the transaction log (using
354-
<literal>--xlog=stream</literal>) if replication timeout is configured
355-
on the server, and allows for easier monitoring. A value of zero disables
356-
the status updates completely. The default value is 10 seconds.
357-
</para>
358-
</listitem>
359-
</varlistentry>
360-
361347
<varlistentry>
362348
<term><option>-h <replaceable class="parameter">host</replaceable></option></term>
363349
<term><option>--host=<replaceable class="parameter">host</replaceable></option></term>
@@ -385,6 +371,20 @@ PostgreSQL documentation
385371
</listitem>
386372
</varlistentry>
387373

374+
<varlistentry>
375+
<term><option>-s <replaceable class="parameter">interval</replaceable></option></term>
376+
<term><option>--status-interval=<replaceable class="parameter">interval</replaceable></option></term>
377+
<listitem>
378+
<para>
379+
Specifies the number of seconds between status packets sent back to the
380+
server. This is required when streaming the transaction log (using
381+
<literal>--xlog=stream</literal>) if replication timeout is configured
382+
on the server, and allows for easier monitoring. A value of zero disables
383+
the status updates completely. The default value is 10 seconds.
384+
</para>
385+
</listitem>
386+
</varlistentry>
387+
388388
<varlistentry>
389389
<term><option>-U <replaceable>username</replaceable></option></term>
390390
<term><option>--username=<replaceable class="parameter">username</replaceable></option></term>

‎doc/src/sgml/ref/pg_receivexlog.sgml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -122,19 +122,6 @@ PostgreSQL documentation
122122
The following command-line options control the database connection parameters.
123123

124124
<variablelist>
125-
<varlistentry>
126-
<term><option>-s <replaceable class="parameter">interval</replaceable></option></term>
127-
<term><option>--status-interval=<replaceable class="parameter">interval</replaceable></option></term>
128-
<listitem>
129-
<para>
130-
Specifies the number of seconds between status packets sent back to the
131-
server. This is required if replication timeout is configured on the
132-
server, and allows for easier monitoring. A value of zero disables the
133-
status updates completely. The default value is 10 seconds.
134-
</para>
135-
</listitem>
136-
</varlistentry>
137-
138125
<varlistentry>
139126
<term><option>-h <replaceable class="parameter">host</replaceable></option></term>
140127
<term><option>--host=<replaceable class="parameter">host</replaceable></option></term>
@@ -162,6 +149,19 @@ PostgreSQL documentation
162149
</listitem>
163150
</varlistentry>
164151

152+
<varlistentry>
153+
<term><option>-s <replaceable class="parameter">interval</replaceable></option></term>
154+
<term><option>--status-interval=<replaceable class="parameter">interval</replaceable></option></term>
155+
<listitem>
156+
<para>
157+
Specifies the number of seconds between status packets sent back to the
158+
server. This is required if replication timeout is configured on the
159+
server, and allows for easier monitoring. A value of zero disables the
160+
status updates completely. The default value is 10 seconds.
161+
</para>
162+
</listitem>
163+
</varlistentry>
164+
165165
<varlistentry>
166166
<term><option>-U <replaceable>username</replaceable></option></term>
167167
<term><option>--username=<replaceable class="parameter">username</replaceable></option></term>

‎src/bin/pg_basebackup/pg_basebackup.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ usage(void)
121121
printf(_(" -V, --version output version information, then exit\n"));
122122
printf(_(" -?, --help show this help, then exit\n"));
123123
printf(_("\nConnection options:\n"));
124-
printf(_(" -s, --status-interval=INTERVAL\n"
125-
" time between status packets sent to server (in seconds)\n"));
126124
printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));
127125
printf(_(" -p, --port=PORT database server port number\n"));
126+
printf(_(" -s, --status-interval=INTERVAL\n"
127+
" time between status packets sent to server (in seconds)\n"));
128128
printf(_(" -U, --username=NAME connect as specified database user\n"));
129129
printf(_(" -w, --no-password never prompt for password\n"));
130130
printf(_(" -W, --password force password prompt (should happen automatically)\n"));

‎src/bin/pg_basebackup/pg_receivexlog.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ usage(void)
6565
printf(_(" -V, --version output version information, then exit\n"));
6666
printf(_(" -?, --help show this help, then exit\n"));
6767
printf(_("\nConnection options:\n"));
68-
printf(_(" -s, --status-interval=INTERVAL\n"
69-
" time between status packets sent to server (in seconds)\n"));
7068
printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));
7169
printf(_(" -p, --port=PORT database server port number\n"));
70+
printf(_(" -s, --status-interval=INTERVAL\n"
71+
" time between status packets sent to server (in seconds)\n"));
7272
printf(_(" -U, --username=NAME connect as specified database user\n"));
7373
printf(_(" -w, --no-password never prompt for password\n"));
7474
printf(_(" -W, --password force password prompt (should happen automatically)\n"));

0 commit comments

Comments
 (0)