Merge pull request #12783 from whiteinge/moar-rst-fixes

Moar misc rST fixes
This commit is contained in:
Thomas S Hatch 2014-05-14 13:32:15 -06:00
commit beb02a0594
4 changed files with 5 additions and 3 deletions

View File

@ -98,4 +98,5 @@ will use the api to change the root password of the server so that it can be
bootstrapped. bootstrapped.
.. code-block:: yaml .. code-block:: yaml
change_password: True change_password: True

View File

@ -416,6 +416,7 @@ def slaveof(master_host=None, master_port=None, host=None, port=None, db=None,
CLI Example: CLI Example:
.. code-block:: bash .. code-block:: bash
# Become slave of redis-n01.example.com:6379 # Become slave of redis-n01.example.com:6379
salt '*' redis.slaveof redis-n01.example.com 6379 salt '*' redis.slaveof redis-n01.example.com 6379
salt '*' redis.slaveof redis-n01.example.com salt '*' redis.slaveof redis-n01.example.com

View File

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
''' '''
Read pillar data from a Redis backend Read pillar data from a Redis backend
========================== =====================================
:depends: - redis Python module (on master) :depends: - redis Python module (on master)

View File

@ -33,13 +33,13 @@ def present(name, value, vtype='REG_DWORD', reflection=True):
In the example below, this will prevent Windows from silently creating In the example below, this will prevent Windows from silently creating
the key in: the key in:
``HKEY_CURRENT_USER\SOFTWARE\Wow6432Node\Salt\version`` ``HKEY_CURRENT_USER\\SOFTWARE\\Wow6432Node\\Salt\\version``
Example: Example:
.. code-block:: yaml .. code-block:: yaml
HKEY_CURRENT_USER\SOFTWARE\Salt\version: HKEY_CURRENT_USER\\SOFTWARE\\Salt\\version:
reg.present: reg.present:
- value: 0.15.3 - value: 0.15.3
- vtype: REG_SZ - vtype: REG_SZ