Rename --renew-by-default to --force-renewal
diff --git a/docs/using.rst b/docs/using.rst
index ebc3ef6acb4..9ee16dffd22 100644
--- a/docs/using.rst
+++ b/docs/using.rst
@@ -167,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.
diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py
index 00d45b700a5..e0a07a94b4e 100644
--- a/letsencrypt/cli.py
+++ b/letsencrypt/cli.py
@@ -282,7 +282,7 @@ def _treat_as_renewal(config, domains):
 def _should_renew(config, lineage):
     "Return true if any of the circumstances for automatic renewal apply."
     if config.renew_by_default:
-        logger.info("Auto-renewal forced with --renew-by-default...")
+        logger.info("Auto-renewal forced with --force-renewal...")
         return True
     if lineage.should_autorenew(interactive=True):
         logger.info("Cert is due for renewal, auto-renewing...")
@@ -1401,10 +1401,12 @@ def prepare_and_parse_args(plugins, args):
         version="%(prog)s {0}".format(letsencrypt.__version__),
         help="show program's version number and exit")
     helpful.add(
-        "automation", "--renew-by-default", action="store_true",
-        help="Select renewal by default when domains are a superset of a "
-             "previously attained cert (often --keep-until-expiring is "
-             "more appropriate). Implies --expand.")
+        "automation", "--force-renewal", "--renew-by-default",
+        action="store_true", dest="renew_by_default", help="If a certificate "
+             "already exists for the requested domains, renew it now, "
+             "regardless of whether it is near expiry. (Often "
+             "--keep-until-expiring is more appropriate). Also implies "
+             "--expand.")
     helpful.add(
         "automation", "--agree-tos", dest="tos", action="store_true",
         help="Agree to the Let's Encrypt Subscriber Agreement")
