diff --git a/lib/ssh.py b/lib/ssh.py
index cb7aa186a31f085abd320416e9cf6b1cea671a8f..8daf579de25d28e8067fee5a03eaef53dd7272fd 100644
--- a/lib/ssh.py
+++ b/lib/ssh.py
@@ -34,11 +34,11 @@ from ganeti import constants
 
 
 def FormatParamikoFingerprint(fingerprint):
-  """Formats the fingerprint of L{paramiko.PKey.get_fingerprint()}
+  """Format paramiko PKey fingerprint.
 
   @type fingerprint: str
   @param fingerprint: PKey fingerprint
-  @return The string hex representation of the fingerprint
+  @return: The string hex representation of the fingerprint
 
   """
   assert len(fingerprint) % 2 == 0
diff --git a/tools/setup-ssh b/tools/setup-ssh
index 2dd2c9ab601617ccb7611be34ae4fe98dd23fb18..b57d842ed16ef658118cda6fde78a52e40feea3e 100755
--- a/tools/setup-ssh
+++ b/tools/setup-ssh
@@ -231,7 +231,7 @@ def SetupLogging(options):
 
 
 def LoadPrivateKeys(options):
-  """Load the list of available private keys
+  """Load the list of available private keys.
 
   It loads the standard ssh key from disk and then tries to connect to
   the ssh agent too.
@@ -298,9 +298,9 @@ def LoginViaKeys(transport, username, keys):
 
 
 def LoadKnownHosts():
-  """Loads the known hosts
+  """Load the known hosts.
 
-    @return L{paramiko.util.load_host_keys} dict
+  @return: paramiko.util.load_host_keys dict
 
   """
   homedir = utils.GetHomeDir(constants.GANETI_RUNAS)