From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 7 Oct 2019 18:33:31 +0000 (-0400)
Subject: doc:  move mention of log_min_error_statement in a better spot
X-Git-Tag: REL9_5_20~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf3187e0e09d97347d264d091c4c5fabfe6c751a;p=thirdparty%2Fpostgresql.git

doc:  move mention of log_min_error_statement in a better spot

Previously it was mentioned in the lock_timeout docs in a confusing
location.

Reported-by: ivaylo.zlatanov@gmail.com

Discussion: https://postgr.es/m/157019615723.25307.15449102262106437404@wrigleys.postgresql.org

Backpatch-through: 9.4
---

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index fe93b16b294..943cbe656ef 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -5866,9 +5866,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         each lock acquisition attempt.  The limit applies both to explicit
         locking requests (such as <command>LOCK TABLE</>, or <command>SELECT
         FOR UPDATE</> without <literal>NOWAIT</>) and to implicitly-acquired
-        locks.  If <varname>log_min_error_statement</> is set to
-        <literal>ERROR</> or lower, the statement that timed out will be
-        logged.  A value of zero (the default) turns this off.
+        locks.  A value of zero (the default) turns this off.
        </para>
 
        <para>
@@ -5876,7 +5874,9 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         while waiting for locks.  Note that if <varname>statement_timeout</>
         is nonzero, it is rather pointless to set <varname>lock_timeout</> to
         the same or larger value, since the statement timeout would always
-        trigger first.
+        trigger first.  If <varname>log_min_error_statement</> is set to
+        <literal>ERROR</> or lower, the statement that timed out will be
+        logged.
        </para>
 
        <para>