From cbf4f6bb34fc77f6698ff036e16e0739357cedd0 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 29 Mar 2016 21:38:15 -0400
Subject: [PATCH] Remove TZ environment-variable entry from postgres reference
 page.

The server hasn't paid attention to the TZ environment variable since
commit ca4af308c32d03db, but that commit missed removing this documentation
reference, as did commit d883b916a947a3c6 which added the reference where
it now belongs (initdb).

Back-patch to 9.2 where the behavior changed.  Also back-patch
d883b916a947a3c6 as needed.

Matthew Somerville
---
 doc/src/sgml/ref/initdb.sgml       | 11 +++++++++++
 doc/src/sgml/ref/postgres-ref.sgml | 10 ----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml
index b1067e23505..7431f0e9f6c 100644
--- a/doc/src/sgml/ref/initdb.sgml
+++ b/doc/src/sgml/ref/initdb.sgml
@@ -413,6 +413,17 @@ PostgreSQL documentation
      </para>
     </listitem>
    </varlistentry>
+
+   <varlistentry>
+    <term><envar>TZ</envar></term>
+
+    <listitem>
+     <para>
+      Specifies the time zone, using full time zone names, which the created
+      database cluster should use.
+     </para>
+    </listitem>
+   </varlistentry>
   </variablelist>
 
   <para>
diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml
index 943a3be00e3..f72743a7492 100644
--- a/doc/src/sgml/ref/postgres-ref.sgml
+++ b/doc/src/sgml/ref/postgres-ref.sgml
@@ -635,16 +635,6 @@ PostgreSQL documentation
     </listitem>
    </varlistentry>
 
-   <varlistentry>
-    <term><envar>TZ</envar></term>
-
-    <listitem>
-     <para>
-      Server time zone
-     </para>
-    </listitem>
-   </varlistentry>
-
   </variablelist>
  </refsect1>