Merge pull request #12307 from jtyr/doc_fixes

Doc fixes
pull/12310/head
Brian Coca 9 years ago
commit 6dac8512a1

@ -324,25 +324,25 @@ Combining hashes/dictionaries
.. versionadded:: 2.0 .. versionadded:: 2.0
The `combine` filter allows hashes to be merged. For example, the The `combine` filter allows hashes to be merged. For example, the
following would override keys in one hash: following would override keys in one hash::
{{ {'a':1, 'b':2}|combine({'b':3}) }} {{ {'a':1, 'b':2}|combine({'b':3}) }}
The resulting hash would be: The resulting hash would be::
{'a':1, 'b':3} {'a':1, 'b':3}
The filter also accepts an optional `recursive=True` parameter to not The filter also accepts an optional `recursive=True` parameter to not
only override keys in the first hash, but also recurse into nested only override keys in the first hash, but also recurse into nested
hashes and merge their keys too: hashes and merge their keys too::
{{ {'a':{'foo':1, 'bar':2}, 'b':2}|combine({'a':{'bar':3, 'baz':4}}, recursive=True) }} {{ {'a':{'foo':1, 'bar':2}, 'b':2}|combine({'a':{'bar':3, 'baz':4}}, recursive=True) }}
This would result in: This would result in::
{'a':{'foo':1, 'bar':3, 'baz':4}, 'b':2} {'a':{'foo':1, 'bar':3, 'baz':4}, 'b':2}
The filter can also take multiple arguments to merge: The filter can also take multiple arguments to merge::
{{ a|combine(b, c, d) }} {{ a|combine(b, c, d) }}

Loading…
Cancel
Save