From a239af02c3585f4355737230bc54902e8217f76e Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 9 Sep 2005 02:31:50 +0000
Subject: Fix the various forms of AT TIME ZONE to accept either timezones
 found in the zic database or zone names found in the date token table.  This
 preserves the old ability to do AT TIME ZONE 'PST' along with the new ability
 to do AT TIME ZONE 'PST8PDT'.  Per gripe from Bricklen Anderson. Also, fix
 some inconsistencies in usage of TZ_STRLEN_MAX --- the old code had the
 potential for one-byte buffer overruns, though given alignment considerations
 it's unlikely there was any real risk.

---
 doc/src/sgml/datetime.sgml | 8 +++-----
 doc/src/sgml/func.sgml     | 8 ++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'doc/src')

diff --git a/doc/src/sgml/datetime.sgml b/doc/src/sgml/datetime.sgml
index 9610dc36c5c..2cfda15f097 100644
--- a/doc/src/sgml/datetime.sgml
+++ b/doc/src/sgml/datetime.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/datetime.sgml,v 2.46 2005/06/15 00:34:08 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/datetime.sgml,v 2.47 2005/09/09 02:31:48 tgl Exp $
 -->
 
  <appendix id="datetime-appendix">
@@ -990,9 +990,7 @@ $PostgreSQL: pgsql/doc/src/sgml/datetime.sgml,v 2.46 2005/06/15 00:34:08 momjian
    <para>
     <xref linkend="datetime-timezone-set-table"> shows the time zone
     names recognized by <productname>PostgreSQL</productname> as valid
-    settings for the <xref linkend="guc-timezone"> parameter, and as
-	parameters to the <literal>AT TIME ZONE function</> (see 
-	<xref linkend="functions-datetime-zoneconvert">).  Note that
+    settings for the <xref linkend="guc-timezone"> parameter.  Note that
     these names are conceptually as well as practically different from
     the names shown in <xref linkend="datetime-timezone-input-table">:
     most of these names imply a local daylight-savings time rule, whereas
@@ -1006,7 +1004,7 @@ $PostgreSQL: pgsql/doc/src/sgml/datetime.sgml,v 2.46 2005/06/15 00:34:08 momjian
    </para>
 
     <table id="datetime-timezone-set-table">
-     <title>Time Zone Names for Setting <varname>timezone</> and <literal>AT TIME ZONE</></title>
+     <title>Time Zone Names for Setting <varname>timezone</></title>
      <tgroup cols="1">
       <thead>
        <row>
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 9bef5e13783..41ca4a8cc9b 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.283 2005/08/25 01:29:55 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.284 2005/09/09 02:31:48 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -5730,9 +5730,9 @@ SELECT date_trunc('year', TIMESTAMP '2001-02-16 20:38:40');
     In these expressions, the desired time zone <replaceable>zone</> can be
     specified either as a text string (e.g., <literal>'PST'</literal>)
     or as an interval (e.g., <literal>INTERVAL '-08:00'</literal>).
-    In the text case, the available zone names are those shown in
-    <xref linkend="datetime-timezone-set-table">.  The time zone can
-    also be implied using the default time zone for that session.
+    In the text case, the available zone names are those shown in either
+    <xref linkend="datetime-timezone-set-table"> or
+    <xref linkend="datetime-timezone-input-table">.
    </para>
 
    <para>
-- 
cgit v1.2.3