diff options
| author | Bruce Momjian <bruce@momjian.us> | 2019-04-17 18:12:10 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2019-04-17 18:12:10 -0400 |
| commit | e13b6a4387a8d7241ee6ee23701069c4053f073c (patch) | |
| tree | 16bc6e986caea3599639dd278a5f9e7ba5ad6709 | |
| parent | 83be50d9a9546e7ca93fa1f8ea4973d17b41e8de (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 6f7fa22c6c1..179869f1d9c 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -677,10 +677,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 #------------------------------------------------------------------------------ |