From da29cc802215e3a01bab0f9fb5dd14c03d6f973d Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 25 Nov 2009 20:26:31 +0000
Subject: Simplify psql's new linestyle behavior to default to linestyle=ascii
 all the time, rather than hoping we can tell whether the terminal supports
 UTF8 characters.  Per discussion.

---
 doc/src/sgml/ref/psql-ref.sgml | 9 ++-------
 doc/src/sgml/release-8.5.sgml  | 5 ++---
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'doc/src/sgml')

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index d9a455ba8bf..dc8a4819dfe 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.234 2009/11/22 22:06:30 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.235 2009/11/25 20:26:30 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -1785,6 +1785,7 @@ lo_import 152801
           or <literal>unicode</literal>.
           Unique abbreviations are allowed.  (That would mean one
           letter is enough.)
+          The default setting is <literal>ascii</>.
           This option only affects the <literal>aligned</> and
           <literal>wrapped</> output formats.
           </para>
@@ -1826,12 +1827,6 @@ lo_import 152801
           Plain <acronym>ASCII</acronym> characters work everywhere, but
           Unicode characters look nicer on displays that recognize them.
           </para>
-
-          <para>
-          If this option has not been set, the default behavior is to use
-          <literal>unicode</literal> style if the client character set encoding
-          is UTF-8, otherwise <literal>ascii</literal> style.
-          </para>
           </listitem>
           </varlistentry>
 
diff --git a/doc/src/sgml/release-8.5.sgml b/doc/src/sgml/release-8.5.sgml
index 95a940fa52e..5471a42375a 100644
--- a/doc/src/sgml/release-8.5.sgml
+++ b/doc/src/sgml/release-8.5.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/release-8.5.sgml,v 1.6 2009/10/21 19:43:06 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/release-8.5.sgml,v 1.7 2009/11/25 20:26:31 tgl Exp $ -->
 
 <sect1 id="release-8-5">
   <title>Release 8.5alpha2</title>
@@ -410,8 +410,7 @@
          <emphasis>Add &quot;pset linestyle ascii/unicode&quot; option to psql,
          allowing our traditional ASCII-art style of table output to
          be upgraded to use Unicode box drawing characters if
-         desired. By default, psql will use the Unicode characters
-         whenever client_encoding is UTF8.</>
+         desired.
         </para>
        </listitem>
         <listitem>
-- 
cgit v1.2.3