postgres.git / summary / log / commit / refs

commit    fea2cab70de8d190762996c7c447143fb47bcfa3
Author:   Bruce Momjian <bruce@momjian.us>
Date:     Wed Apr 17 22:12:10 2019 +0000
First released in: 12.0, 9.4.22, 9.5.17, 9.6.13, 10.8, 11.3

    postgresql.conf.sample:  add proper defaults for include actions
    
    Previously, include actions include_dir, include_if_exists, and include
    listed commented-out values which were not the defaults, which is
    inconsistent with other entries.  Instead, replace them with '', which
    is the default value.
    
    Reported-by: Emanuel Araújo
    
    Discussion: https://postgr.es/m/CAMuTAkYMx6Q27wpELDR3_v9aG443y7ZjeXu15_+1nGUjhMWOJA@mail.gmail.com
    
    Backpatch-through: 9.4


 src/backend/utils/misc/postgresql.conf.sample | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 160011f4de3..109ffab5202 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -647,10 +647,10 @@
 # These options allow settings to be loaded from files other than the
 # default postgresql.conf.
 
-#include_dir = 'conf.d'			# include files ending in '.conf' from
-					# directory 'conf.d'
-#include_if_exists = 'exists.conf'	# include file only if it exists
-#include = 'special.conf'		# include file
+#include_dir = ''			# include files ending in '.conf' from
+					# a directory, e.g., 'conf.d'
+#include_if_exists = ''			# include file only if it exists
+#include = ''				# include file
 
 
 #------------------------------------------------------------------------------


[parent: 8b947ab43037]