|
1 | 1 | <!-- |
2 | | -$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.160 2006/02/13 21:29:08 tgl Exp $ |
| 2 | +$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.161 2006/04/02 20:08:20 neilc Exp $ |
3 | 3 | PostgreSQL documentation |
4 | 4 | --> |
5 | 5 |
|
@@ -712,34 +712,28 @@ testdb=> |
712 | 712 | <term><literal>\connect</literal> (or <literal>\c</literal>) <literal>[ <replaceable class="parameter">dbname</replaceable> [ <replaceable class="parameter">username</replaceable> ] [ <replaceable class="parameter">host</replaceable> ] [ <replaceable class="parameter">port</replaceable> ] ]</literal></term> |
713 | 713 | <listitem> |
714 | 714 | <para> |
715 | | - Establishes a connection to a new database and/or under a user |
716 | | - name. The previous connection is closed. If <replaceable |
717 | | - class="parameter">dbname</replaceable> is <literal>-</literal> |
718 | | - the current database name is assumed. Similar consideration |
719 | | - applies to <replaceable class="parameter">host</replaceable> and |
720 | | - <replaceable class="parameter">port</replaceable>. |
721 | | - </para> |
722 | | - |
723 | | - <para> |
724 | | - If <replaceable class="parameter">username</replaceable> is |
725 | | - omitted the current user name is assumed. </para> |
726 | | - |
727 | | - <para> |
728 | | - As a special rule, <command>\connect</command> without any |
729 | | - arguments will connect to the default database as the default |
730 | | - user (as you would have gotten by starting |
731 | | - <application>psql</application> without any arguments). |
| 715 | + Establishes a new connection to a <productname>PostgreSQL</> |
| 716 | + server. If the new connection is successfully made, the |
| 717 | + previous connection is closed. If any of <replaceable |
| 718 | + class="parameter">dbname</replaceable>, <replaceable |
| 719 | + class="parameter">username</replaceable>, <replaceable |
| 720 | + class="parameter">host</replaceable> or <replaceable |
| 721 | + class="parameter">port</replaceable> are omitted or specified |
| 722 | + as <literal>-</literal>, the value of that parameter from the |
| 723 | + previous connection is used. If there is no previous |
| 724 | + connection, the <application>libpq</application> default for |
| 725 | + the parameter's value is used. |
732 | 726 | </para> |
733 | 727 |
|
734 | 728 | <para> |
735 | 729 | If the connection attempt failed (wrong user name, access |
736 | | - denied, etc.), the previous connection will be kept if and only |
737 | | -if<application>psql</application> is in interactive mode. When |
738 | | - executing a non-interactive script, processing will immediately |
739 | | - stop with an error. This distinction was chosen as a user |
740 | | - convenience against typos on the one hand, and a safety |
741 | | - mechanism that scripts are not accidentally acting on the wrong |
742 | | - database on the other hand. |
| 730 | + denied, etc.), the previous connection willonlybe kept if |
| 731 | + <application>psql</application> is in interactive mode. When |
| 732 | + executing a non-interactive script, processing will |
| 733 | +immediatelystop with an error. This distinction was chosen as |
| 734 | +a userconvenience against typos on the one hand, and a safety |
| 735 | + mechanism that scripts are not accidentally acting on the |
| 736 | +wrongdatabase on the other hand. |
743 | 737 | </para> |
744 | 738 | </listitem> |
745 | 739 | </varlistentry> |
@@ -997,15 +991,16 @@ testdb=> |
997 | 991 | <listitem> |
998 | 992 | <para> |
999 | 993 | This is not the actual command name: the letters |
1000 | | - <literal>i</literal>, <literal>s</literal>, <literal>t</literal>, |
1001 | | - <literal>v</literal>, <literal>S</literal> stand for index, |
1002 | | - sequence, table, view, and system table, respectively. You can |
1003 | | - specify any or all of these letters, in any order, to obtain a |
1004 | | - listing of all the matching objects. The letter S restricts the |
1005 | | - listing to system objects; without <literal>S</literal>, only |
1006 | | - non-system objects are shown. If <literal>+</literal> is appended |
1007 | | - to the command name, each object is listed with its associated |
1008 | | - description, if any. |
| 994 | + <literal>i</literal>, <literal>s</literal>, |
| 995 | + <literal>t</literal>, <literal>v</literal>, |
| 996 | + <literal>S</literal> stand for index, sequence, table, view, |
| 997 | + and system table, respectively. You can specify any or all of |
| 998 | + these letters, in any order, to obtain a listing of all the |
| 999 | + matching objects. The letter <literal>S</literal> restricts |
| 1000 | + the listing to system objects; without <literal>S</literal>, |
| 1001 | + only non-system objects are shown. If <literal>+</literal> is |
| 1002 | + appended to the command name, each object is listed with its |
| 1003 | + associated description, if any. |
1009 | 1004 | </para> |
1010 | 1005 |
|
1011 | 1006 | <para> |
@@ -1067,10 +1062,9 @@ testdb=> |
1067 | 1062 | </para> |
1068 | 1063 |
|
1069 | 1064 | <para> |
1070 | | - The commands <command>GRANT</command> and |
1071 | | - <command>REVOKE</command> are used to set access privileges. |
1072 | | - See <xref linkend="sql-grant" endterm="sql-grant-title"> |
1073 | | - for more information. |
| 1065 | + The <xref linkend="sql-grant" endterm="sql-grant-title"> and |
| 1066 | + <xref linkend="sql-revoke" endterm="sql-revoke-title"> |
| 1067 | + commands are used to set access privileges. |
1074 | 1068 | </para> |
1075 | 1069 | </listitem> |
1076 | 1070 | </varlistentry> |
@@ -1785,10 +1779,9 @@ lo_import 152801 |
1785 | 1779 | </para> |
1786 | 1780 |
|
1787 | 1781 | <para> |
1788 | | - The commands <command>GRANT</command> and |
1789 | | - <command>REVOKE</command> are used to set access privileges. |
1790 | | - See <xref linkend="sql-grant" endterm="sql-grant-title"> for |
1791 | | - more information. |
| 1782 | + The <xref linkend="sql-grant" endterm="sql-grant-title"> and |
| 1783 | + <xref linkend="sql-revoke" endterm="sql-revoke-title"> |
| 1784 | + commands are used to set access privileges. |
1792 | 1785 | </para> |
1793 | 1786 |
|
1794 | 1787 | <para> |
|