Commit 79f2d637 authored by Robert Haas's avatar Robert Haas

Update postgresql.conf.sample to match pg_settings classificaitons.

A handful of settings, most notably shared_preload_libraries, were
just plain the wrong place compared to their assigned config_group
value in guc.c (and thus pg_settings).  In other cases the names of
the sections in postgresql.conf.sample were mildly different from
the corresponding entries in config_group_names[].  Make it all
consistent.

Adrián Escoms, reviewed by me.

Discussion: http://postgr.es/m/CACksPC2veEmFRYqwYepWYO9U7aFhAx6sYq+WqjTyHw7uV=E=pw@mail.gmail.com
parent e89a71fb
...@@ -137,11 +137,10 @@ ...@@ -137,11 +137,10 @@
#temp_file_limit = -1 # limits per-process temp file space #temp_file_limit = -1 # limits per-process temp file space
# in kB, or -1 for no limit # in kB, or -1 for no limit
# - Kernel Resource Usage - # - Kernel Resource -
#max_files_per_process = 1000 # min 25 #max_files_per_process = 1000 # min 25
# (change requires restart) # (change requires restart)
#shared_preload_libraries = '' # (change requires restart)
# - Cost-Based Vacuum Delay - # - Cost-Based Vacuum Delay -
...@@ -172,7 +171,7 @@ ...@@ -172,7 +171,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# WRITE AHEAD LOG # WRITE-AHEAD LOG
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# - Settings - # - Settings -
...@@ -228,7 +227,7 @@ ...@@ -228,7 +227,7 @@
# REPLICATION # REPLICATION
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# - Sending Server(s) - # - Sending Servers -
# Set these on the master and on any standby that will send replication data. # Set these on the master and on any standby that will send replication data.
...@@ -337,7 +336,7 @@ ...@@ -337,7 +336,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# ERROR REPORTING AND LOGGING # REPORTING AND LOGGING
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# - Where to Log - # - Where to Log -
...@@ -472,8 +471,9 @@ ...@@ -472,8 +471,9 @@
# -1 disables, 0 logs all temp files # -1 disables, 0 logs all temp files
#log_timezone = 'GMT' #log_timezone = 'GMT'
#------------------------------------------------------------------------------
# - Process Title - # PROCESS TITLE
#------------------------------------------------------------------------------
#cluster_name = '' # added to process titles if nonempty #cluster_name = '' # added to process titles if nonempty
# (change requires restart) # (change requires restart)
...@@ -481,10 +481,10 @@ ...@@ -481,10 +481,10 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# RUNTIME STATISTICS # STATISTICS
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# - Query/Index Statistics Collector - # - Query and Index Statistics Collector -
#track_activities = on #track_activities = on
#track_counts = on #track_counts = on
...@@ -494,7 +494,7 @@ ...@@ -494,7 +494,7 @@
#stats_temp_directory = 'pg_stat_tmp' #stats_temp_directory = 'pg_stat_tmp'
# - Statistics Monitoring - # - Monitoring -
#log_parser_stats = off #log_parser_stats = off
#log_planner_stats = off #log_planner_stats = off
...@@ -503,7 +503,7 @@ ...@@ -503,7 +503,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# AUTOVACUUM PARAMETERS # AUTOVACUUM
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
#autovacuum = on # Enable autovacuum subprocess? 'on' #autovacuum = on # Enable autovacuum subprocess? 'on'
...@@ -588,12 +588,16 @@ ...@@ -588,12 +588,16 @@
# default configuration for text search # default configuration for text search
#default_text_search_config = 'pg_catalog.simple' #default_text_search_config = 'pg_catalog.simple'
# - Other Defaults - # - Shared Library Preloading -
#dynamic_library_path = '$libdir' #shared_preload_libraries = '' # (change requires restart)
#local_preload_libraries = '' #local_preload_libraries = ''
#session_preload_libraries = '' #session_preload_libraries = ''
# - Other Defaults -
#dynamic_library_path = '$libdir'
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# LOCK MANAGEMENT # LOCK MANAGEMENT
...@@ -611,7 +615,7 @@ ...@@ -611,7 +615,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# VERSION/PLATFORM COMPATIBILITY # VERSION AND PLATFORM COMPATIBILITY
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# - Previous PostgreSQL Versions - # - Previous PostgreSQL Versions -
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment