Merge pull request #5268 from mivor/fix-typos

Fix typos in intro_configuration.rst & constants.py

docsite/rst/intro_configuration.rst

@@ -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
 

lib/ansible/constants.py

@@ -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)