Put some things in a better order in psql help

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index ee525f5833c156fb8caf50475b5035a671b4215e..0e6f3fd317f0e4b6560d6d423afd0aec77850688 100644 (file)
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1772,52 +1772,52 @@ Tue Oct 26 21:40:57 CEST 1999
 
 
       <varlistentry>
-        <term><literal>\ev <optional> <replaceable class="parameter">view_name</> <optional>  <replaceable class="parameter">line_number</> </optional> </optional> </literal></term>
+        <term><literal>\encoding [ <replaceable class="parameter">encoding</replaceable> ]</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.
+        Sets the client character set encoding.  Without an argument, this command
+        shows the current encoding.
         </para>
         </listitem>
       </varlistentry>
 
 
       <varlistentry>
-        <term><literal>\encoding [ <replaceable class="parameter">encoding</replaceable> ]</literal></term>
+        <term><literal>\errverbose</literal></term>
 
         <listitem>
         <para>
-        Sets the client character set encoding.  Without an argument, this command
-        shows the current encoding.
+        Repeats the most recent server error message at maximum
+        verbosity, as though <varname>VERBOSITY</varname> were set
+        to <literal>verbose</> and <varname>SHOW_CONTEXT</varname> were
+        set to <literal>always</>.
         </para>
         </listitem>
       </varlistentry>
 
 
       <varlistentry>
-        <term><literal>\errverbose</literal></term>
+        <term><literal>\ev <optional> <replaceable class="parameter">view_name</> <optional>  <replaceable class="parameter">line_number</> </optional> </optional> </literal></term>
 
         <listitem>
         <para>
-        Repeats the most recent server error message at maximum
-        verbosity, as though <varname>VERBOSITY</varname> were set
-        to <literal>verbose</> and <varname>SHOW_CONTEXT</varname> were
-        set to <literal>always</>.
+         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>
@@ -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>

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 9e6d67b0ea946751bc74fb0823039002ec94a5e4..efc845414fbe6af0dc2f52d010b1c289e0d96e13 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -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"