aboutsummaryrefslogtreecommitdiff
path: root/doc/src/sgml/ref/psql-ref.sgml
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2012-08-09 09:59:45 -0400
committerRobert Haas <rhaas@postgresql.org>2012-08-09 10:02:50 -0400
commitbe690e291d59e8d0c9f4df59abe09f1ff6cc0da9 (patch)
tree7caef7285152bac1818ff8665808224093caa184 /doc/src/sgml/ref/psql-ref.sgml
parent92ec0370eb65c4f059f2b60ee6e458b312bb7cbf (diff)
downloadpostgresql-be690e291d59e8d0c9f4df59abe09f1ff6cc0da9.tar.gz
postgresql-be690e291d59e8d0c9f4df59abe09f1ff6cc0da9.zip
Make psql -1 < file behave as expected.
Previously, the -1 option was silently ignored. Also, emit an error if -1 is used in a context where it won't be respected, to avoid user confusion. Original patch by Fabien COELHO, but this version is quite different from the original submission.
Diffstat (limited to 'doc/src/sgml/ref/psql-ref.sgml')
-rw-r--r--doc/src/sgml/ref/psql-ref.sgml10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 1ba5ea8dabc..340328f4b56 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -512,11 +512,11 @@ PostgreSQL documentation
<term><option>--single-transaction</option></term>
<listitem>
<para>
- When <application>psql</application> executes a script with the
- <option>-f</> option, adding this option wraps
- <command>BEGIN</>/<command>COMMIT</> around the script to execute it
- as a single transaction. This ensures that either all the commands
- complete successfully, or no changes are applied.
+ When <application>psql</application> executes a script, adding
+ this option wraps <command>BEGIN</>/<command>COMMIT</> around the
+ script to execute it as a single transaction. This ensures that
+ either all the commands complete successfully, or no changes are
+ applied.
</para>
<para>