summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2009-04-21 17:23:05 +0000
committerBruce Momjian2009-04-21 17:23:05 +0000
commit9cf8708dc7a03cf38410377f5b9afe3be95eb5fa (patch)
tree4c03fd24b555f7e28d2a0b16405896be0eab3721
parent3e0ac0c220bbb452952f57a290225370e996b3a6 (diff)
Merge psql \df options into a single \? line, and update docs.
-rw-r--r--doc/src/sgml/ref/psql-ref.sgml3
-rw-r--r--src/bin/psql/help.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 76b190c570..cd94af11f6 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1038,8 +1038,7 @@ testdb=>
<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 a25654a903..fb34a2edda 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -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"));