Merge psql \df options into a single \? line, and update docs.

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 44d34c251ac04a537de5f4e67df306808147bca5..24212b545bf7babdc2ca280f42829d9bb9da00b1 100644 (file)
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.224 2009/04/21 15:49:06 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.225 2009/04/21 17:23:05 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -1038,8 +1038,7 @@ testdb=&gt;
 
 
       <varlistentry>
-        <term><literal>\df[S+] [ <replaceable class="parameter">pattern</replaceable> ]</literal></term>
-        <term><literal>\df[antw][S+] [ <replaceable class="parameter">pattern</replaceable> ]</literal></term>
+        <term><literal>\df[antwS+] [ <replaceable class="parameter">pattern</replaceable> ]</literal></term>
 
         <listitem>
         <para>

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index a3da9e2ca0261d79df9e7d720af0de6588126e71..027e8c07c32c5025a19f731e0a5b9db056109172 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.147 2009/04/21 15:49:06 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.148 2009/04/21 17:23:05 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -205,8 +205,7 @@ slashUsage(unsigned short int pager)
        fprintf(output, _("  \\des[+] [PATTERN]      list foreign servers\n"));
        fprintf(output, _("  \\deu[+] [PATTERN]      list user mappings\n"));
        fprintf(output, _("  \\dew[+] [PATTERN]      list foreign-data wrappers\n"));
-       fprintf(output, _("  \\df[S+] [PATTERN]      list functions\n"));
-       fprintf(output, _("  \\df[antwS+] [PATTERN]  list only agg/normal/trigger/window functions\n"));
+       fprintf(output, _("  \\df[antwS+] [PATTERN]  list (only agg/normal/trigger/window) functions\n"));
        fprintf(output, _("  \\dF[+]  [PATTERN]      list text search configurations\n"));
        fprintf(output, _("  \\dFd[+] [PATTERN]      list text search dictionaries\n"));
        fprintf(output, _("  \\dFp[+] [PATTERN]      list text search parsers\n"));