|
1 | 1 | <!-- |
2 | | -$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.208 2008/06/11 10:48:16heikki Exp $ |
| 2 | +$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.209 2008/07/03 03:37:16tgl Exp $ |
3 | 3 | PostgreSQL documentation |
4 | 4 | --> |
5 | 5 |
|
@@ -407,7 +407,7 @@ PostgreSQL documentation |
407 | 407 | <listitem> |
408 | 408 | <para> |
409 | 409 | Force <application>psql</application> to prompt for a |
410 | | - password before connecting to a database. |
| 410 | + password before connecting to a database. |
411 | 411 | </para> |
412 | 412 |
|
413 | 413 | <para> |
@@ -459,7 +459,7 @@ PostgreSQL documentation |
459 | 459 | <option>-f</> option, adding this option wraps |
460 | 460 | <command>BEGIN</>/<command>COMMIT</> around the script to execute it |
461 | 461 | as a single transaction. This ensures that either all the commands |
462 | | - complete successfully, or no changes are applied. |
| 462 | + complete successfully, or no changes are applied. |
463 | 463 | </para> |
464 | 464 |
|
465 | 465 | <para> |
@@ -542,8 +542,8 @@ PostgreSQL documentation |
542 | 542 |
|
543 | 543 | <para> |
544 | 544 | An alternative way to specify connection parameters is in a |
545 | | - <parameter>conninfo</parameter> string, which is used instead of a |
546 | | - database name. This mechanism give you very wide control over the |
| 545 | + <parameter>conninfo</parameter> string, which is used instead of a |
| 546 | + database name. This mechanism give you very wide control over the |
547 | 547 | connection. For example: |
548 | 548 | <programlisting> |
549 | 549 | $ <userinput>psql "service=myservice sslmode=require"</userinput> |
@@ -873,7 +873,7 @@ testdb=> |
873 | 873 | Lists all available tablespaces. If <replaceable |
874 | 874 | class="parameter">pattern</replaceable> |
875 | 875 | is specified, only tablespaces whose names match the pattern are shown. |
876 | | - If <literal>+</literal> is appended to the command name, each object |
| 876 | + If <literal>+</literal> is appended to the command name, each object |
877 | 877 | is listed with its associated permissions. |
878 | 878 | </para> |
879 | 879 | </listitem> |
@@ -1511,7 +1511,7 @@ lo_import 152801 |
1511 | 1511 | <listitem> |
1512 | 1512 | <para> |
1513 | 1513 | Sets the output format to one of <literal>unaligned</literal>, |
1514 | | - <literal>aligned</literal>, <literal>wrapped</literal>, |
| 1514 | + <literal>aligned</literal>, <literal>wrapped</literal>, |
1515 | 1515 | <literal>html</literal>, |
1516 | 1516 | <literal>latex</literal>, or <literal>troff-ms</literal>. |
1517 | 1517 | Unique abbreviations are allowed. (That would mean one letter |
@@ -2533,7 +2533,7 @@ testdb=> <userinput>\set content '''' `sed -e "s/'/''/g" -e 's/\\/\\\\/g' < |
2533 | 2533 | The full host name (with domain name) of the database server, |
2534 | 2534 | or <literal>[local]</literal> if the connection is over a Unix |
2535 | 2535 | domain socket, or |
2536 | | - <literal>[local:<replaceable>/dir/name</replaceable>]</literal>, |
| 2536 | + <literal>[local:<replaceable>/dir/name</replaceable>]</literal>, |
2537 | 2537 | if the Unix domain socket is not at the compiled in default |
2538 | 2538 | location. |
2539 | 2539 | </para> |
@@ -2857,28 +2857,24 @@ $endif |
2857 | 2857 | <itemizedlist> |
2858 | 2858 | <listitem> |
2859 | 2859 | <para> |
2860 | | - In an earlier life <application>psql</application> allowed the |
2861 | | - first argument of a single-letter backslash command to start |
2862 | | - directly after the command, without intervening whitespace. For |
2863 | | - compatibility this is still supported to some extent, |
2864 | | - but we are not going to explain the details here as this use is |
2865 | | - discouraged. If you get strange messages, keep this in mind. |
2866 | | - For example: |
2867 | | -<programlisting> |
2868 | | -testdb=> <userinput>\foo</userinput> |
2869 | | -Field separator is "oo". |
2870 | | -</programlisting> |
2871 | | - which is perhaps not what one would expect. |
| 2860 | + In an earlier life <application>psql</application> allowed the |
| 2861 | + first argument of a single-letter backslash command to start |
| 2862 | + directly after the command, without intervening whitespace. |
| 2863 | + As of <productname>PostgreSQL</productname> 8.4 this is no |
| 2864 | + longer allowed. |
2872 | 2865 | </para> |
2873 | 2866 | </listitem> |
2874 | 2867 |
|
2875 | 2868 | <listitem> |
2876 | 2869 | <para> |
2877 | | - <application>psql</application> only works smoothly with servers |
2878 | | - of the same version. That does not mean other combinations will |
2879 | | - fail outright, but subtle and not-so-subtle problems might come |
2880 | | - up. Backslash commands are particularly likely to fail if the |
2881 | | - server is of a different version. |
| 2870 | + <application>psql</application> is only guaranteed to work smoothly |
| 2871 | + with servers of the same version. That does not mean other combinations |
| 2872 | + will fail outright, but subtle and not-so-subtle problems might come |
| 2873 | + up. Backslash commands are particularly likely to fail if the |
| 2874 | + server is of a newer version than <application>psql</> itself. However, |
| 2875 | + backslash commands of the <literal>\d</> family should work with |
| 2876 | + servers of versions back to 7.4, though not necessarily with servers |
| 2877 | + newer than <application>psql</> itself. |
2882 | 2878 | </para> |
2883 | 2879 | </listitem> |
2884 | 2880 |
|
|