diff options
author | Bruce Momjian <bruce@momjian.us> | 2014-03-08 11:26:47 -0500 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2014-03-08 11:26:47 -0500 |
commit | 3624acd342d7b5ad6bb07730b8bac5ed5874fc23 (patch) | |
tree | 2b5cf6c9cb33140f04414db648948658c724dd2d | |
parent | 8879fa09ee7aa6232097198b66c3376184b0de06 (diff) | |
download | postgresql-3624acd342d7b5ad6bb07730b8bac5ed5874fc23.tar.gz postgresql-3624acd342d7b5ad6bb07730b8bac5ed5874fc23.zip |
docs: small adjustements to recent SELECT and pg_upgrade improvements
-rw-r--r-- | doc/src/sgml/pgupgrade.sgml | 8 | ||||
-rw-r--r-- | doc/src/sgml/ref/select.sgml | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml index 72e3cb68c28..afb2ff4fbb9 100644 --- a/doc/src/sgml/pgupgrade.sgml +++ b/doc/src/sgml/pgupgrade.sgml @@ -458,10 +458,10 @@ psql --username postgres --file script.sql postgres <para> Once you are satisfied with the upgrade, you can delete the old cluster's data directories by running the script mentioned when - <command>pg_upgrade</command> completes. You can also delete the - old installation directories - (e.g. <filename>bin</>, <filename>share</>). This will not work - if you have tablespaces inside the old data directory. + <command>pg_upgrade</command> completes. (Automatic deletion is not + possible if you have user-defined tablespaces inside the old data + directory.) You can also delete the old installation directories + (e.g. <filename>bin</>, <filename>share</>). </para> </step> diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml index f1bc158d03b..231dc6ad8a3 100644 --- a/doc/src/sgml/ref/select.sgml +++ b/doc/src/sgml/ref/select.sgml @@ -1497,8 +1497,9 @@ SELECT * FROM <replaceable class="parameter">name</replaceable> variant in parts of complex queries. Only the <literal>WITH</>, <literal>UNION</>, <literal>INTERSECT</>, <literal>EXCEPT</>, <literal>ORDER BY</>, <literal>LIMIT</>, <literal>OFFSET</>, - <literal>FETCH</> and locking clauses can be used with <command>TABLE</>; - the <literal>WHERE</> clause and any form of aggregation cannot + <literal>FETCH</> and <literal>FOR</> locking clauses can be used + with <command>TABLE</>; the <literal>WHERE</> clause and any form of + aggregation cannot be used. </para> </refsect2> |