diff options
author | Bruce Momjian | 2019-04-17 22:12:10 +0000 |
---|---|---|
committer | Bruce Momjian | 2019-04-17 22:12:10 +0000 |
commit | e356005d1c9c17fce5c06e686820605bc82ae2d5 (patch) | |
tree | 6a4596fafdabec2f561148e235e8d74e3e8714a1 | |
parent | 58507a83c8bd164bb693c5bf447aacb7a4378126 (diff) |
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
-rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index b8d7d857108..6a548504608 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -632,10 +632,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 #------------------------------------------------------------------------------ |