mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put some things in a better order in psql help

Browse Source
This commit is contained in:
Peter Eisentraut 2016-07-12 18:10:16 -04:00
parent baebab3ace
commit b9fc9f7c3c
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
doc/src/sgml/ref/psql-ref.sgml
View File

@ -1771,32 +1771,6 @@ Tue Oct 26 21:40:57 CEST 1999
</varlistentry>
<varlistentry>
<term><literal>\ev <optional> <replaceable class="parameter">view_name</> <optional> <replaceable class="parameter">line_number</> </optional> </optional> </literal></term>
<listitem>
<para>
This command fetches and edits the definition of the named view,
in the form of a <command>CREATE OR REPLACE VIEW</> command.
Editing is done in the same way as for <literal>\edit</>.
After the editor exits, the updated command waits in the query buffer;
type semicolon or <literal>\g</> to send it, or <literal>\r</>
to cancel.
</para>
<para>
If no view is specified, a blank <command>CREATE VIEW</>
template is presented for editing.
</para>
<para>
If a line number is specified, <application>psql</application> will
position the cursor on the specified line of the view definition.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>\encoding [ <replaceable class="parameter">encoding</replaceable> ]</literal></term>
@ -1823,6 +1797,32 @@ Tue Oct 26 21:40:57 CEST 1999
</varlistentry>
<varlistentry>
<term><literal>\ev <optional> <replaceable class="parameter">view_name</> <optional> <replaceable class="parameter">line_number</> </optional> </optional> </literal></term>
<listitem>
<para>
This command fetches and edits the definition of the named view,
in the form of a <command>CREATE OR REPLACE VIEW</> command.
Editing is done in the same way as for <literal>\edit</>.
After the editor exits, the updated command waits in the query buffer;
type semicolon or <literal>\g</> to send it, or <literal>\r</>
to cancel.
</para>
<para>
If no view is specified, a blank <command>CREATE VIEW</>
template is presented for editing.
</para>
<para>
If a line number is specified, <application>psql</application> will
position the cursor on the specified line of the view definition.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>\f [ <replaceable class="parameter">string</replaceable> ]</literal></term>
@ -3576,13 +3576,6 @@ testdb=&gt; <userinput>INSERT INTO my_table VALUES (:'content');</userinput>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>%p</literal></term>
<listitem>
<para>The process ID of the backend currently connected to.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>%&gt;</literal></term>
<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>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>%p</literal></term>
<listitem>
<para>The process ID of the backend currently connected to.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>%R</literal></term>
<listitem>

2
src/bin/psql/help.c
View File

@ -372,8 +372,8 @@ helpVariables(unsigned short int pager)
fprintf(output, _(" expanded (or x) expanded output [on, off, auto]\n"));
fprintf(output, _(" fieldsep field separator for unaligned output (default \"%s\")\n"), DEFAULT_FIELD_SEP);
fprintf(output, _(" fieldsep_zero set field separator for unaligned output to zero byte\n"));
fprintf(output, _(" format set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"));
fprintf(output, _(" footer enable or disable display of the table footer [on, off]\n"));
fprintf(output, _(" format set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"));
fprintf(output, _(" linestyle set the border line drawing style [ascii, old-ascii, unicode]\n"));
fprintf(output, _(" null set the string to be printed in place of a null value\n"));
fprintf(output, _(" numericlocale enable or disable display of a locale-specific character to separate\n"