corrected all missing paths changes

docsite/rst/developing_plugins.rst

@@ -21,7 +21,7 @@ Carrier Pigeon?) it's as simple as copying the format of one of the existing mod
 directory.   The value of 'smart' for a connection allows selection of paramiko or openssh based on system capabilities, and chooses
 'ssh' if OpenSSH supports ControlPersist, in Ansible 1.2.1 an later.  Previous versions did not support 'smart'.
 
-More documentation on writing connection plugins is pending, though you can jump into `lib/ansible/plugins/connections <https://github.com/ansible/ansible/tree/devel/lib/ansible/plugins/connections>`_ and figure things out pretty easily.
+More documentation on writing connection plugins is pending, though you can jump into `lib/ansible/plugins/connection <https://github.com/ansible/ansible/tree/devel/lib/ansible/plugins/connection>`_ and figure things out pretty easily.
 
 .. _developing_lookup_plugins:
 

lib/ansible/playbook/role/__init__.py

@@ -45,7 +45,7 @@ __all__ = ['Role', 'hash_params']
 # FIXME: this should be a utility function, but can't be a member of
 #        the role due to the fact that it would require the use of self
 #        in a static method. This is also used in the base class for
-#        strategies (ansible/plugins/strategies/__init__.py)
+#        strategies (ansible/plugins/strategy/__init__.py)
 def hash_params(params):
     if not isinstance(params, dict):
         return params

lib/ansible/plugins/connection/chroot.py

@@ -27,7 +27,7 @@ import traceback
 
 from ansible import constants as C
 from ansible.errors import AnsibleError
-from ansible.plugins.connections import ConnectionBase
+from ansible.plugins.connection import ConnectionBase
 from ansible.utils.path import is_executable
 from ansible.utils.unicode import to_bytes
 

lib/ansible/plugins/connection/docker.py

@@ -31,7 +31,7 @@ from distutils.version import LooseVersion
 import ansible.constants as C
 
 from ansible import errors
-from ansible.plugins.connections import ConnectionBase
+from ansible.plugins.connection import ConnectionBase
 
 BUFSIZE = 65536
 

lib/ansible/plugins/connection/local.py

@@ -28,7 +28,7 @@ import fcntl
 import ansible.constants as C
 
 from ansible.errors import AnsibleError, AnsibleFileNotFound
-from ansible.plugins.connections import ConnectionBase
+from ansible.plugins.connection import ConnectionBase
 
 class Connection(ConnectionBase):
     ''' Local based connections '''

lib/ansible/plugins/connection/paramiko_ssh.py

@@ -43,7 +43,7 @@ from six import iteritems
 
 from ansible import constants as C
 from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound
-from ansible.plugins.connections import ConnectionBase
+from ansible.plugins.connection import ConnectionBase
 from ansible.utils.path import makedirs_safe
 
 AUTHENTICITY_MSG="""

lib/ansible/plugins/connection/ssh.py

@@ -36,7 +36,7 @@ from hashlib import sha1
 
 from ansible import constants as C
 from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound
-from ansible.plugins.connections import ConnectionBase
+from ansible.plugins.connection import ConnectionBase
 from ansible.utils.path import unfrackpath, makedirs_safe
 
 class Connection(ConnectionBase):

lib/ansible/plugins/connection/winrm.py

@@ -42,7 +42,7 @@ except ImportError:
 
 from ansible import constants as C
 from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound
-from ansible.plugins.connections import ConnectionBase
+from ansible.plugins.connection import ConnectionBase
 from ansible.plugins import shell_loader
 from ansible.utils.path import makedirs_safe
 from ansible.utils.unicode import to_bytes, to_unicode

lib/ansible/plugins/strategy/free.py

@@ -23,7 +23,7 @@ import time
 
 from ansible.errors import *
 from ansible.playbook.included_file import IncludedFile
-from ansible.plugins.strategies import StrategyBase
+from ansible.plugins.strategy import StrategyBase
 
 try:
     from __main__ import display

lib/ansible/plugins/strategy/linear.py

@@ -27,7 +27,7 @@ from ansible.playbook.block import Block
 from ansible.playbook.included_file import IncludedFile
 from ansible.playbook.task import Task
 from ansible.plugins import action_loader
-from ansible.plugins.strategies import StrategyBase
+from ansible.plugins.strategy import StrategyBase
 from ansible.template import Templar
 
 try:

test/units/plugins/connections/test_connection.py

@@ -24,16 +24,16 @@ from six import StringIO
 from ansible.compat.tests import unittest
 from ansible.playbook.play_context import PlayContext
 
-from ansible.plugins.connections import ConnectionBase
-#from ansible.plugins.connections.accelerate import Connection as AccelerateConnection
-#from ansible.plugins.connections.chroot import Connection as ChrootConnection
-#from ansible.plugins.connections.funcd import Connection as FuncdConnection
-#from ansible.plugins.connections.jail import Connection as JailConnection
-#from ansible.plugins.connections.libvirt_lxc import Connection as LibvirtLXCConnection
-from ansible.plugins.connections.local import Connection as LocalConnection
-from ansible.plugins.connections.paramiko_ssh import Connection as ParamikoConnection
-from ansible.plugins.connections.ssh import Connection as SSHConnection
-#from ansible.plugins.connections.winrm import Connection as WinRmConnection
+from ansible.plugins.connection import ConnectionBase
+#from ansible.plugins.connection.accelerate import Connection as AccelerateConnection
+#from ansible.plugins.connection.chroot import Connection as ChrootConnection
+#from ansible.plugins.connection.funcd import Connection as FuncdConnection
+#from ansible.plugins.connection.jail import Connection as JailConnection
+#from ansible.plugins.connection.libvirt_lxc import Connection as LibvirtLXCConnection
+from ansible.plugins.connection.local import Connection as LocalConnection
+from ansible.plugins.connection.paramiko_ssh import Connection as ParamikoConnection
+from ansible.plugins.connection.ssh import Connection as SSHConnection
+#from ansible.plugins.connection.winrm import Connection as WinRmConnection
 
 class TestConnectionBaseClass(unittest.TestCase):
 

test/units/plugins/strategies/test_strategy_base.py

@@ -23,7 +23,7 @@ from ansible.compat.tests import unittest
 from ansible.compat.tests.mock import patch, MagicMock
 
 from ansible.errors import AnsibleError, AnsibleParserError
-from ansible.plugins.strategies import StrategyBase
+from ansible.plugins.strategy import StrategyBase
 from ansible.executor.task_queue_manager import TaskQueueManager
 from ansible.executor.task_result import TaskResult
 

test/units/template/test_templar.py

@@ -25,7 +25,7 @@ from ansible.compat.tests.mock import patch, MagicMock
 from ansible import constants as C
 from ansible.errors import *
 from ansible.plugins import filter_loader, lookup_loader, module_loader
-from ansible.plugins.strategies import SharedPluginLoaderObj
+from ansible.plugins.strategy import SharedPluginLoaderObj
 from ansible.template import Templar
 
 from units.mock.loader import DictDataLoader