2
0

Merge pull request #23 from gravyboat/master

Updated readme to match standards.
This commit is contained in:
Seth House 2014-01-28 16:49:06 -08:00
commit 54d2772a2e

View File

@ -1,20 +1,26 @@
====
salt salt
==== ====
Yes, Salt can Salt itself! Yes, Salt can Salt itself!
salt.minion .. note::
===========
See the full `Salt Formulas installation and usage instructions
<http://docs.saltstack.com/topics/conventions/formulas.html>`_.
``salt.minion``
---------------
Install a minion Install a minion
salt.master ``salt.master``
=========== ---------------
Install a master. Install a master.
Configuration ``Configuration``
============= -----------------
Every option available in the templates can be set in pillar. Settings under 'salt' will be overridden by more specific settings under salt['master'] or salt['minion'] Every option available in the templates can be set in pillar. Settings under 'salt' will be overridden by more specific settings under salt['master'] or salt['minion']
:: ::