summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-09-18 17:55:16 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-09-18 17:55:16 -0700
commit83f54e4f6cfebb0b90e8e2061ef5ccd3000a5bfe (patch)
tree2ded50e546dbd0c137e0c582be2b68cc1561963c
parent233f0a422e3384584e20eff7330a536230d3cd31 (diff)
And moar
-rw-r--r--paramiko/kex_gex.py2
-rw-r--r--paramiko/transport.py5
2 files changed, 3 insertions, 4 deletions
diff --git a/paramiko/kex_gex.py b/paramiko/kex_gex.py
index 02e507b7..a7cfb7c9 100644
--- a/paramiko/kex_gex.py
+++ b/paramiko/kex_gex.py
@@ -19,7 +19,7 @@
"""
Variant on `KexGroup1 <paramiko.kex_group1.KexGroup1>` where the prime "p" and
generator "g" are provided by the server. A bit more work is required on the
-client side, and a B{lot} more on the server side.
+client side, and a **lot** more on the server side.
"""
from Crypto.Hash import SHA
diff --git a/paramiko/transport.py b/paramiko/transport.py
index d904da1d..4b91a434 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -963,10 +963,9 @@ class Transport (threading.Thread):
def get_banner(self):
"""
Return the banner supplied by the server upon connect. If no banner is
- supplied, this method returns C{None}.
+ supplied, this method returns ``None``.
- @return: server supplied banner, or C{None}.
- @rtype: string
+ :returns: server supplied banner (`str`), or ``None``.
"""
if not self.active or (self.auth_handler is None):
return None