cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4824 from mattwillsh/devel

Browse source 
Correct docsite typo hash_behavior -> hash_behaviour
This commit is contained in:
jctanner 2013-11-06 22:48:12 -08:00
commit e9ad19f593
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docsite/rst/intro_configuration.rst
View file

@ -204,8 +204,8 @@ is very very conservative::
forks=5
hash_behavior
=============
hash_behaviour
==============
Ansible by default will override variables in specific precedence orders, as described in :doc:`playbooks_variables`. When a variable
of higher precedence wins, it will replace the other value.
@ -214,7 +214,7 @@ Some users prefer that variables that are hashes (aka 'dictionaries' in Python t
arrays. We generally recommend not using this setting unless you think you have an absolute need for it, and playbooks in the
official examples repos do not use this setting::
#hash_behavior=replace
#hash_behaviour=replace
The valid values are either 'replace' (the default) or 'merge'.