summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2015-12-14 04:42:54 +0000
committerTom Lane2015-12-14 04:42:54 +0000
commitc9ed438817661238901f43ea10aab8f120ea837f (patch)
tree3673034042366f7daad9ad2e7ef9b7b97ff8706d
parent28c366789e78af82dfd89ecb6cc32724f58d6a1b (diff)
Docs: document that psql's "\i -" means read from stdin.
This has worked that way for a long time, maybe always, but you would not have known it from the documentation. Also back-patch the notes I added to HEAD earlier today about behavior of the "-f -" switch, which likewise have been valid for many releases.
-rw-r--r--doc/src/sgml/ref/psql-ref.sgml12
1 files changed, 11 insertions, 1 deletions
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index e690534d9c9..2add4d444a6 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -192,7 +192,10 @@ EOF
<para>
If <replaceable>filename</replaceable> is <literal>-</literal>
- (hyphen), then standard input is read.
+ (hyphen), then standard input is read until an EOF indication
+ or <command>\q</> meta-command. Note however that Readline
+ is not used in this case (much as if <option>-n</option> had been
+ specified).
</para>
<para>
@@ -1783,6 +1786,13 @@ hello 10
class="parameter">filename</replaceable> and executes it as
though it had been typed on the keyboard.
</para>
+ <para>
+ If <replaceable>filename</replaceable> is <literal>-</literal>
+ (hyphen), then standard input is read until an EOF indication
+ or <command>\q</> meta-command. This can be used to intersperse
+ interactive input with input from files. Note that Readline behavior
+ will be used only if it is active at the outermost level.
+ </para>
<note>
<para>
If you want to see the lines on the screen as they are read you