Merge pull request #11360 from mrwacky42/patch-1

Clarify that setting ssh_args trumps control_path

docsite/rst/intro_configuration.rst

@@ -680,7 +680,7 @@ If set, this will pass a specific set of options to Ansible rather than Ansible'
     ssh_args = -o ControlMaster=auto -o ControlPersist=60s
 
 In particular, users may wish to raise the ControlPersist time to encourage performance.  A value of 30 minutes may
-be appropriate.
+be appropriate. If `ssh_args` is set, the default ``control_path`` setting is not used.
 
 .. _control_path:
 
@@ -700,7 +700,7 @@ may wish to shorten the string to something like the below::
 
 Ansible 1.4 and later will instruct users to run with "-vvvv" in situations where it hits this problem
 and if so it is easy to tell there is too long of a Control Path filename.  This may be frequently
-encountered on EC2.
+encountered on EC2. This setting is ignored if ``ssh_args`` is set.
 
 .. _scp_if_ssh: