Fixed nits with plugin choice
diff --git a/letsencrypt/plugins/disco_test.py b/letsencrypt/plugins/disco_test.py
index 8660d94a1cf..293c2b9135b 100644
--- a/letsencrypt/plugins/disco_test.py
+++ b/letsencrypt/plugins/disco_test.py
@@ -50,7 +50,9 @@ def test_entry_point_to_plugin_name(self):
                 name, PluginEntryPoint.entry_point_to_plugin_name(entry_point))
 
     def test_description(self):
-        self.assertEqual("Standalone Authenticator", self.plugin_ep.description)
+        self.assertEqual(
+                "Automatically configure and run a simple webserver",
+                self.plugin_ep.description)
 
     def test_description_with_name(self):
         self.plugin_ep.plugin_cls = mock.MagicMock(description="Desc")
diff --git a/letsencrypt/plugins/manual.py b/letsencrypt/plugins/manual.py
index f7717064b96..cb6c9af7e05 100644
--- a/letsencrypt/plugins/manual.py
+++ b/letsencrypt/plugins/manual.py
@@ -26,13 +26,18 @@
 class Authenticator(common.Plugin):
     """Manual Authenticator.
 
-    .. todo:: Support for `~.challenges.DVSNI`.
+       This plugin requires user's manual intervention in setting up a HTTP
+       server for solving SimpleHTTP challenges and thus does not need to be
+       run as a privilidged process. Alternatively shows instructions on how
+       to use Python's built-in HTTP server.
 
+    .. todo:: Support for `~.challenges.DVSNI`.
     """
     zope.interface.implements(interfaces.IAuthenticator)
     zope.interface.classProvides(interfaces.IPluginFactory)
+    hidden = True
 
-    description = "Manual Authenticator"
+    description = "Manually configure and run a simple Python webserver"
 
     MESSAGE_TEMPLATE = """\
 Make sure your web server displays the following content at
@@ -80,12 +85,11 @@ def prepare(self):  # pylint: disable=missing-docstring,no-self-use
         pass  # pragma: no cover
 
     def more_info(self):  # pylint: disable=missing-docstring,no-self-use
-        return """\
-This plugin requires user's manual intervention in setting up a HTTP
-server for solving SimpleHTTP challenges and thus does not need to be
-run as a privilidged process. Alternatively shows instructions on how
-to use Python's built-in HTTP server and, in case of HTTPS, openssl
-binary for temporary key/certificate generation.""".replace("\n", "")
+        return ("This plugin requires user's manual intervention in setting "
+                "up a HTTP server for solving SimpleHTTP challenges and thus "
+                "does not need to be run as a privilidged process. "
+                "Alternatively shows instructions on how to use Python's "
+                "built-in HTTP server.")
 
     def get_chall_pref(self, domain):
         # pylint: disable=missing-docstring,no-self-use,unused-argument
diff --git a/letsencrypt/plugins/standalone.py b/letsencrypt/plugins/standalone.py
index d4dddc7f617..6fcf62194f9 100644
--- a/letsencrypt/plugins/standalone.py
+++ b/letsencrypt/plugins/standalone.py
@@ -140,12 +140,11 @@ class Authenticator(common.Plugin):
     necessary port in order to respond to incoming DVSNI and SimpleHTTP
     challenges from the certificate authority. Therefore, it does not
     rely on any existing server program.
-
     """
     zope.interface.implements(interfaces.IAuthenticator)
     zope.interface.classProvides(interfaces.IPluginFactory)
 
-    description = "Standalone Authenticator"
+    description = "Automatically configure and run a simple webserver"
 
     def __init__(self, *args, **kwargs):
         super(Authenticator, self).__init__(*args, **kwargs)
@@ -182,7 +181,10 @@ def supported_challenges(self):
                    self.conf("supported-challenges").split(","))
 
     def more_info(self):  # pylint: disable=missing-docstring
-        return self.__doc__
+        return("This authenticator creates its own ephemeral TCP listener "
+                "on the necessary port in order to respond to incoming DVSNI "
+                "and SimpleHTTP challenges from the certificate authority. "
+                "Therefore, it does not rely on any existing server program.")
 
     def prepare(self):  # pylint: disable=missing-docstring
         pass

Changed order of plugins listed - they'll now be reverse alphabetical
Made the descriptions of plugins not mimic their names
Made more_info for standalone work the same way as manual
Made more_info strings not have missing spaces due to stripped \n formatting by adding leading spaces
