Merge remote-tracking branch 'origin/master' into force_renewal_option

Conflicts:
	letsencrypt/cli.py

Mention --force-renew instead of --renew-by-default in docs/using.rst.

docs/api/renewer.rst

@@ -1,5 +0,0 @@
-:mod:`letsencrypt.renewer`
---------------------------
-
-.. automodule:: letsencrypt.renewer
-   :members:

docs/ciphers.rst

@@ -107,7 +107,7 @@ and the version implemented by the Let's Encrypt client will be the
 version that was most current as of the release date of each client
 version. Mozilla offers three separate sets of cryptographic options,
 which trade off security and compatibility differently. These are
-referred to as as the "Modern", "Intermediate", and "Old" configurations
+referred to as the "Modern", "Intermediate", and "Old" configurations
 (in order from most secure to least secure, and least-backwards compatible
 to most-backwards compatible). The client will follow the Mozilla defaults
 for the *Intermediate* configuration by default, at least with regards to

docs/conf.py

@@ -281,8 +281,6 @@ man_pages = [
      [project], 7),
     ('man/letsencrypt', 'letsencrypt', u'letsencrypt script documentation',
      [project], 1),
-    ('man/letsencrypt-renewer', 'letsencrypt-renewer',
-     u'letsencrypt-renewer script documentation', [project], 1),
 ]
 
 # If true, show URL addresses after external links.

docs/contributing.rst

@@ -23,7 +23,7 @@ once:
    git clone https://github.com/letsencrypt/letsencrypt
    cd letsencrypt
    ./letsencrypt-auto-source/letsencrypt-auto --os-packages-only
-   ./bootstrap/dev/venv.sh
+   ./tools/venv.sh
 
 Then in each shell where you're working on the client, do:
 
@@ -300,7 +300,7 @@ Steps:
 
 1. Write your code!
 2. Make sure your environment is set up properly and that you're in your
-   virtualenv. You can do this by running ``./bootstrap/dev/venv.sh``.
+   virtualenv. You can do this by running ``./tools/venv.sh``.
    (this is a **very important** step)
 3. Run ``./pep8.travis.sh`` to do a cursory check of your code style.
    Fix any errors.

docs/man/letsencrypt-renewer.rst

@@ -1 +0,0 @@
-.. program-output:: letsencrypt-renewer --help

docs/using.rst

@@ -16,27 +16,12 @@ letsencrypt-auto
 ----------------
 
 ``letsencrypt-auto`` is a wrapper which installs some dependencies
-from your OS standard package repositories (e.g using `apt-get` or
+from your OS standard package repositories (e.g. using `apt-get` or
 `yum`), and for other dependencies it sets up a virtualized Python
 environment with packages downloaded from PyPI [#venv]_. It also
 provides automated updates.
 
-Firstly, please `install Git`_ and run the following commands:
-
-.. code-block:: shell
-
-   git clone https://github.com/letsencrypt/letsencrypt
-   cd letsencrypt
-
-
-.. _`install Git`: https://git-scm.com/book/en/v2/Getting-Started-Installing-Git
-
-.. note:: On RedHat/CentOS 6 you will need to enable the EPEL_
-   repository before install.
-
-.. _EPEL: http://fedoraproject.org/wiki/EPEL
-
-To install and run the client you just need to type:
+To install and run the client, just type...
 
 .. code-block:: shell
 
@@ -182,18 +167,19 @@ interested, you can also :ref:`write your own plugin <dev-plugin>`.
 Renewal
 =======
 
-.. note:: Let's Encrypt CA issues short lived certificates (90
+.. note:: Let's Encrypt CA issues short-lived certificates (90
    days). Make sure you renew the certificates at least once in 3
    months.
 
 In order to renew certificates simply call the ``letsencrypt`` (or
-letsencrypt-auto_) again, and use the same values when prompted. You
-can automate it slightly by passing necessary flags on the CLI (see
-`--help all`), or even further using the :ref:`config-file`. The
-``--renew-by-default`` flag may be helpful for automating renewal. If
-you're sure that UI doesn't prompt for any details you can add the
-command to ``crontab`` (make it less than every 90 days to avoid
-problems, say every month).
+letsencrypt-auto_) again, and use the same values when prompted. You can
+automate it slightly by passing necessary flags on the CLI (see `--help
+all`), or even further using the :ref:`config-file`. The ``--force-renew``
+flag may be helpful for automating renewal; it causes the expiration time
+of the certificate(s) to be ignored when considering renewal.  If you're
+sure that UI doesn't prompt for any details you can add the command to
+``crontab`` (make it less than every 90 days to avoid problems, say
+every month).
 
 Please note that the CA will send notification emails to the address
 you provide if you do not renew certificates that are about to expire.