Merge branch 'master' into issue_4519

This commit is contained in:
Brad Warren
2017-05-26 15:56:26 -07:00
committed by GitHub
37 changed files with 901 additions and 88 deletions
+2
View File
@@ -1238,6 +1238,8 @@ def _plugins_parsing(helpful, plugins):
helpful.add(["plugins", "certonly"], "--dns-google", action="store_true",
help=('Obtain certificates using a DNS TXT record (if you are '
'using Google Cloud DNS).'))
helpful.add(["plugins", "certonly"], "--dns-nsone", action="store_true",
help='Obtain certs using a DNS TXT record (if you are using NS1 for DNS).')
# things should not be reorder past/pre this comment:
# plugins_group should be displayed in --help before plugin