Move log_error_verbosity GUC setting to "What to log" section, and

document the behavior of terse and verbose output options.

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index a5f520057e3021b06f2997ba61312785e5a55b8a..6c1c047c7b8249280189bc7e9a65620e0ed9ba77 100644 (file)
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -1,4 +1,4 @@
-
+
 
 
   Server Configuration
@@ -2833,26 +2833,6 @@ local0.*    /var/log/postgresql
       
      
 
-     
-      log_error_verbosity (enum)
-      
-       log_error_verbosity configuration parameter
-      
-      
-       
-        Controls the amount of detail written in the server log for each
-        message that is logged.  Valid values are TERSE,
-        DEFAULT, and VERBOSE, each adding more
-        fields to displayed messages.  VERBOSE logging
-        output includes the 
-        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.
-       
-      
-     
-
      
       log_min_error_statement (enum)
       
@@ -3172,6 +3152,28 @@ local0.*    /var/log/postgresql
       
      
 
+     
+      log_error_verbosity (enum)
+      
+       log_error_verbosity configuration parameter
+      
+      
+       
+        Controls the amount of detail written in the server log for each
+        message that is logged.  Valid values are TERSE,
+        DEFAULT, and VERBOSE, each adding more
+        fields to displayed messages.  TERSE excludes
+        the logging of DETAIL, HINT,
+        QUERY, and CONTEXT error information.
+        VERBOSE output includes the 
+        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.
+       
+      
+     
+
      
       log_hostname (boolean)
       


diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample

index c915d19d66f8ea1af5fad2c57695462cb57a8cf7..1d2b9f0f673b8a43ae49bf416fedeb33a4661ff5 100644 (file)

--- 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

diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index c915d19d66f8ea1af5fad2c57695462cb57a8cf7..1d2b9f0f673b8a43ae49bf416fedeb33a4661ff5 100644 (file)
--- 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