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

Merge pull request #5268 from mivor/fix-typos

Browse source 
Fix typos in intro_configuration.rst & constants.py
This commit is contained in:
Michael DeHaan 2013-12-12 10:15:12 -08:00
commit bddaace970
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docsite/rst/intro_configuration.rst
View file

@ -10,7 +10,7 @@ The mechanism for doing this is the "ansible.cfg" file, which is looked for in t
* /etc/ansible/ansible.cfg
* ~/.ansible.cfg
* ansible.cfg (in the playbook directory)
* ansible.cfg (in the current directory)
If multiple file locations matching the above exist, the last location on the above list is used. Settings in files
are not merged together.
@ -319,7 +319,7 @@ nocolor
=======
By default ansible will try to colorize output to give a better indication of failure and status information.
If you dislike this behavior you can turn it off by setting 'nocolor' to 0::
If you dislike this behavior you can turn it off by setting 'nocolor' to 1::
nocolor=0

2
lib/ansible/constants.py
View file

@ -42,7 +42,7 @@ def get_config(p, section, key, env_var, default, boolean=False, integer=False,
return float(value)
return value
def _get_config(p, section, key, env_var, default, boolean=True):
def _get_config(p, section, key, env_var, default):
''' helper function for get_config '''
if env_var is not None:
value = os.environ.get(env_var, None)