Fixed nits with plugin choice

letsencrypt/display/ops.py

@@ -74,7 +74,7 @@ def pick_plugin(config, default, plugins, question, ifaces):
 
     if len(prepared) > 1:
         logger.debug("Multiple candidate plugins: %s", prepared)
-        plugin_ep = choose_plugin(prepared.values(), question)
+        plugin_ep = choose_plugin(prepared.values()[::-1], question)
         if plugin_ep is None:
             return None
         else:

letsencrypt/plugins/manual.py

@@ -32,7 +32,7 @@ class Authenticator(common.Plugin):
     zope.interface.implements(interfaces.IAuthenticator)
     zope.interface.classProvides(interfaces.IPluginFactory)
 
-    description = "Manual Authenticator"
+    description = "Manually Edit Your Configuration"
 
     MESSAGE_TEMPLATE = """\
 Make sure your web server displays the following content at
@@ -82,10 +82,10 @@ s.serve_forever()" """
     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", "")
+ 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", "")
 
     def get_chall_pref(self, domain):
         # pylint: disable=missing-docstring,no-self-use,unused-argument

letsencrypt/plugins/standalone.py

@@ -134,18 +134,10 @@ def supported_challenges_validator(data):
 
 
 class Authenticator(common.Plugin):
-    """Standalone Authenticator.
-
-    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.
-
-    """
     zope.interface.implements(interfaces.IAuthenticator)
     zope.interface.classProvides(interfaces.IPluginFactory)
 
-    description = "Standalone Authenticator"
+    description = "LE Will Automatically Test Your Domain"
 
     def __init__(self, *args, **kwargs):
         super(Authenticator, self).__init__(*args, **kwargs)
@@ -182,7 +174,11 @@ class Authenticator(common.Plugin):
                    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.""".replace("\n","")
 
     def prepare(self):  # pylint: disable=missing-docstring
         pass