saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Correct usage of import_yaml in formula documentation

Browse source
This commit is contained in:
Jason Thigpen 2015-05-29 17:12:59 -07:00
parent 742cf7e4dd
commit 37775a5fa6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/topics/development/conventions/formulas.rst
View file

@ -944,7 +944,7 @@ XML.)
.. code-block:: yaml
{% load_yaml 'tomcat/defaults.yaml' as server_xml_defaults %}
{% import_yaml 'tomcat/defaults.yaml' as server_xml_defaults %}
{% set server_xml_final_values = salt.pillar.get(
'appX:server_xml_overrides',
default=server_xml_defaults,
@ -980,7 +980,7 @@ example:
.. code-block:: yaml
{# Load the map file. #}
{% load_yaml 'app/defaults.yaml' as app_defaults %}
{% import_yaml 'app/defaults.yaml' as app_defaults %}
{# Extract the relevant subset for the app configured on the current
machine (configured via a grain in this example). #}