diff options
-rw-r--r-- | paramiko/dsskey.py | 4 | ||||
-rw-r--r-- | paramiko/rsakey.py | 4 | ||||
-rw-r--r-- | paramiko/transport.py | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/paramiko/dsskey.py b/paramiko/dsskey.py index ae290a73..612e1f83 100644 --- a/paramiko/dsskey.py +++ b/paramiko/dsskey.py @@ -145,9 +145,9 @@ class DSSKey (PKey): generate a new host key or authentication key. @param bits: number of bits the generated key should be. - @type bites: int + @type bits: int @param progress_func: an optional function to call at key points in - key generation (used by L{pyCrypto.PublicKey}). + key generation (used by C{pyCrypto.PublicKey}). @type progress_func: function @return: new private key @rtype: L{DSSKey} diff --git a/paramiko/rsakey.py b/paramiko/rsakey.py index e9fe911e..23fc6152 100644 --- a/paramiko/rsakey.py +++ b/paramiko/rsakey.py @@ -136,9 +136,9 @@ class RSAKey (PKey): generate a new host key or authentication key. @param bits: number of bits the generated key should be. - @type bites: int + @type bits: int @param progress_func: an optional function to call at key points in - key generation (used by L{pyCrypto.PublicKey}). + key generation (used by C{pyCrypto.PublicKey}). @type progress_func: function @return: new private key @rtype: L{RSAKey} diff --git a/paramiko/transport.py b/paramiko/transport.py index 467c6727..57bb4dbb 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -348,13 +348,14 @@ class BaseTransport (threading.Thread): Return the host key of the server (in client mode). @note: Previously this call returned a tuple of (key type, key string). - You can get the same effect by calling L{PKey.get_name} for the key - type, and C{str(key)} for the key string. + You can get the same effect by calling + L{PKey.get_name <pkey.PKey.get_name>} for the key type, and C{str(key)} + for the key string. @raise SSHException: if no session is currently active. @return: public key of the remote server. - @rtype: L{PKey} + @rtype: L{PKey <pkey.PKey>} """ if (not self.active) or (not self.initial_kex_done): raise SSHException('No existing session') |