Skip to content

Commit

Permalink
Merge pull request #23 from gravyboat/master
Browse files Browse the repository at this point in the history
Updated readme to match standards.
  • Loading branch information
whiteinge committed Jan 29, 2014
2 parents 4dadffc + c7b1f08 commit 54d2772
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
====
salt
====

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

salt.master
===========
``salt.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']

::
Expand Down

0 comments on commit 54d2772

Please sign in to comment.