Merge branch '2.0' into 2.1

10 files changed, 13 insertions, 13 deletions

diff --git a/paramiko/agent.py b/paramiko/agent.py
index 6a8e7fb4..c13810bb 100644
--- a/paramiko/agent.py
+++ b/paramiko/agent.py
@@ -331,7 +331,7 @@ class Agent(AgentSSH):
     """
     Client interface for using private keys from an SSH agent running on the
     local machine.  If an SSH agent is running, this class can be used to
-    connect to it and retreive `.PKey` objects which can be used when
+    connect to it and retrieve `.PKey` objects which can be used when
     attempting to authenticate to remote SSH servers.
 
     Upon initialization, a session with the local machine's SSH agent is
diff --git a/paramiko/kex_gss.py b/paramiko/kex_gss.py
index 69969f8a..e21d55b9 100644
--- a/paramiko/kex_gss.py
+++ b/paramiko/kex_gss.py
@@ -104,7 +104,7 @@ class KexGSSGroup1(object):
         """
         Parse the next packet.
 
-        :param char ptype: The type of the incomming packet
+        :param char ptype: The type of the incoming packet
         :param `.Message` m: The paket content
         """
         if self.transport.server_mode and (ptype == MSG_KEXGSS_INIT):
@@ -335,7 +335,7 @@ class KexGSSGex(object):
         """
         Parse the next packet.
 
-        :param char ptype: The type of the incomming packet
+        :param char ptype: The type of the incoming packet
         :param `.Message` m: The paket content
         """
         if ptype == MSG_KEXGSS_GROUPREQ:
diff --git a/paramiko/server.py b/paramiko/server.py
index f79a1748..bc4ac071 100644
--- a/paramiko/server.py
+++ b/paramiko/server.py
@@ -385,7 +385,7 @@ class ServerInterface (object):
         :param int pixelheight:
             height of screen in pixels, if known (may be ``0`` if unknown).
         :return:
-            ``True`` if the psuedo-terminal has been allocated; ``False``
+            ``True`` if the pseudo-terminal has been allocated; ``False``
             otherwise.
         """
         return False
diff --git a/paramiko/sftp_client.py b/paramiko/sftp_client.py
index 0df94389..12a9506f 100644
--- a/paramiko/sftp_client.py
+++ b/paramiko/sftp_client.py
@@ -223,7 +223,7 @@ class SFTPClient(BaseSFTP, ClosingContextManager):
         ``read_aheads``, an integer controlling how many
         ``SSH_FXP_READDIR`` requests are made to the server. The default of 50
         should suffice for most file listings as each request/response cycle
-        may contain multiple files (dependant on server implementation.)
+        may contain multiple files (dependent on server implementation.)
 
         .. versionadded:: 1.15
         """
@@ -828,6 +828,6 @@ class SFTPClient(BaseSFTP, ClosingContextManager):
 
 class SFTP(SFTPClient):
     """
-    An alias for `.SFTPClient` for backwards compatability.
+    An alias for `.SFTPClient` for backwards compatibility.
     """
     pass
diff --git a/paramiko/sftp_handle.py b/paramiko/sftp_handle.py
index edceb5ad..05b5e904 100644
--- a/paramiko/sftp_handle.py
+++ b/paramiko/sftp_handle.py
@@ -179,7 +179,7 @@ class SFTPHandle (ClosingContextManager):
 
     def _get_next_files(self):
         """
-        Used by the SFTP server code to retreive a cached directory
+        Used by the SFTP server code to retrieve a cached directory
         listing.
         """
         fnlist = self.__files[:16]
diff --git a/paramiko/sftp_si.py b/paramiko/sftp_si.py
index 61db956c..7ab00ad7 100644
--- a/paramiko/sftp_si.py
+++ b/paramiko/sftp_si.py
@@ -208,7 +208,7 @@ class SFTPServerInterface (object):
 
         The ``attr`` object will contain only those fields provided by the
         client in its request, so you should use ``hasattr`` to check for
-        the presense of fields before using them.  In some cases, the ``attr``
+        the presence of fields before using them.  In some cases, the ``attr``
         object may be completely empty.
 
         :param str path:
diff --git a/paramiko/transport.py b/paramiko/transport.py
index 7906c9f2..49a239c2 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -512,7 +512,7 @@ class Transport (threading.Thread, ClosingContextManager):
         be triggered.  On failure, `is_active` will return ``False``.
 
         (Since 1.4) If ``event`` is ``None``, this method will not return until
-        negotation is done.  On success, the method returns normally.
+        negotiation is done.  On success, the method returns normally.
         Otherwise an SSHException is raised.
 
         After a successful negotiation, the client will need to authenticate.
@@ -2296,7 +2296,7 @@ class Transport (threading.Thread, ClosingContextManager):
             finally:
                 self.lock.release()
             if kind == 'direct-tcpip':
-                # handle direct-tcpip requests comming from the client
+                # handle direct-tcpip requests coming from the client
                 dest_addr = m.get_text()
                 dest_port = m.get_int()
                 origin_addr = m.get_text()
diff --git a/tests/stub_sftp.py b/tests/stub_sftp.py
index 24380ba1..5fcca386 100644
--- a/tests/stub_sftp.py
+++ b/tests/stub_sftp.py
@@ -55,7 +55,7 @@ class StubSFTPHandle (SFTPHandle):
 
 class StubSFTPServer (SFTPServerInterface):
     # assume current folder is a fine root
-    # (the tests always create and eventualy delete a subfolder, so there shouldn't be any mess)
+    # (the tests always create and eventually delete a subfolder, so there shouldn't be any mess)
     ROOT = os.getcwd()
         
     def _realpath(self, path):
diff --git a/tests/test_client.py b/tests/test_client.py
index 32d9ac60..5f4f0dd5 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -367,7 +367,7 @@ class SSHClientTest (unittest.TestCase):
         # NOTE: re #387, re #394
         # If pkey module used within Client._auth isn't correctly handling auth
         # errors (e.g. if it allows things like ValueError to bubble up as per
-        # midway thru #394) client.connect() will fail (at key load step)
+        # midway through #394) client.connect() will fail (at key load step)
         # instead of succeeding (at password step)
         kwargs = dict(
             # Password-protected key whose passphrase is not 'pygmalion' (it's
diff --git a/tests/test_sftp.py b/tests/test_sftp.py
index e4c2c3a3..d3064fff 100755
--- a/tests/test_sftp.py
+++ b/tests/test_sftp.py
@@ -413,7 +413,7 @@ class SFTPTest (unittest.TestCase):
     def test_A_readline_seek(self):
         """
         create a text file and write a bunch of text into it.  then count the lines
-        in the file, and seek around to retreive particular lines.  this should
+        in the file, and seek around to retrieve particular lines.  this should
         verify that read buffering and 'tell' work well together, and that read
         buffering is reset on 'seek'.
         """