Skip to content

Commit 2273a50

Browse files
peterepetere
committed
Realign some --help output to have better spacing between columns
1 parent 1d27dcf commit 2273a50

File tree

5 files changed

+134
-137
lines changed

5 files changed

+134
-137
lines changed

‎src/backend/main/main.c

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -275,53 +275,53 @@ help(const char *progname)
275275
printf(_("Usage:\n %s [OPTION]...\n\n"), progname);
276276
printf(_("Options:\n"));
277277
#ifdef USE_ASSERT_CHECKING
278-
printf(_(" -A 1|0 enable/disable run-time assert checking\n"));
278+
printf(_(" -A 1|0 enable/disable run-time assert checking\n"));
279279
#endif
280-
printf(_(" -B NBUFFERS number of shared buffers\n"));
281-
printf(_(" -c NAME=VALUE set run-time parameter\n"));
282-
printf(_(" -C NAME return run-time parameter\n"));
283-
printf(_(" -d 1-5 debugging level\n"));
284-
printf(_(" -D DATADIR database directory\n"));
285-
printf(_(" -e use European date input format (DMY)\n"));
286-
printf(_(" -F turn fsync off\n"));
287-
printf(_(" -h HOSTNAME host name or IP address to listen on\n"));
288-
printf(_(" -i enable TCP/IP connections\n"));
289-
printf(_(" -k DIRECTORY Unix-domain socket location\n"));
280+
printf(_(" -B NBUFFERS number of shared buffers\n"));
281+
printf(_(" -c NAME=VALUE set run-time parameter\n"));
282+
printf(_(" -C NAME return run-time parameter\n"));
283+
printf(_(" -d 1-5 debugging level\n"));
284+
printf(_(" -D DATADIR database directory\n"));
285+
printf(_(" -e use European date input format (DMY)\n"));
286+
printf(_(" -F turn fsync off\n"));
287+
printf(_(" -h HOSTNAME host name or IP address to listen on\n"));
288+
printf(_(" -i enable TCP/IP connections\n"));
289+
printf(_(" -k DIRECTORY Unix-domain socket location\n"));
290290
#ifdef USE_SSL
291-
printf(_(" -l enable SSL connections\n"));
291+
printf(_(" -l enable SSL connections\n"));
292292
#endif
293-
printf(_(" -N MAX-CONNECT maximum number of allowed connections\n"));
294-
printf(_(" -o OPTIONS pass \"OPTIONS\" to each server process (obsolete)\n"));
295-
printf(_(" -p PORT port number to listen on\n"));
296-
printf(_(" -s show statistics after each query\n"));
297-
printf(_(" -S WORK-MEM set amount of memory for sorts (in kB)\n"));
298-
printf(_(" --NAME=VALUE set run-time parameter\n"));
293+
printf(_(" -N MAX-CONNECT maximum number of allowed connections\n"));
294+
printf(_(" -o OPTIONS pass \"OPTIONS\" to each server process (obsolete)\n"));
295+
printf(_(" -p PORT port number to listen on\n"));
296+
printf(_(" -s show statistics after each query\n"));
297+
printf(_(" -S WORK-MEM set amount of memory for sorts (in kB)\n"));
298+
printf(_(" --NAME=VALUE set run-time parameter\n"));
299299
printf(_(" --describe-config describe configuration parameters, then exit\n"));
300-
printf(_(" --help show this help, then exit\n"));
301-
printf(_(" --version output version information, then exit\n"));
300+
printf(_(" --help show this help, then exit\n"));
301+
printf(_(" --version output version information, then exit\n"));
302302

303303
printf(_("\nDeveloper options:\n"));
304-
printf(_(" -f s|i|n|m|h forbid use of some plan types\n"));
305-
printf(_(" -n do not reinitialize shared memory after abnormal exit\n"));
306-
printf(_(" -O allow system table structure changes\n"));
307-
printf(_(" -P disable system indexes\n"));
308-
printf(_(" -t pa|pl|ex show timings after each query\n"));
309-
printf(_(" -T send SIGSTOP to all backend processes if one dies\n"));
310-
printf(_(" -W NUM wait NUM seconds to allow attach from a debugger\n"));
304+
printf(_(" -f s|i|n|m|h forbid use of some plan types\n"));
305+
printf(_(" -n do not reinitialize shared memory after abnormal exit\n"));
306+
printf(_(" -O allow system table structure changes\n"));
307+
printf(_(" -P disable system indexes\n"));
308+
printf(_(" -t pa|pl|ex show timings after each query\n"));
309+
printf(_(" -T send SIGSTOP to all backend processes if one dies\n"));
310+
printf(_(" -W NUM wait NUM seconds to allow attach from a debugger\n"));
311311

312312
printf(_("\nOptions for single-user mode:\n"));
313-
printf(_(" --single selects single-user mode (must be first argument)\n"));
314-
printf(_(" DBNAME database name (defaults to user name)\n"));
315-
printf(_(" -d 0-5 override debugging level\n"));
316-
printf(_(" -E echo statement before execution\n"));
317-
printf(_(" -j do not use newline as interactive query delimiter\n"));
318-
printf(_(" -r FILENAME send stdout and stderr to given file\n"));
313+
printf(_(" --single selects single-user mode (must be first argument)\n"));
314+
printf(_(" DBNAME database name (defaults to user name)\n"));
315+
printf(_(" -d 0-5 override debugging level\n"));
316+
printf(_(" -E echo statement before execution\n"));
317+
printf(_(" -j do not use newline as interactive query delimiter\n"));
318+
printf(_(" -r FILENAME send stdout and stderr to given file\n"));
319319

320320
printf(_("\nOptions for bootstrapping mode:\n"));
321-
printf(_(" --boot selects bootstrapping mode (must be first argument)\n"));
322-
printf(_(" DBNAME database name (mandatory argument in bootstrapping mode)\n"));
323-
printf(_(" -r FILENAME send stdout and stderr to given file\n"));
324-
printf(_(" -x NUM internal use\n"));
321+
printf(_(" --boot selects bootstrapping mode (must be first argument)\n"));
322+
printf(_(" DBNAME database name (mandatory argument in bootstrapping mode)\n"));
323+
printf(_(" -r FILENAME send stdout and stderr to given file\n"));
324+
printf(_(" -x NUM internal use\n"));
325325

326326
printf(_("\nPlease read the documentation for the complete list of run-time\n"
327327
"configuration settings and how to set them on the command line or in\n"

‎src/bin/pg_dump/pg_dump.c

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -783,46 +783,46 @@ help(const char *progname)
783783
printf(_(" %s [OPTION]... [DBNAME]\n"), progname);
784784

785785
printf(_("\nGeneral options:\n"));
786-
printf(_(" -f, --file=FILENAME output file or directory name\n"));
787-
printf(_(" -F, --format=c|d|t|p output file format (custom, directory, tar,\n"
788-
" plain text (default))\n"));
789-
printf(_(" -v, --verbose verbose mode\n"));
790-
printf(_(" -Z, --compress=0-9 compression level for compressed formats\n"));
791-
printf(_(" --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n"));
792-
printf(_(" --help show this help, then exit\n"));
793-
printf(_(" --version output version information, then exit\n"));
786+
printf(_(" -f, --file=FILENAME output file or directory name\n"));
787+
printf(_(" -F, --format=c|d|t|p output file format (custom, directory, tar,\n"
788+
" plain text (default))\n"));
789+
printf(_(" -v, --verbose verbose mode\n"));
790+
printf(_(" -Z, --compress=0-9 compression level for compressed formats\n"));
791+
printf(_(" --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n"));
792+
printf(_(" --help show this help, then exit\n"));
793+
printf(_(" --version output version information, then exit\n"));
794794

795795
printf(_("\nOptions controlling the output content:\n"));
796-
printf(_(" -a, --data-only dump only the data, not the schema\n"));
797-
printf(_(" -b, --blobs include large objects in dump\n"));
798-
printf(_(" -c, --clean clean (drop) database objects before recreating\n"));
799-
printf(_(" -C, --create include commands to create database in dump\n"));
800-
printf(_(" -E, --encoding=ENCODING dump the data in encoding ENCODING\n"));
801-
printf(_(" -n, --schema=SCHEMA dump the named schema(s) only\n"));
802-
printf(_(" -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n"));
803-
printf(_(" -o, --oids include OIDs in dump\n"));
804-
printf(_(" -O, --no-owner skip restoration of object ownership in\n"
805-
" plain-text format\n"));
806-
printf(_(" -s, --schema-only dump only the schema, no data\n"));
807-
printf(_(" -S, --superuser=NAME superuser user name to use in plain-text format\n"));
808-
printf(_(" -t, --table=TABLE dump the named table(s) only\n"));
809-
printf(_(" -T, --exclude-table=TABLE do NOT dump the named table(s)\n"));
810-
printf(_(" -x, --no-privileges do not dump privileges (grant/revoke)\n"));
811-
printf(_(" --binary-upgrade for use by upgrade utilities only\n"));
812-
printf(_(" --column-inserts dump data as INSERT commands with column names\n"));
813-
printf(_(" --disable-dollar-quoting disable dollar quoting, use SQL standard quoting\n"));
814-
printf(_(" --disable-triggers disable triggers during data-only restore\n"));
815-
printf(_(" --exclude-table-data=TABLE do NOT dump data for the named table(s)\n"));
816-
printf(_(" --inserts dump data as INSERT commands, rather than COPY\n"));
817-
printf(_(" --no-security-labels do not dump security label assignments\n"));
818-
printf(_(" --no-tablespaces do not dump tablespace assignments\n"));
819-
printf(_(" --no-unlogged-table-data do not dump unlogged table data\n"));
820-
printf(_(" --quote-all-identifiers quote all identifiers, even if not key words\n"));
821-
printf(_(" --section=SECTION dump named section (pre-data, data, or post-data)\n"));
822-
printf(_(" --serializable-deferrable wait until the dump can run without anomalies\n"));
796+
printf(_(" -a, --data-only dump only the data, not the schema\n"));
797+
printf(_(" -b, --blobs include large objects in dump\n"));
798+
printf(_(" -c, --clean clean (drop) database objects before recreating\n"));
799+
printf(_(" -C, --create include commands to create database in dump\n"));
800+
printf(_(" -E, --encoding=ENCODING dump the data in encoding ENCODING\n"));
801+
printf(_(" -n, --schema=SCHEMA dump the named schema(s) only\n"));
802+
printf(_(" -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n"));
803+
printf(_(" -o, --oids include OIDs in dump\n"));
804+
printf(_(" -O, --no-owner skip restoration of object ownership in\n"
805+
" plain-text format\n"));
806+
printf(_(" -s, --schema-only dump only the schema, no data\n"));
807+
printf(_(" -S, --superuser=NAME superuser user name to use in plain-text format\n"));
808+
printf(_(" -t, --table=TABLE dump the named table(s) only\n"));
809+
printf(_(" -T, --exclude-table=TABLE do NOT dump the named table(s)\n"));
810+
printf(_(" -x, --no-privileges do not dump privileges (grant/revoke)\n"));
811+
printf(_(" --binary-upgrade for use by upgrade utilities only\n"));
812+
printf(_(" --column-inserts dump data as INSERT commands with column names\n"));
813+
printf(_(" --disable-dollar-quoting disable dollar quoting, use SQL standard quoting\n"));
814+
printf(_(" --disable-triggers disable triggers during data-only restore\n"));
815+
printf(_(" --exclude-table-data=TABLE do NOT dump data for the named table(s)\n"));
816+
printf(_(" --inserts dump data as INSERT commands, rather than COPY\n"));
817+
printf(_(" --no-security-labels do not dump security label assignments\n"));
818+
printf(_(" --no-tablespaces do not dump tablespace assignments\n"));
819+
printf(_(" --no-unlogged-table-data do not dump unlogged table data\n"));
820+
printf(_(" --quote-all-identifiers quote all identifiers, even if not key words\n"));
821+
printf(_(" --section=SECTION dump named section (pre-data, data, or post-data)\n"));
822+
printf(_(" --serializable-deferrable wait until the dump can run without anomalies\n"));
823823
printf(_(" --use-set-session-authorization\n"
824-
" use SET SESSION AUTHORIZATION commands instead of\n"
825-
" ALTER OWNER commands to set ownership\n"));
824+
" use SET SESSION AUTHORIZATION commands instead of\n"
825+
" ALTER OWNER commands to set ownership\n"));
826826

827827
printf(_("\nConnection options:\n"));
828828
printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));

‎src/bin/pg_dump/pg_dumpall.c

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -537,33 +537,33 @@ help(void)
537537
printf(_(" %s [OPTION]...\n"), progname);
538538

539539
printf(_("\nGeneral options:\n"));
540-
printf(_(" -f, --file=FILENAME output file name\n"));
541-
printf(_(" --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n"));
542-
printf(_(" --help show this help, then exit\n"));
543-
printf(_(" --version output version information, then exit\n"));
540+
printf(_(" -f, --file=FILENAME output file name\n"));
541+
printf(_(" --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n"));
542+
printf(_(" --help show this help, then exit\n"));
543+
printf(_(" --version output version information, then exit\n"));
544544
printf(_("\nOptions controlling the output content:\n"));
545-
printf(_(" -a, --data-only dump only the data, not the schema\n"));
546-
printf(_(" -c, --clean clean (drop) databases before recreating\n"));
547-
printf(_(" -g, --globals-only dump only global objects, no databases\n"));
548-
printf(_(" -o, --oids include OIDs in dump\n"));
549-
printf(_(" -O, --no-owner skip restoration of object ownership\n"));
550-
printf(_(" -r, --roles-only dump only roles, no databases or tablespaces\n"));
551-
printf(_(" -s, --schema-only dump only the schema, no data\n"));
552-
printf(_(" -S, --superuser=NAME superuser user name to use in the dump\n"));
553-
printf(_(" -t, --tablespaces-only dump only tablespaces, no databases or roles\n"));
554-
printf(_(" -x, --no-privileges do not dump privileges (grant/revoke)\n"));
555-
printf(_(" --binary-upgrade for use by upgrade utilities only\n"));
556-
printf(_(" --column-inserts dump data as INSERT commands with column names\n"));
557-
printf(_(" --disable-dollar-quoting disable dollar quoting, use SQL standard quoting\n"));
558-
printf(_(" --disable-triggers disable triggers during data-only restore\n"));
559-
printf(_(" --inserts dump data as INSERT commands, rather than COPY\n"));
560-
printf(_(" --no-security-labels do not dump security label assignments\n"));
561-
printf(_(" --no-tablespaces do not dump tablespace assignments\n"));
562-
printf(_(" --no-unlogged-table-data do not dump unlogged table data\n"));
563-
printf(_(" --quote-all-identifiers quote all identifiers, even if not key words\n"));
545+
printf(_(" -a, --data-only dump only the data, not the schema\n"));
546+
printf(_(" -c, --clean clean (drop) databases before recreating\n"));
547+
printf(_(" -g, --globals-only dump only global objects, no databases\n"));
548+
printf(_(" -o, --oids include OIDs in dump\n"));
549+
printf(_(" -O, --no-owner skip restoration of object ownership\n"));
550+
printf(_(" -r, --roles-only dump only roles, no databases or tablespaces\n"));
551+
printf(_(" -s, --schema-only dump only the schema, no data\n"));
552+
printf(_(" -S, --superuser=NAME superuser user name to use in the dump\n"));
553+
printf(_(" -t, --tablespaces-only dump only tablespaces, no databases or roles\n"));
554+
printf(_(" -x, --no-privileges do not dump privileges (grant/revoke)\n"));
555+
printf(_(" --binary-upgrade for use by upgrade utilities only\n"));
556+
printf(_(" --column-inserts dump data as INSERT commands with column names\n"));
557+
printf(_(" --disable-dollar-quoting disable dollar quoting, use SQL standard quoting\n"));
558+
printf(_(" --disable-triggers disable triggers during data-only restore\n"));
559+
printf(_(" --inserts dump data as INSERT commands, rather than COPY\n"));
560+
printf(_(" --no-security-labels do not dump security label assignments\n"));
561+
printf(_(" --no-tablespaces do not dump tablespace assignments\n"));
562+
printf(_(" --no-unlogged-table-data do not dump unlogged table data\n"));
563+
printf(_(" --quote-all-identifiers quote all identifiers, even if not key words\n"));
564564
printf(_(" --use-set-session-authorization\n"
565-
" use SET SESSION AUTHORIZATION commands instead of\n"
566-
" ALTER OWNER commands to set ownership\n"));
565+
" use SET SESSION AUTHORIZATION commands instead of\n"
566+
" ALTER OWNER commands to set ownership\n"));
567567

568568
printf(_("\nConnection options:\n"));
569569
printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy