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

Commit69e7c44

Browse files
committed
psql: Review of new help output strings
1 parent6542181 commit69e7c44

File tree

2 files changed

+38
-38
lines changed

2 files changed

+38
-38
lines changed

‎src/bin/psql/describe.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2063,16 +2063,16 @@ describeOneTableDetails(const char *schemaname,
20632063
printTableAddFooter(&cont,_("Policies:"));
20642064

20652065
if (tableinfo.rowsecurity&&tableinfo.forcerowsecurity&&tuples>0)
2066-
printTableAddFooter(&cont,_("Policies (Forced Row Security Enabled):"));
2066+
printTableAddFooter(&cont,_("Policies (forced row security enabled):"));
20672067

20682068
if (tableinfo.rowsecurity&& !tableinfo.forcerowsecurity&&tuples==0)
2069-
printTableAddFooter(&cont,_("Policies (Row Security Enabled): (None)"));
2069+
printTableAddFooter(&cont,_("Policies (row security enabled): (none)"));
20702070

20712071
if (tableinfo.rowsecurity&&tableinfo.forcerowsecurity&&tuples==0)
2072-
printTableAddFooter(&cont,_("Policies (Forced Row Security Enabled): (None)"));
2072+
printTableAddFooter(&cont,_("Policies (forced row security enabled): (none)"));
20732073

20742074
if (!tableinfo.rowsecurity&&tuples>0)
2075-
printTableAddFooter(&cont,_("Policies (Row Security Disabled):"));
2075+
printTableAddFooter(&cont,_("Policies (row security disabled):"));
20762076

20772077
/* Might be an empty set - that's ok */
20782078
for (i=0;i<tuples;i++)

‎src/bin/psql/help.c

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ slashUsage(unsigned short int pager)
180180

181181
fprintf(output,_("Help\n"));
182182

183-
fprintf(output,_(" \\? [commands]description of all psql backslash commands\n"));
184-
fprintf(output,_(" \\? optionsdescription of all psqlcommandline options\n"));
185-
fprintf(output,_(" \\? variablesdescription of all psql configuration variables\n"));
183+
fprintf(output,_(" \\? [commands]show help on backslash commands\n"));
184+
fprintf(output,_(" \\? optionsshow help on psqlcommand-line options\n"));
185+
fprintf(output,_(" \\? variablesshow help on special variables\n"));
186186
fprintf(output,_(" \\h [NAME] help on syntax of SQL commands, * for all commands\n"));
187187
fprintf(output,"\n");
188188

@@ -323,76 +323,76 @@ helpVariables(unsigned short int pager)
323323
*/
324324
output=PageOutput(87,pager ?&(pset.popt.topt) :NULL);
325325

326-
fprintf(output,_("List of specially treated variables.\n"));
326+
fprintf(output,_("List of specially treated variables\n\n"));
327327

328328
fprintf(output,_("psql variables:\n"));
329329
fprintf(output,_("Usage:\n"));
330-
fprintf(output,_(" psql --set=NAME=VALUE\n or \\set NAME VALUEin interactive mode\n\n"));
330+
fprintf(output,_(" psql --set=NAME=VALUE\n or \\set NAME VALUEinside psql\n\n"));
331331

332332
fprintf(output,_(" AUTOCOMMIT if set, successful SQL commands are automatically committed\n"));
333-
fprintf(output,_(" COMP_KEYWORD_CASEdetermine the case used to complete SQLkeywords\n"
333+
fprintf(output,_(" COMP_KEYWORD_CASEdetermines the case used to complete SQLkey words\n"
334334
" [lower, upper, preserve-lower, preserve-upper]\n"));
335335
fprintf(output,_(" DBNAME the currently connected database name\n"));
336-
fprintf(output,_(" ECHOcontrol what input is written to standard output\n"
336+
fprintf(output,_(" ECHOcontrols what input is written to standard output\n"
337337
" [all, errors, none, queries]\n"));
338-
fprintf(output,_(" ECHO_HIDDEN display internal queries executed by backslash commands when it is set\n"
339-
"or with [noexec] just show without execution\n"));
338+
fprintf(output,_(" ECHO_HIDDENif set,display internal queries executed by backslash commands;\n"
339+
"if set to \"noexec\", just show without execution\n"));
340340
fprintf(output,_(" ENCODING current client character set encoding\n"));
341341
fprintf(output,_(" FETCH_COUNT the number of result rows to fetch and display at a time\n"
342342
" (default: 0=unlimited)\n"));
343-
fprintf(output,_(" HISTCONTROLcontrol history list [ignorespace, ignoredups, ignoreboth]\n"));
344-
fprintf(output,_(" HISTFILE file name used to store thehistory list\n"));
343+
fprintf(output,_(" HISTCONTROLcontrols command history [ignorespace, ignoredups, ignoreboth]\n"));
344+
fprintf(output,_(" HISTFILE file name used to store thecommand history\n"));
345345
fprintf(output,_(" HISTSIZE the number of commands to store in the command history\n"));
346-
fprintf(output,_(" HOST the currently connected database server\n"));
346+
fprintf(output,_(" HOST the currently connected database server host\n"));
347347
fprintf(output,_(" IGNOREEOF if unset, sending an EOF to interactive session terminates application\n"));
348-
fprintf(output,_(" LASTOIDthevalue of last affected OID\n"));
349-
fprintf(output,_(" ON_ERROR_ROLLBACK if set, an error doesn't stop a transaction (uses implicitSAVEPOINTs)\n"));
348+
fprintf(output,_(" LASTOID value of the last affected OID\n"));
349+
fprintf(output,_(" ON_ERROR_ROLLBACK if set, an error doesn't stop a transaction (uses implicitsavepoints)\n"));
350350
fprintf(output,_(" ON_ERROR_STOP stop batch execution after error\n"));
351351
fprintf(output,_(" PORT server port of the current connection\n"));
352-
fprintf(output,_(" PROMPT1specify the standard psql prompt\n"));
353-
fprintf(output,_(" PROMPT2specify the prompt used when a statement continues from a previous line\n"));
354-
fprintf(output,_(" PROMPT3specify the prompt used during COPY ... FROM STDIN\n"));
352+
fprintf(output,_(" PROMPT1specifies the standard psql prompt\n"));
353+
fprintf(output,_(" PROMPT2specifies the prompt used when a statement continues from a previous line\n"));
354+
fprintf(output,_(" PROMPT3specifies the prompt used during COPY ... FROM STDIN\n"));
355355
fprintf(output,_(" QUIET run quietly (same as -q option)\n"));
356-
fprintf(output,_(" SHOW_CONTEXTcontrol display of message context fields [never, errors, always]\n"));
356+
fprintf(output,_(" SHOW_CONTEXTcontrols display of message context fields [never, errors, always]\n"));
357357
fprintf(output,_(" SINGLELINE end of line terminates SQL command mode (same as -S option)\n"));
358358
fprintf(output,_(" SINGLESTEP single-step mode (same as -s option)\n"));
359359
fprintf(output,_(" USER the currently connected database user\n"));
360-
fprintf(output,_(" VERBOSITYcontrol verbosity of error reports [default, verbose, terse]\n"));
360+
fprintf(output,_(" VERBOSITYcontrols verbosity of error reports [default, verbose, terse]\n"));
361361

362-
fprintf(output,_("\nDisplayinfluencing variables:\n"));
362+
fprintf(output,_("\nDisplaysettings:\n"));
363363
fprintf(output,_("Usage:\n"));
364-
fprintf(output,_(" psql --pset=NAME[=VALUE]\n or \\pset NAME [VALUE]in interactive mode\n\n"));
364+
fprintf(output,_(" psql --pset=NAME[=VALUE]\n or \\pset NAME [VALUE]inside psql\n\n"));
365365

366366
fprintf(output,_(" border border style (number)\n"));
367-
fprintf(output,_(" columnsset thetarget width for the wrapped format\n"));
368-
fprintf(output,_(" expanded (or x)toggleexpanded output\n"));
369-
fprintf(output,_(" fieldsep field separator for unaligned output (default'|')\n"));
370-
fprintf(output,_(" fieldsep_zero set field separatorin unalignedmode to zero\n"));
367+
fprintf(output,_(" columns target width for the wrapped format\n"));
368+
fprintf(output,_(" expanded (or x) expanded output [on, off, auto]\n"));
369+
fprintf(output,_(" fieldsep field separator for unaligned output (default\"%s\")\n"),DEFAULT_FIELD_SEP);
370+
fprintf(output,_(" fieldsep_zero set field separatorfor unalignedoutput to zero byte\n"));
371371
fprintf(output,_(" format set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"));
372372
fprintf(output,_(" footer enable or disable display of the table footer [on, off]\n"));
373373
fprintf(output,_(" linestyle set the border line drawing style [ascii, old-ascii, unicode]\n"));
374374
fprintf(output,_(" null set the string to be printed in place of a null value\n"));
375375
fprintf(output,_(" numericlocale enable or disable display of a locale-specific character to separate\n"
376376
" groups of digits [on, off]\n"));
377377
fprintf(output,_(" pager control when an external pager is used [yes, no, always]\n"));
378-
fprintf(output,_(" recordsepspecify therecord (line) separatorto use inunaligned output format\n"));
379-
fprintf(output,_(" recordsep_zero settherecord separatorto use inunaligned outputformattoazero byte.\n"));
378+
fprintf(output,_(" recordsep record (line) separatorforunaligned output\n"));
379+
fprintf(output,_(" recordsep_zero set record separatorforunaligned output to zero byte\n"));
380380
fprintf(output,_(" tableattr (or T) specify attributes for table tag in html format or proportional\n"
381-
" columnwidth of leftaligned datatype in latex format\n"));
381+
" columnwidths for left-aligned datatypes in latex-longtable format\n"));
382382
fprintf(output,_(" title set the table title for any subsequently printed tables\n"));
383383
fprintf(output,_(" tuples_only if set, only actual table data is shown\n"));
384-
fprintf(output,_(" unicode_border_linestyle\n"));
385-
fprintf(output,_(" unicode_column_linestyle\n"));
386-
fprintf(output,_(" unicode_header_linestyle\n"
387-
" set the style ofunicode line drawing [single, double]\n"));
384+
fprintf(output,_(" unicode_border_linestyle\n"
385+
" unicode_column_linestyle\n"
386+
" unicode_header_linestyle\n"
387+
" set the style ofUnicode line drawing [single, double]\n"));
388388

389389
fprintf(output,_("\nEnvironment variables:\n"));
390390
fprintf(output,_("Usage:\n"));
391391

392392
#ifndefWIN32
393-
fprintf(output,_(" NAME=VALUE [NAME=VALUE] psql ...\n or \\setenv NAME [VALUE]in interactive mode\n\n"));
393+
fprintf(output,_(" NAME=VALUE [NAME=VALUE] psql ...\n or \\setenv NAME [VALUE]inside psql\n\n"));
394394
#else
395-
fprintf(output,_(" set NAME=VALUE\n psql ...\n or \\setenv NAME VALUE in interactive mode\n\n"));
395+
fprintf(output,_(" set NAME=VALUE\n psql ...\n or \\setenv NAME[VALUE] inside psql\n\n"));
396396
#endif
397397

398398
fprintf(output,_(" COLUMNS number of columns for wrapped format\n"));

0 commit comments

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