Merge branch 'master' into warnings-are-errors

certbot-dns-google/certbot_dns_google/__init__.py

@@ -98,7 +98,7 @@ Examples
 
    certbot certonly \\
      --dns-google \\
-     --dns-google-credentials ~/.secrets/certbot/google.ini \\
+     --dns-google-credentials ~/.secrets/certbot/google.json \\
      --dns-google-propagation-seconds 120 \\
      -d example.com
 

certbot/cli.py

@@ -172,10 +172,11 @@ def possible_deprecation_warning(config):
         # need warnings
         return
     if "CERTBOT_AUTO" not in os.environ:
-        logger.warning("You are running with an old copy of letsencrypt-auto that does "
-            "not receive updates, and is less reliable than more recent versions. "
-            "We recommend upgrading to the latest certbot-auto script, or using native "
-            "OS packages.")
+        logger.warning("You are running with an old copy of letsencrypt-auto"
+            " that does not receive updates, and is less reliable than more"
+            " recent versions. The letsencrypt client has also been renamed"
+            " to Certbot. We recommend upgrading to the latest certbot-auto"
+            " script, or using native OS packages.")
         logger.debug("Deprecation warning circumstances: %s / %s", sys.argv[0], os.environ)
 
 

docs/using.rst

@@ -696,7 +696,9 @@ Where are my certificates?
 ==========================
 
 All generated keys and issued certificates can be found in
-``/etc/letsencrypt/live/$domain``. Rather than copying, please point
+``/etc/letsencrypt/live/$domain``. In the case of creating a SAN certificate 
+with multiple alternative names, ``$domain`` is the first domain passed in 
+via -d parameter. Rather than copying, please point
 your (web) server configuration directly to those files (or create
 symlinks). During the renewal_, ``/etc/letsencrypt/live`` is updated
 with the latest necessary files.

letsencrypt-auto-source/letsencrypt-auto

@@ -593,8 +593,7 @@ BootstrapArchCommon() {
   #   - ArchLinux (x86_64)
   #
   # "python-virtualenv" is Python3, but "python2-virtualenv" provides
-  # only "virtualenv2" binary, not "virtualenv" necessary in
-  # ./tools/_venv_common.py
+  # only "virtualenv2" binary, not "virtualenv".
 
   deps="
     python2

letsencrypt-auto-source/pieces/bootstrappers/arch_common.sh

@@ -7,8 +7,7 @@ BootstrapArchCommon() {
   #   - ArchLinux (x86_64)
   #
   # "python-virtualenv" is Python3, but "python2-virtualenv" provides
-  # only "virtualenv2" binary, not "virtualenv" necessary in
-  # ./tools/_venv_common.py
+  # only "virtualenv2" binary, not "virtualenv".
 
   deps="
     python2

tools/_changelog_top.txt

@@ -0,0 +1,21 @@
+## nextversion - master
+
+### Added
+
+*
+
+### Changed
+
+*
+
+### Fixed
+
+*
+
+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:
+
+*
+
+More details about these changes can be found on our GitHub repo.

tools/_release.sh

@@ -65,12 +65,19 @@ if [ "$RELEASE_BRANCH" != "candidate-$version" ] ; then
 fi
 git checkout "$RELEASE_BRANCH"
 
+# Update changelog
+sed -i "s/master/$(date +'%Y-%m-%d')/" CHANGELOG.md
+git add CHANGELOG.md
+git diff --cached
+git commit -m "Update changelog for $version release"
+
 for pkg_dir in $SUBPKGS_NO_CERTBOT certbot-compatibility-test .
 do
   sed -i 's/\.dev0//' "$pkg_dir/setup.py"
   git add "$pkg_dir/setup.py"
 done
 
+
 SetVersion() {
     ver="$1"
     # bumping Certbot's version number is done differently
@@ -232,6 +239,19 @@ echo tar cJvf $name.$rev.tar.xz $name.$rev
 echo gpg2 -U $RELEASE_GPG_KEY --detach-sign --armor $name.$rev.tar.xz
 cd ~-
 
+# Add master section to CHANGELOG.md
+header=$(head -n 4 CHANGELOG.md)
+body=$(sed s/nextversion/$nextversion/ tools/_changelog_top.txt)
+footer=$(tail -n +5 CHANGELOG.md)
+echo "$header
+
+$body
+
+$footer" > CHANGELOG.md
+git add CHANGELOG.md
+git diff --cached
+git commit -m "Add contents to CHANGELOG.md for next version"
+
 echo "New root: $root"
 echo "Test commands (in the letstest repo):"
 echo 'python multitester.py targets.yaml $AWS_KEY $USERNAME scripts/test_leauto_upgrades.sh --alt_pip $YOUR_PIP_REPO --branch public-beta'