Merge pull request #4824 from mattwillsh/devel

Correct docsite typo hash_behavior -> hash_behaviour
This commit is contained in:
jctanner 2013-11-06 22:48:12 -08:00
commit e9ad19f593

View file

@ -204,8 +204,8 @@ is very very conservative::
forks=5 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 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. 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 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:: official examples repos do not use this setting::
#hash_behavior=replace #hash_behaviour=replace
The valid values are either 'replace' (the default) or 'merge'. The valid values are either 'replace' (the default) or 'merge'.