From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 16 Apr 2014 23:53:42 +0000 (-0400)
Subject: docs: properly document psql auto encoding mode
X-Git-Tag: REL9_4_BETA1~155
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=e183d11262f4e04ce7f191a9655aeeaa4682a7f5;p=postgresql.git

docs: properly document psql auto encoding mode

In psql, both stdin and stdout must be terminals to get a client
encoding of 'auto'.

Patch by Albe Laurenz

Backpatch to 9.3.
---

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 0b91d45d804..da79d7a90ea 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -636,7 +636,7 @@ $ <userinput>psql postgresql://dbmaster:5433/mydb?sslmode=require</userinput>
     </para>
 
     <para>
-     If at least one of standard input or standard output are a
+     If both standard input and standard output are a
      terminal, then <application>psql</application> sets the client
      encoding to <quote>auto</quote>, which will detect the
      appropriate client encoding from the locale settings