Merge pull request #24631 from rallytime/bp-24591

Back-port #24591 to 2015.5
This commit is contained in:
Thomas S Hatch 2015-06-12 10:54:32 -06:00
commit 5f491f911d

View file

@ -46,6 +46,13 @@ Here's a more complex example:
.. code-blocK:: jinja
# Comments in yaml start with a hash symbol.
# Since jinja rendering occurs before yaml parsing, if you want to include jinja
# in the comments you may need to escape them using 'jinja' comments to prevent
# jinja from trying to render something which is not well-defined jinja.
# e.g.
# {# iterate over the Three Stooges using a {% for %}..{% endfor %} loop
# with the iterator variable {{ usr }} becoming the state ID. #}
{% for usr in 'moe','larry','curly' %}
{{ usr }}:
group:
@ -216,4 +223,4 @@ Next steps
In :doc:`part 4 <states_pt4>` we will discuss how to use salt's
:conf_master:`file_roots` to set up a workflow in which states can be
"promoted" from dev, to QA, to production.
"promoted" from dev, to QA, to production.