Put some psql documentation pieces back into alphabetical order

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 3b9ec5e0a3972064400983c212f791eb3d26ba0c..dd36830a2dc7a348b939a3f7cef1a68e1b311f5f 100644 (file)
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -3873,23 +3873,23 @@ bar
       </varlistentry>
 
       <varlistentry>
-        <term><varname>HIDE_TOAST_COMPRESSION</varname></term>
+        <term><varname>HIDE_TABLEAM</varname></term>
         <listitem>
         <para>
-         If this variable is set to <literal>true</literal>, column
-         compression method details are not displayed. This is mainly
-         useful for regression tests.
+         If this variable is set to <literal>true</literal>, a table's access
+         method details are not displayed. This is mainly useful for
+         regression tests.
         </para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><varname>HIDE_TABLEAM</varname></term>
+        <term><varname>HIDE_TOAST_COMPRESSION</varname></term>
         <listitem>
         <para>
-         If this variable is set to <literal>true</literal>, a table's access
-         method details are not displayed. This is mainly useful for
-         regression tests.
+         If this variable is set to <literal>true</literal>, column
+         compression method details are not displayed. This is mainly
+         useful for regression tests.
         </para>
         </listitem>
       </varlistentry>

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 97fc680f1f70befec06bd624204f4a19646a35b8..ba657789353c5ab31c7ef6e0b9d3a67b370b9a0d 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -374,10 +374,10 @@ helpVariables(unsigned short int pager)
                                          "    true if last query failed, else false\n"));
        fprintf(output, _("  FETCH_COUNT\n"
                                          "    the number of result rows to fetch and display at a time (0 = unlimited)\n"));
-       fprintf(output, _("  HIDE_TOAST_COMPRESSION\n"
-                                         "    if set, compression methods are not displayed\n"));
        fprintf(output, _("  HIDE_TABLEAM\n"
                                          "    if set, table access methods are not displayed\n"));
+       fprintf(output, _("  HIDE_TOAST_COMPRESSION\n"
+                                         "    if set, compression methods are not displayed\n"));
        fprintf(output, _("  HISTCONTROL\n"
                                          "    controls command history [ignorespace, ignoredups, ignoreboth]\n"));
        fprintf(output, _("  HISTFILE\n"
@@ -489,10 +489,10 @@ helpVariables(unsigned short int pager)
                                          "    same as the dbname connection parameter\n"));
        fprintf(output, _("  PGHOST\n"
                                          "    same as the host connection parameter\n"));
-       fprintf(output, _("  PGPASSWORD\n"
-                                         "    connection password (not recommended)\n"));
        fprintf(output, _("  PGPASSFILE\n"
                                          "    password file name\n"));
+       fprintf(output, _("  PGPASSWORD\n"
+                                         "    connection password (not recommended)\n"));
        fprintf(output, _("  PGPORT\n"
                                          "    same as the port connection parameter\n"));
        fprintf(output, _("  PGUSER\n"