Skip to content

Commit

Permalink
Merge pull request #44133 from cachedout/fix_paralell_docs
Browse files Browse the repository at this point in the history
Fix typos in parallel states docs
  • Loading branch information
Nicole Thomas committed Oct 17, 2017
2 parents 0d3f5db + 8d1c1e2 commit 6252f82
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions doc/ref/states/parallel.rst
Expand Up @@ -6,7 +6,7 @@ Introduced in Salt version ``2017.7.0`` it is now possible to run select states
in parallel. This is accomplished very easily by adding the ``parallel: True``
option to your state declaration:

.. code_block:: yaml
.. code-block:: yaml
nginx:
service.running:
Expand All @@ -24,7 +24,7 @@ state to finish.

Given this example:

.. code_block:: yaml
.. code-block:: yaml
sleep 10:
cmd.run:
Expand Down Expand Up @@ -74,16 +74,16 @@ also complete.
Things to be Careful of
=======================

Parallel States does not prevent you from creating parallel conflicts on your
Parallel States do not prevent you from creating parallel conflicts on your
system. This means that if you start multiple package installs using Salt then
the package manager will block or fail. If you attempt to manage the same file
with multiple states in parallel then the result can produce an unexpected
file.

Make sure that the states you choose to run in parallel do not conflict, or
else, like in and parallel programming environment, the outcome may not be
else, like in any parallel programming environment, the outcome may not be
what you expect. Doing things like just making all states run in parallel
will almost certinly result in unexpected behavior.
will almost certainly result in unexpected behavior.

With that said, running states in parallel should be safe the vast majority
of the time and the most likely culprit for unexpected behavior is running
Expand Down

0 comments on commit 6252f82

Please sign in to comment.