Merge branch 'master' into switch-to-cryptography

1 files changed, 4 insertions, 3 deletions

diff --git a/paramiko/packet.py b/paramiko/packet.py
index bdd31efd..00cf5657 100644
--- a/paramiko/packet.py
+++ b/paramiko/packet.py
@@ -204,9 +204,10 @@ class Packetizer (object):
     def handshake_timed_out(self):
         """
         Checks if the handshake has timed out.
-        If `start_handshake` wasn't called before the call to this function
-        the return value will always be `False`.
-        If the handshake completed before a time out was reached the return value will be `False`
+
+        If `start_handshake` wasn't called before the call to this function,
+        the return value will always be `False`. If the handshake completed
+        before a timeout was reached, the return value will be `False`
 
         :return: handshake time out status, as a `bool`
         """