Release 1.6.0

certbot/docs/cli-help.txt

@@ -97,6 +97,11 @@ optional arguments:
                         hook commands are not called. (default: False)
   --debug-challenges    After setting up challenges, wait for user input
                         before submitting to CA (default: False)
+  --preferred-chain PREFERRED_CHAIN
+                        If the CA offers multiple certificate chains, prefer
+                        the chain with an issuer matching this Subject Common
+                        Name. If no match, the default offered chain will be
+                        used. (default: None)
   --preferred-challenges PREF_CHALLS
                         A sorted, comma delimited list of the preferred
                         challenge to use during authorization with the most
@@ -113,7 +118,7 @@ optional arguments:
                         case, and to know when to deprecate support for past
                         Python versions and flags. If you wish to hide this
                         information from the Let's Encrypt server, set this to
-                        "". (default: CertbotACMEClient/1.5.0 (certbot(-auto);
+                        "". (default: CertbotACMEClient/1.6.0 (certbot(-auto);
                         OS_NAME OS_VERSION) Authenticator/XXX Installer/YYY
                         (SUBCOMMAND; flags: FLAGS) Py/major.minor.patchlevel).
                         The flags encoded in the user agent are: --duplicate,
@@ -504,6 +509,8 @@ apache:
   --apache-ctl APACHE_CTL
                         Full path to Apache control script (default:
                         apache2ctl)
+  --apache-bin APACHE_BIN
+                        Full path to apache2/httpd binary (default: None)
 
 dns-cloudflare:
   Obtain certificates using a DNS TXT record (if you are using Cloudflare
@@ -671,8 +678,8 @@ manual:
   requested when performing an HTTP-01 challenge. An additional cleanup
   script can also be provided and can use the additional variable
   $CERTBOT_AUTH_OUTPUT which contains the stdout output from the auth
-  script.For both authenticator and cleanup script, on HTTP-01 and DNS-01
-  challenges,$CERTBOT_REMAINING_CHALLENGES will be equal to the number of
+  script. For both authenticator and cleanup script, on HTTP-01 and DNS-01
+  challenges, $CERTBOT_REMAINING_CHALLENGES will be equal to the number of
   challenges that remain after the current one, and $CERTBOT_ALL_DOMAINS
   contains a comma-separated list of all domains that are challenged for the
   current certificate.