valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3816 from bclermont/develop

Browse Source 
Fix master reference settings documentation
This commit is contained in:
Thomas S Hatch 2013-02-21 21:37:04 -08:00
commit 11b7591dd0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/ref/configuration/master.rst
View File

@ -779,7 +779,7 @@ example sets the main salt library at the 'warning' level, but sets
Default: ``master.d/*.conf``
The minion can include configuration from other files. Per default the
minion will automatically include all config files from `master.d/*.conf`
where minion.d is relative to the directory of the minion configuration
The master can include configuration from other files. Per default the
master will automatically include all config files from `master.d/*.conf`
where master.d is relative to the directory of the master configuration
file.