4 files changed, 6 insertions, 5 deletions
diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
index 4a09527..465777d 100755
--- a/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@ -86,8 +86,8 @@ gpg_sphere() {
     su_monkeysphere_user "gpg $@"
 }
 
-# load the core fingerprint into the fingerprint variable, using the
-# gpg host secret key
+# output to stdout the core fingerprint from the gpg core secret
+# keyring
 core_fingerprint() {
     log debug "determining core key fingerprint..."
     gpg_core --quiet --list-secret-key \
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 6220760..8562ec6 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -181,7 +181,8 @@ show_key() {
 	| grep '^fpr:' | cut -d: -f10 )
 
     # list the host key info
-    gpg --list-key --fingerprint --list-options show-unusable-uids 2>/dev/null
+    gpg --list-keys --fingerprint \
+	--list-options show-unusable-uids 2>/dev/null
 
     # list the pgp fingerprint
     echo "OpenPGP fingerprint: $HOST_FINGERPRINT"
diff --git a/src/share/ma/diagnostics b/src/share/ma/diagnostics
index 45a8ce2..0411080 100644
--- a/src/share/ma/diagnostics
+++ b/src/share/ma/diagnostics
@@ -120,7 +120,7 @@ fi
 
 if [ "$problemsfound" -gt 0 ]; then
     echo "When the above $problemsfound issue"$(if [ "$problemsfound" -eq 1 ] ; then echo " is" ; else echo "s are" ; fi)" resolved, please re-run:"
-    echo "  monkeysphere-authentication expert diagnostics"
+    echo "  monkeysphere-authentication diagnostics"
 else
     echo "Everything seems to be in order!"
 fi
diff --git a/src/share/mh/diagnostics b/src/share/mh/diagnostics
index 96065e6..d774723 100644
--- a/src/share/mh/diagnostics
+++ b/src/share/mh/diagnostics
@@ -152,7 +152,7 @@ fi
 
 if [ "$problemsfound" -gt 0 ]; then
     echo "When the above $problemsfound issue"$(if [ "$problemsfound" -eq 1 ] ; then echo " is" ; else echo "s are" ; fi)" resolved, please re-run:"
-    echo "  monkeysphere-host expert diagnostics"
+    echo "  monkeysphere-host diagnostics"
 else
     echo "Everything seems to be in order!"
 fi