Fix some epydoc warnings

Signed-off-by: Manuel Franceschini <livewire@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

diff --git a/lib/ssh.py b/lib/ssh.py
index cb7aa18..8daf579 100644 (file)
--- 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 2dd2c9a..b57d842 100755 (executable)
--- 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)