Merge branch 'master' into candidate-0.35.1

Author: ohemorange

.github/stale.yml

@@ -11,15 +11,15 @@ daysUntilClose: 7
 exemptAssignees: true
 
 # Label to use when marking as stale
-staleLabel: stale
+staleLabel: needs-update
 
 # Comment to post when marking as stale. Set to `false` to disable
 markComment: >
-  To help us better see what issues are still affecting our users, this issue
-  has been automatically marked as stale. If you still have this issue with an
-  up-to-date version of Certbot and are interested in seeing it resolved,
-  please add a comment letting us know. If there is no further activity, this
-  issue will be automatically closed.
+  We've made a lot of changes to Certbot since this issue was opened. If you
+  still have this issue with an up-to-date version of Certbot, can you please
+  add a comment letting us know? This helps us to better see what issues are
+  still affecting our users. If there is no further activity, this issue will
+  be automatically closed.
 
 # Comment to post when closing a stale Issue or Pull Request.
 closeComment: >

CHANGELOG.md

@@ -10,7 +10,9 @@ Certbot adheres to [Semantic Versioning](https://semver.org/).
 
 ### Changed
 
-*
+* Update the 'manage your account' help to be more generic.
+* The error message when Certbot's Apache plugin is unable to modify your
+  Apache configuration has been improved.
 
 ### Fixed
 
@@ -20,7 +22,8 @@ Despite us having broken lockstep, we are continuing to release new versions of
 all Certbot components during releases for the time being, however, the only
 package with changes other than its version number was:
 
-*
+* certbot
+* certbot-apache
 
 More details about these changes can be found on our GitHub repo.
 
@@ -45,8 +48,8 @@ More details about these changes can be found on our GitHub repo.
 
 ### Added
 
-* dns_rfc2136 plugin now supports explicitly specifing an authorative 
-  base domain for cases when the automatic method does not work (e.g. 
+* dns_rfc2136 plugin now supports explicitly specifing an authorative
+  base domain for cases when the automatic method does not work (e.g.
   Split horizon DNS)
 
 ### Changed

certbot-apache/certbot_apache/configurator.py

@@ -276,7 +276,10 @@ def prepare(self):
             util.lock_dir_until_exit(self.option("server_root"))
         except (OSError, errors.LockError):
             logger.debug("Encountered error:", exc_info=True)
-            raise errors.PluginError("Unable to lock {0}".format(self.option("server_root")))
+            raise errors.PluginError(
+                "Unable to create a lock file in {0}. Are you running"
+                " Certbot with sufficient privileges to modify your"
+                " Apache configuration?".format(self.option("server_root")))
         self._prepared = True
 
     def _verify_exe_availability(self, exe):

certbot/cli.py

@@ -96,10 +96,10 @@
     revoke          Revoke a certificate (supply --cert-path or --cert-name)
     delete          Delete a certificate
 
-manage your account with Let's Encrypt:
-    register        Create a Let's Encrypt ACME account
-    unregister      Deactivate a Let's Encrypt ACME account
-    update_account  Update a Let's Encrypt ACME account
+manage your account:
+    register        Create an ACME account
+    unregister      Deactivate an ACME account
+    update_account  Update an ACME account
   --agree-tos       Agree to the ACME server's Subscriber Agreement
    -m EMAIL         Email address for important account notifications
 """