From 813135d8c98e2f2d6d646150005148d79f4f4e25 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 16 Feb 2010 21:35:51 +0000
Subject: [PATCH] Move log_error_verbosity GUC setting to "What to log"
 section, and document the behavior of terse and verbose output options.

---
 doc/src/sgml/config.sgml                      | 44 ++++++++++---------
 src/backend/utils/misc/postgresql.conf.sample |  3 +-
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index a5f520057e..6c1c047c7b 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.250 2010/02/05 23:37:43 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.251 2010/02/16 21:35:51 momjian Exp $ -->
 
 <chapter Id="runtime-config">
   <title>Server Configuration</title>
@@ -2833,26 +2833,6 @@ local0.*    /var/log/postgresql
       </listitem>
      </varlistentry>
 
-     <varlistentry id="guc-log-error-verbosity" xreflabel="log_error_verbosity">
-      <term><varname>log_error_verbosity</varname> (<type>enum</type>)</term>
-      <indexterm>
-       <primary><varname>log_error_verbosity</> configuration parameter</primary>
-      </indexterm>
-      <listitem>
-       <para>
-        Controls the amount of detail written in the server log for each
-        message that is logged.  Valid values are <literal>TERSE</>,
-        <literal>DEFAULT</>, and <literal>VERBOSE</>, each adding more
-        fields to displayed messages.  <literal>VERBOSE</> logging
-        output includes the <link
-        linkend="errcodes-appendix">SQLSTATE</> error
-        code and the source code file name, function name,
-        and line number that generated the error.
-        Only superusers can change this setting.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry id="guc-log-min-error-statement" xreflabel="log_min_error_statement">
       <term><varname>log_min_error_statement</varname> (<type>enum</type>)</term>
       <indexterm>
@@ -3172,6 +3152,28 @@ local0.*    /var/log/postgresql
       </listitem>
      </varlistentry>
 
+     <varlistentry id="guc-log-error-verbosity" xreflabel="log_error_verbosity">
+      <term><varname>log_error_verbosity</varname> (<type>enum</type>)</term>
+      <indexterm>
+       <primary><varname>log_error_verbosity</> configuration parameter</primary>
+      </indexterm>
+      <listitem>
+       <para>
+        Controls the amount of detail written in the server log for each
+        message that is logged.  Valid values are <literal>TERSE</>,
+        <literal>DEFAULT</>, and <literal>VERBOSE</>, each adding more
+        fields to displayed messages.  <literal>TERSE</> excludes
+        the logging of <literal>DETAIL</>, <literal>HINT</>,
+        <literal>QUERY</>, and <literal>CONTEXT</> error information.
+        <literal>VERBOSE</> output includes the <link
+        linkend="errcodes-appendix">SQLSTATE</> error
+        code and the source code file name, function name,
+        and line number that generated the error.
+        Only superusers can change this setting.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry id="guc-log-hostname" xreflabel="log_hostname">
       <term><varname>log_hostname</varname> (<type>boolean</type>)</term>
       <indexterm>
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index c915d19d66..1d2b9f0f67 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -311,8 +311,6 @@
 					#   fatal
 					#   panic
 
-#log_error_verbosity = default		# terse, default, or verbose messages
-
 #log_min_error_statement = error	# values in order of decreasing detail:
 				 	#   debug5
 					#   debug4
@@ -343,6 +341,7 @@
 #log_connections = off
 #log_disconnections = off
 #log_duration = off
+#log_error_verbosity = default		# terse, default, or verbose messages
 #log_hostname = off
 #log_line_prefix = ''			# special values:
 					#   %a = application name