Alternate help syntax - issue 3371
diff --git a/certbot/cli.py b/certbot/cli.py
index d51fd58e06d..4aeac6d348f 100644
--- a/certbot/cli.py
+++ b/certbot/cli.py
@@ -432,6 +432,10 @@ def __init__(self, args, plugins, detect_defaults=False):
 
         self.detect_defaults = detect_defaults
         self.args = args
+
+        if self.args[0] == 'help':
+            self.args[0] = '--help'
+
         self.determine_verb()
         help1 = self.prescan_for_flag("-h", self.help_topics)
         help2 = self.prescan_for_flag("--help", self.help_topics)
diff --git a/certbot/tests/cli_test.py b/certbot/tests/cli_test.py
index b0eb965426b..1fa2004d3a7 100644
--- a/certbot/tests/cli_test.py
+++ b/certbot/tests/cli_test.py
@@ -131,6 +131,26 @@ def test_help(self):
         self.assertTrue("%s" not in out)
         self.assertTrue("{0}" not in out)
 
+    def test_help_no_dashes(self):
+        self._help_output(['help'])  # assert SystemExit is raised here
+
+        out = self._help_output(['help', 'all'])
+        self.assertTrue("--configurator" in out)
+        self.assertTrue("how a cert is deployed" in out)
+        self.assertTrue("--webroot-path" in out)
+        self.assertTrue("--text" not in out)
+        self.assertTrue("--dialog" not in out)
+        self.assertTrue("%s" not in out)
+        self.assertTrue("{0}" not in out)
+
+        out = self._help_output(['help', 'install'])
+        self.assertTrue("--cert-path" in out)
+        self.assertTrue("--key-path" in out)
+
+        out = self._help_output(['help', 'revoke'])
+        self.assertTrue("--cert-path" in out)
+        self.assertTrue("--key-path" in out)
+
     def test_parse_domains(self):
         short_args = ['-d', 'example.com']
         namespace = self.parse(short_args)

I originally followed the approach detailed in the first comment here: https://github.com/certbot/certbot/issues/3371, but realized there was a much shorter way to implement this. (Can easily switch back to the other approach if need be.)

Also, `certbot help --help help -h standalone` works!