Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5878a37

Browse files
committed
Review program help output for wording and formatting
1 parent4f3b2a8 commit5878a37

File tree

10 files changed

+19
-16
lines changed

10 files changed

+19
-16
lines changed

‎src/bin/pg_basebackup/pg_receivexlog.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ usage(void)
6767
printf(_(" %s [OPTION]...\n"),progname);
6868
printf(_("\nOptions:\n"));
6969
printf(_(" -D, --directory=DIR receive transaction log files into this directory\n"));
70-
printf(_(" --if-not-exists do nottreat naming conflicts as an error when creating a slot\n"));
70+
printf(_(" --if-not-exists do noterror if slot already exists when creating a slot\n"));
7171
printf(_(" -n, --no-loop do not loop on connection lost\n"));
7272
printf(_(" -s, --status-interval=SECS\n"
7373
" time between status packets sent to server (default: %d)\n"), (standby_message_timeout /1000));

‎src/bin/pg_basebackup/pg_recvlogical.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ usage(void)
7676
printf(_(" -f, --file=FILE receive log into this file, - for stdout\n"));
7777
printf(_(" -F --fsync-interval=SECS\n"
7878
" time between fsyncs to the output file (default: %d)\n"), (fsync_interval /1000));
79-
printf(_(" --if-not-exists do nottreat naming conflicts as an error when creating a slot\n"));
79+
printf(_(" --if-not-exists do noterror if slot already exists when creating a slot\n"));
8080
printf(_(" -I, --startpos=LSN where in an existing slot should the streaming start\n"));
8181
printf(_(" -n, --no-loop do not loop on connection lost\n"));
8282
printf(_(" -o, --option=NAME[=VALUE]\n"

‎src/bin/pg_controldata/pg_controldata.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ usage(const char *progname)
3434
{
3535
printf(_("%s displays control information of a PostgreSQL database cluster.\n\n"),progname);
3636
printf(_("Usage:\n"));
37-
printf(_(" %s [OPTION] [[-D]DATADIR]\n"),progname);
37+
printf(_(" %s [OPTION] [DATADIR]\n"),progname);
3838
printf(_("\nOptions:\n"));
39+
printf(_(" [-D] DATADIR data directory\n"));
3940
printf(_(" -V, --version output version information, then exit\n"));
4041
printf(_(" -?, --help show this help, then exit\n"));
4142
printf(_("\nIf no data directory (DATADIR) is specified, "

‎src/bin/pg_dump/pg_dump.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,8 @@ help(const char *progname)
904904
printf(_(" --column-inserts dump data as INSERT commands with column names\n"));
905905
printf(_(" --disable-dollar-quoting disable dollar quoting, use SQL standard quoting\n"));
906906
printf(_(" --disable-triggers disable triggers during data-only restore\n"));
907-
printf(_(" --enable-row-security enable row level security\n"));
907+
printf(_(" --enable-row-security enable row security (dump only content user has\n"
908+
" access to)\n"));
908909
printf(_(" --exclude-table-data=TABLE do NOT dump data for the named table(s)\n"));
909910
printf(_(" --if-exists use IF EXISTS when dropping objects\n"));
910911
printf(_(" --inserts dump data as INSERT commands, rather than COPY\n"));

‎src/bin/pg_dump/pg_restore.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ usage(const char *progname)
463463
printf(_(" -x, --no-privileges skip restoration of access privileges (grant/revoke)\n"));
464464
printf(_(" -1, --single-transaction restore as a single transaction\n"));
465465
printf(_(" --disable-triggers disable triggers during data-only restore\n"));
466-
printf(_(" --enable-row-security enable rowlevelsecurity\n"));
466+
printf(_(" --enable-row-security enable row security\n"));
467467
printf(_(" --if-exists use IF EXISTS when dropping objects\n"));
468468
printf(_(" --no-data-for-failed-tables do not restore data of tables that could not be\n"
469469
" created\n"));

‎src/bin/pg_resetxlog/pg_resetxlog.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1165,10 +1165,11 @@ static void
11651165
usage(void)
11661166
{
11671167
printf(_("%s resets the PostgreSQL transaction log.\n\n"),progname);
1168-
printf(_("Usage:\n %s [OPTION]...{[-D]DATADIR}\n\n"),progname);
1168+
printf(_("Usage:\n %s [OPTION]... DATADIR\n\n"),progname);
11691169
printf(_("Options:\n"));
11701170
printf(_(" -c XID,XID set oldest and newest transactions bearing commit timestamp\n"));
11711171
printf(_(" (zero in either value means no change)\n"));
1172+
printf(_(" [-D] DATADIR data directory\n"));
11721173
printf(_(" -e XIDEPOCH set next transaction ID epoch\n"));
11731174
printf(_(" -f force update to be done\n"));
11741175
printf(_(" -l XLOGFILE force minimum WAL starting location for new transaction log\n"));

‎src/bin/pg_rewind/pg_rewind.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ usage(const char *progname)
6060
printf(_("Usage:\n %s [OPTION]...\n\n"),progname);
6161
printf(_("Options:\n"));
6262
printf(_(" -D, --target-pgdata=DIRECTORY existing data directory to modify\n"));
63-
printf(_(" --source-pgdata=DIRECTORY source data directory tosync with\n"));
64-
printf(_(" --source-server=CONNSTR source server tosync with\n"));
63+
printf(_(" --source-pgdata=DIRECTORY source data directory tosynchronize with\n"));
64+
printf(_(" --source-server=CONNSTR source server tosynchronize with\n"));
6565
printf(_(" -n, --dry-run stop before modifying anything\n"));
6666
printf(_(" -P, --progress write progress messages\n"));
6767
printf(_(" --debug write a lot of debug messages\n"));

‎src/bin/pgbench/pgbench.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,7 @@ usage(void)
373373
" -f, --file=FILENAME read transaction script from FILENAME\n"
374374
" -j, --jobs=NUM number of threads (default: 1)\n"
375375
" -l, --log write transaction times to log file\n"
376-
" -L, --latency-limit=NUM count transactions lasting more than NUM ms\n"
377-
" as late.\n"
376+
" -L, --latency-limit=NUM count transactions lasting more than NUM ms as late\n"
378377
" -M, --protocol=simple|extended|prepared\n"
379378
" protocol for submitting queries (default: simple)\n"
380379
" -n, --no-vacuum do not run VACUUM before tests\n"

‎src/bin/psql/help.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,15 @@ usage(unsigned short int pager)
8585
fprintf(output,_(" -f, --file=FILENAME execute commands from file, then exit\n"));
8686
fprintf(output,_(" -l, --list list available databases, then exit\n"));
8787
fprintf(output,_(" -v, --set=, --variable=NAME=VALUE\n"
88-
" set psql variable NAME to VALUE e.g.: -v ON_ERROR_STOP=1\n"));
88+
" set psql variable NAME to VALUE\n"
89+
" (e.g., -v ON_ERROR_STOP=1)\n"));
8990
fprintf(output,_(" -V, --version output version information, then exit\n"));
9091
fprintf(output,_(" -X, --no-psqlrc do not read startup file (~/.psqlrc)\n"));
9192
fprintf(output,_(" -1 (\"one\"), --single-transaction\n"
9293
" execute as a single transaction (if non-interactive)\n"));
9394
fprintf(output,_(" -?, --help[=options] show this help, then exit\n"));
94-
fprintf(output,_(" --help=variablesshow alistof all specially treated variables, then exit\n"));
95-
fprintf(output,_(" --help=commands show alistof backslash commands, then exit\n"));
95+
fprintf(output,_(" --help=commandslistbackslash commands, then exit\n"));
96+
fprintf(output,_(" --help=variables listspecial variables, then exit\n"));
9697

9798
fprintf(output,_("\nInput and output options:\n"));
9899
fprintf(output,_(" -a, --echo-all echo all input from script\n"));

‎src/bin/scripts/vacuumdb.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -936,15 +936,15 @@ help(const char *progname)
936936
printf(_(" -e, --echo show the commands being sent to the server\n"));
937937
printf(_(" -f, --full do full vacuuming\n"));
938938
printf(_(" -F, --freeze freeze row transaction information\n"));
939+
printf(_(" -j, --jobs=NUM use this many concurrent connections to vacuum\n"));
939940
printf(_(" -q, --quiet don't write any messages\n"));
940941
printf(_(" -t, --table='TABLE[(COLUMNS)]' vacuum specific table(s) only\n"));
941942
printf(_(" -v, --verbose write a lot of output\n"));
942943
printf(_(" -V, --version output version information, then exit\n"));
943944
printf(_(" -z, --analyze update optimizer statistics\n"));
944-
printf(_(" -Z, --analyze-only only update optimizer statistics; no vacuum\n"));
945-
printf(_(" -j, --jobs=NUM use this many concurrent connections to vacuum\n"));
945+
printf(_(" -Z, --analyze-only only update optimizer statistics; no vacuum\n"));
946946
printf(_(" --analyze-in-stages only update optimizer statistics, in multiple\n"
947-
" stages for faster results;no vacuum\n"));
947+
" stages for faster results; no vacuum\n"));
948948
printf(_(" -?, --help show this help, then exit\n"));
949949
printf(_("\nConnection options:\n"));
950950
printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp