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 | 475f07aa2e72422ecb2e3bfb283a7cf722cfc3b0 (patch) | |
| tree | 2407f05001aca4e79e51f370bc9f0589cc1061fb /src/backend | |
| parent | dfdab98cdee892ac4a557161a9aaef5715901175 (diff) | |
| download | postgresql-475f07aa2e72422ecb2e3bfb283a7cf722cfc3b0.tar.gz postgresql-475f07aa2e72422ecb2e3bfb283a7cf722cfc3b0.zip | |
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
Diffstat (limited to 'src/backend')
| -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 d0b83255300..e2100cf26d8 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -614,10 +614,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 #------------------------------------------------------------------------------ |