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
 
 
       
-        \ev  view_name   line_number   
+        \encoding [ encoding ]
 
         
         
-         This command fetches and edits the definition of the named view,
-         in the form of a CREATE OR REPLACE VIEW command.
-         Editing is done in the same way as for \edit.
-         After the editor exits, the updated command waits in the query buffer;
-         type semicolon or \g to send it, or \r
-         to cancel.
-        
-
-        
-         If no view is specified, a blank CREATE VIEW
-         template is presented for editing.
-        
-
-        
-         If a line number is specified, psql 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.
         
         
       
 
 
       
-        \encoding [ encoding ]
+        \errverbose
 
         
         
-        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 VERBOSITY were set
+        to verbose and SHOW_CONTEXT were
+        set to always.
         
         
       
 
 
       
-        \errverbose
+        \ev  view_name   line_number   
 
         
         
-        Repeats the most recent server error message at maximum
-        verbosity, as though VERBOSITY were set
-        to verbose and SHOW_CONTEXT were
-        set to always.
+         This command fetches and edits the definition of the named view,
+         in the form of a CREATE OR REPLACE VIEW command.
+         Editing is done in the same way as for \edit.
+         After the editor exits, the updated command waits in the query buffer;
+         type semicolon or \g to send it, or \r
+         to cancel.
+        
+
+        
+         If no view is specified, a blank CREATE VIEW
+         template is presented for editing.
+        
+
+        
+         If a line number is specified, psql will
+         position the cursor on the specified line of the view definition.
         
         
       
@@ -3576,13 +3576,6 @@ testdb=> INSERT INTO my_table VALUES (:'content');
         
       
 
-      
-        %p
-        
-         The process ID of the backend currently connected to.
-        
-      
-
       
         %>
         The port number at which the database server is listening.
@@ -3624,6 +3617,13 @@ testdb=> INSERT INTO my_table VALUES (:'content');
         
       
 
+      
+        %p
+        
+         The process ID of the backend currently connected to.
+        
+      
+
       
         %R
         

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"