diff options
| author | Bruce Momjian <bruce@momjian.us> | 2009-04-21 17:23:05 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2009-04-21 17:23:05 +0000 |
| commit | 301f8008950edcc8ed8e58e83e320b9345b576fa (patch) | |
| tree | 29b5f6939cf097b00cf558151871bdca4ee86aac | |
| parent | aeb3c2fce4bac3c56c538e1dd40658acf786b200 (diff) | |
| download | postgresql-301f8008950edcc8ed8e58e83e320b9345b576fa.tar.gz postgresql-301f8008950edcc8ed8e58e83e320b9345b576fa.zip | |
Merge psql \df options into a single \? line, and update docs.
| -rw-r--r-- | doc/src/sgml/ref/psql-ref.sgml | 5 | ||||
| -rw-r--r-- | src/bin/psql/help.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 44d34c251ac..24212b545bf 100644 --- 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=> <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 a3da9e2ca02..027e8c07c32 100644 --- 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")); |