diff --git a/docs/challenges.rst b/docs/challenges.rst index fa0a6ca58..25d190147 100644 --- a/docs/challenges.rst +++ b/docs/challenges.rst @@ -2,7 +2,7 @@ Challenges ========== To receive a certificate from Let's Encrypt certificate authority (CA), you must pass a *challenge* to -prove you control each of the domain names that will be listed in the certificate. A challenge is one of +prove you control each of the domain names that will be listed in the certificate. A challenge is one of three tasks that only someone who controls the domain should be able to accomplish: * Posting a specified file in a specified location on a web site (the HTTP-01 challenge) @@ -72,8 +72,8 @@ TLS-SNI-01 Challenge * When using the Apache plugin, make sure you are running Apache and no other web server on port 443. * When using the NGINX plugin, make sure you are running NGINX and no other web server on port 443. * With either the Apache or NGINX plugin, certbot modifies your web server configuration. If you get - an installation error then you have received a certificate but the plugin was unable to modify - your web server configuration, meaning that you'll have to install the certificate manually. + an error after successfully completing the challenge, then you have received a certificate but the + plugin was unable to modify your web server configuration, meaning that you'll have to install the certificate manually. In that case, please file a bug to help us improve certbot! * When using the Standalone plugin, make sure another program is not already listening to port 443 on the server. diff --git a/docs/using.rst b/docs/using.rst index ef81f400e..aae8efbf2 100644 --- a/docs/using.rst +++ b/docs/using.rst @@ -61,7 +61,7 @@ manual_ Y N | Helps you obtain a certificate by giving you instruction =========== ==== ==== =============================================================== ============================= Under the hood, plugins use one of several ACME protocol challenges_ to -prove you control a domain. The options are http-01_ (which uses port 80), +prove you control a domain. The options are http-01_ (which uses port 80), tls-sni-01_ (port 443) and dns-01_ (requiring configuration of a DNS server on port 53, though that's often not the same machine as your webserver). A few plugins support more than one challenge type, in which case you can choose one @@ -102,7 +102,7 @@ If you're getting a certificate for many domains at once, the plugin needs to know where each domain's files are served from, which could potentially be a separate directory for each domain. When requesting a certificate for multiple domains, each domain will use the most recently -specified ``--webroot-path``. So, for instance, +specified ``--webroot-path``. So, for instance, :: @@ -332,7 +332,7 @@ Example: .. code-block:: none - certbot --expand -d existing.com example.com,newdomain.com + certbot --expand -d existing.com,example.com,newdomain.com If you prefer, you can specify the domains individually like this: @@ -823,7 +823,7 @@ changed by passing the desired number to the command line flag Certbot command-line options ============================ -Certbot supports a lot of command line options. Here's the full list, from +Certbot supports a lot of command line options. Here's the full list, from ``certbot --help all``: .. literalinclude:: cli-help.txt