From 8cef61e6cc71cf1dbdbde864775bc3c75b08b10e Mon Sep 17 00:00:00 2001 From: Mike Place Date: Wed, 22 Jul 2015 16:56:53 -0600 Subject: [PATCH] pillar doc fix closes #25413 --- doc/topics/pillar/index.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/topics/pillar/index.rst b/doc/topics/pillar/index.rst index f23013cb4b..ca9ccbafeb 100644 --- a/doc/topics/pillar/index.rst +++ b/doc/topics/pillar/index.rst @@ -364,17 +364,17 @@ can be created like this: Master Config In Pillar ======================= -For convenience the data stored in the master configuration file is made +For convenience the data stored in the master configuration file can be made available in all minion's pillars. This makes global configuration of services and systems very easy but may not be desired if sensitive data is stored in the -master configuration. +master configuration. This option is disabled by default. -To disable the master config from being added to the pillar set ``pillar_opts`` -to ``False``: +To enable the master config from being added to the pillar set ``pillar_opts`` +to ``True``: .. code-block:: yaml - pillar_opts: False + pillar_opts: True Master Provided Pillar Error