Skip to content

Commit b9dc071

Browse files
committed
Added host of reST fixes for the release
1 parent b54d4ee commit b9dc071

File tree

6 files changed

+14
-11
lines changed

6 files changed

+14
-11
lines changed

doc/ref/configuration/master.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Default: :file:`/`
8181
The system root direcotry to oporate from, change this to make Salt run from
8282
an alternative root
8383

84-
.. code_block:: yaml
84+
.. code-block:: yaml
8585
8686
root_dir: /
8787

doc/ref/configuration/minion.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ A list of extra directories to search for salt modules
164164
.. conf_minion:: returner_dirs
165165

166166
``returner_dirs``
167-
---------------
167+
-----------------
168168

169169
Default: ``[]``
170170

@@ -230,7 +230,7 @@ Default: ``yaml_jinja``
230230

231231
The default renderer used for local state executions
232232

233-
.. code-block:: renderer
233+
.. code-block:: yaml
234234
235235
renderer: yaml_jinja
236236
@@ -246,7 +246,7 @@ verbose. Normaly only states that fail or states that have changes are
246246
returned, but setting state_verbose to True will return all states that
247247
were checked
248248

249-
.. code-block:: state_verbose
249+
.. code-block:: yaml
250250
251251
state_verbose: True
252252
@@ -261,7 +261,7 @@ autoload_dynamic_modules Turns on automatic loading of modules found in the
261261
environments on the master. This is turned on by default, to turn of
262262
autoloading modules when states run set this value to False
263263

264-
.. code-block:: autoload_dynamic_modules
264+
.. code-block:: yaml
265265
266266
autoload_dynamic_modules: True
267267
@@ -274,7 +274,7 @@ the dynamic modules on the master, this means that if a dynamic module is
274274
not on the master it will be deleted from the minion. By default this is
275275
enabled and can be disabled by changing this value to False
276276

277-
.. code-block:: clean_dynamic_modules
277+
.. code-block:: yaml
278278
279279
clean_dynamic_modules: True
280280

doc/topics/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ repository.
4747
Red Hat Enterprise Linux 5 & 6 or CentOS 5 & 6
4848
----------------------------------------------
4949

50-
1. Install the `EPEL`__ repository::
50+
1. Install the `EPEL`__ repository.
5151

5252
2. Install our repository on FedoraPeople::
5353

doc/topics/releases/0.9.5.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Modules via States
122122
Now when salt modules are deployed to a minion via the state system as a file,
123123
then the modules will be automatically loaded into the active running minion
124124
- no restart required - and into the active running state. So custom state
125-
modules can be deployed and used in the same state run.
125+
modules can be deployed and used in the same state run.
126126

127127
Modules via Module Environment Directories
128128
```````````````````````````````````````````
@@ -375,7 +375,7 @@ mysql_user
375375
The mysql_user state enables mysql user management.
376376

377377
virtualenv
378-
`````````
378+
``````````
379379
The virtualenv state can manage the state of python virtual environments.
380380
Thanks to Whitinge for the virtualenv state
381381

salt/modules/cp.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ def get_file(path, dest, env='base'):
4646
def get_url(path, dest, env='base'):
4747
'''
4848
Used to get a single file from a URL.
49-
For example,
49+
50+
For example::
51+
5052
cp.get_url salt://my/file /tmp/mine
5153
cp.get_url http://www.slashdot.org /tmp/index.html
5254
'''

salt/states/mount.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'''
22
Mount Management
3-
===============
3+
================
4+
45
Mount any type of mountable filesystem with the mounted function:
56
67
.. code-block:: yaml

0 commit comments

Comments
 (0)