Some minor changes to the documentation

This commit is contained in:
Henrik Holmboe 2013-09-04 14:42:14 +02:00
parent 8f996b7eee
commit 4fe8c529c0
4 changed files with 11 additions and 8 deletions

View File

@ -12,7 +12,7 @@ tasks.
.. note:: Formulas require Salt 0.17 or later.
More accurately, Formulas are not tested on earlier versions of Salt so
your milage may vary.
your mileage may vary.
All Formulas require the grains execution module that shipped with Salt
0.16.4. Earlier Salt versions may copy :blob:`salt/modules/formula_util.py`

View File

@ -19,7 +19,7 @@ Using the new `master_tops` option is simple:
master_tops:
ext_nodes: cobbler-external-nodes
or:
for :doc:`Cobbler <../../ref/tops/all/salt.tops.cobbler>` or:
.. code-block:: yaml
@ -27,3 +27,5 @@ or:
reclass:
inventory_base_uri: /etc/reclass
classes_uri: roles
for :doc:`Reclass <../../ref/tops/all/salt.tops.reclass_adapter>`.

View File

@ -106,13 +106,13 @@ a ``top.sls`` of:
- packages
- services
a packages.sls file of:
a ``packages.sls`` file of:
.. code-block:: yaml
bind: bind9
and a services.sls file of:
and a ``services.sls`` file of:
.. code-block:: yaml
@ -120,7 +120,7 @@ and a services.sls file of:
Then a request for the ``bind`` pillar will only return 'named'; the 'bind9'
value is not available. It is better to structure your pillar files with more
hierarchy. For example your package files could look like:
hierarchy. For example your ``package.sls`` file could look like:
.. code-block:: yaml
@ -243,7 +243,7 @@ is being traversed. The below example would match minions with a pillar named
.. code-block:: bash
salt -I 'foo:bar:baz*'
salt -I 'foo:bar:baz*' test.ping
Master Config In Pillar

View File

@ -1,8 +1,9 @@
'''
.. |reclass| replace:: **reclass**
This ``master_tops`` plugin provides access to the |reclass| database, such
that state information (top data) are retrieved from |reclass|.
This :doc:`master_tops <../../../topics/master_tops>` plugin provides
access to the |reclass| database, such that state information (top
data) are retrieved from |reclass|.
You can find more information about |reclass| at
http://reclass.pantsfullofunix.net.