Merge branch 'REL9_5_STABLE' into PGPRO9_5

vbwagner · vbwagner · commit 5a2fee8cc79f · 2016-03-30T11:03:59.000+03:00
diff --git a/doc/src/sgml/ref/pgbench.sgml b/doc/src/sgml/ref/pgbench.sgml
@@ -993,10 +993,9 @@ END;
    Field <replaceable>schedule_lag</> is the difference between the
    transaction's scheduled start time, and the time it actually started, in
    microseconds. It is only present when the <option>--rate</> option is used.
-   The last field <replaceable>skipped_transactions</> reports the number of
-   transactions skipped because they were too far behind schedule. It is only
-   present when both options <option>--rate</> and <option>--latency-limit</>
-   are used.
+   When both <option>--rate</> and <option>--latency-limit</> are used,
+   the <replaceable>time</> for a skipped transaction will be reported as
+   <literal>skipped</>.
   </para>
 
   <para>
diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml
@@ -633,16 +633,6 @@ doc/src/sgml/ref/postgres-ref.sgml
     </listitem>
    </varlistentry>
 
-   <varlistentry>
-    <term><envar>TZ</envar></term>
-
-    <listitem>
-     <para>
-      Server time zone
-     </para>
-    </listitem>
-   </varlistentry>
-
   </variablelist>
  </refsect1>
 
