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

Commitb9fc9f7

Browse files
committed
Put some things in a better order in psql help
1 parentbaebab3 commitb9fc9f7

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

‎doc/src/sgml/ref/psql-ref.sgml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1772,52 +1772,52 @@ Tue Oct 26 21:40:57 CEST 1999
17721772

17731773

17741774
<varlistentry>
1775-
<term><literal>\ev <optional> <replaceable class="parameter">view_name</> <optional> <replaceable class="parameter">line_number</> </optional> </optional></literal></term>
1775+
<term><literal>\encoding [ <replaceable class="parameter">encoding</replaceable> ]</literal></term>
17761776

17771777
<listitem>
17781778
<para>
1779-
This command fetches and edits the definition of the named view,
1780-
in the form of a <command>CREATE OR REPLACE VIEW</> command.
1781-
Editing is done in the same way as for <literal>\edit</>.
1782-
After the editor exits, the updated command waits in the query buffer;
1783-
type semicolon or <literal>\g</> to send it, or <literal>\r</>
1784-
to cancel.
1785-
</para>
1786-
1787-
<para>
1788-
If no view is specified, a blank <command>CREATE VIEW</>
1789-
template is presented for editing.
1790-
</para>
1791-
1792-
<para>
1793-
If a line number is specified, <application>psql</application> will
1794-
position the cursor on the specified line of the view definition.
1779+
Sets the client character set encoding. Without an argument, this command
1780+
shows the current encoding.
17951781
</para>
17961782
</listitem>
17971783
</varlistentry>
17981784

17991785

18001786
<varlistentry>
1801-
<term><literal>\encoding [ <replaceable class="parameter">encoding</replaceable> ]</literal></term>
1787+
<term><literal>\errverbose</literal></term>
18021788

18031789
<listitem>
18041790
<para>
1805-
Sets the client character set encoding. Without an argument, this command
1806-
shows the current encoding.
1791+
Repeats the most recent server error message at maximum
1792+
verbosity, as though <varname>VERBOSITY</varname> were set
1793+
to <literal>verbose</> and <varname>SHOW_CONTEXT</varname> were
1794+
set to <literal>always</>.
18071795
</para>
18081796
</listitem>
18091797
</varlistentry>
18101798

18111799

18121800
<varlistentry>
1813-
<term><literal>\errverbose</literal></term>
1801+
<term><literal>\ev <optional> <replaceable class="parameter">view_name</> <optional> <replaceable class="parameter">line_number</> </optional> </optional></literal></term>
18141802

18151803
<listitem>
18161804
<para>
1817-
Repeats the most recent server error message at maximum
1818-
verbosity, as though <varname>VERBOSITY</varname> were set
1819-
to <literal>verbose</> and <varname>SHOW_CONTEXT</varname> were
1820-
set to <literal>always</>.
1805+
This command fetches and edits the definition of the named view,
1806+
in the form of a <command>CREATE OR REPLACE VIEW</> command.
1807+
Editing is done in the same way as for <literal>\edit</>.
1808+
After the editor exits, the updated command waits in the query buffer;
1809+
type semicolon or <literal>\g</> to send it, or <literal>\r</>
1810+
to cancel.
1811+
</para>
1812+
1813+
<para>
1814+
If no view is specified, a blank <command>CREATE VIEW</>
1815+
template is presented for editing.
1816+
</para>
1817+
1818+
<para>
1819+
If a line number is specified, <application>psql</application> will
1820+
position the cursor on the specified line of the view definition.
18211821
</para>
18221822
</listitem>
18231823
</varlistentry>
@@ -3576,13 +3576,6 @@ testdb=&gt; <userinput>INSERT INTO my_table VALUES (:'content');</userinput>
35763576
</listitem>
35773577
</varlistentry>
35783578

3579-
<varlistentry>
3580-
<term><literal>%p</literal></term>
3581-
<listitem>
3582-
<para>The process ID of the backend currently connected to.</para>
3583-
</listitem>
3584-
</varlistentry>
3585-
35863579
<varlistentry>
35873580
<term><literal>%&gt;</literal></term>
35883581
<listitem><para>The port number at which the database server is listening.</para></listitem>
@@ -3624,6 +3617,13 @@ testdb=&gt; <userinput>INSERT INTO my_table VALUES (:'content');</userinput>
36243617
</listitem>
36253618
</varlistentry>
36263619

3620+
<varlistentry>
3621+
<term><literal>%p</literal></term>
3622+
<listitem>
3623+
<para>The process ID of the backend currently connected to.</para>
3624+
</listitem>
3625+
</varlistentry>
3626+
36273627
<varlistentry>
36283628
<term><literal>%R</literal></term>
36293629
<listitem>

‎src/bin/psql/help.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,8 @@ helpVariables(unsigned short int pager)
372372
fprintf(output,_(" expanded (or x) expanded output [on, off, auto]\n"));
373373
fprintf(output,_(" fieldsep field separator for unaligned output (default \"%s\")\n"),DEFAULT_FIELD_SEP);
374374
fprintf(output,_(" fieldsep_zero set field separator for unaligned output to zero byte\n"));
375-
fprintf(output,_(" format set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"));
376375
fprintf(output,_(" footer enable or disable display of the table footer [on, off]\n"));
376+
fprintf(output,_(" format set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"));
377377
fprintf(output,_(" linestyle set the border line drawing style [ascii, old-ascii, unicode]\n"));
378378
fprintf(output,_(" null set the string to be printed in place of a null value\n"));
379379
fprintf(output,_(" numericlocale enable or disable display of a locale-specific character to separate\n"

0 commit comments

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