From 5509420637163153ca5e29215db0512d989b8a6d Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Thu, 15 Oct 2020 14:11:43 -0400
Subject: [PATCH 1/2] s/Days/Retention Days/ on the backup settings page

---
 management/templates/system-backup.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/management/templates/system-backup.html b/management/templates/system-backup.html
index 3860edb7..6afe62c8 100644
--- a/management/templates/system-backup.html
+++ b/management/templates/system-backup.html
@@ -113,10 +113,10 @@
   </div>
   <!-- Common -->
   <div class="form-group backup-target-local backup-target-rsync backup-target-s3">
-    <label for="min-age" class="col-sm-2 control-label">Days:</label>
+    <label for="min-age" class="col-sm-2 control-label">Retention Days:</label>
     <div class="col-sm-8">
       <input type="number" class="form-control" rows="1" id="min-age">
-      <div class="small" style="margin-top: 2px">This is the <i>minimum</i> number of days backup data is kept for. The box makes an incremental backup, so backup data is often kept much longer. An incremental backup file that is less than this number of days old requires that all previous increments back to the most recent full backup, plus that full backup, remain available.</div>
+      <div class="small" style="margin-top: 2px">This is the minimum time backup data is kept for. The box makes an incremental backup most nights, which requires that previous backups back to the most recent full backup be preserved, so backup data is often kept much longer than this setting. Full backups are made periodically when the incremental backup data size exceeds a limit.</div>
     </div>
   </div>
   <div class="form-group">

From 8b166f30415611c6f3c846065a1b9a67c5d12de2 Mon Sep 17 00:00:00 2001
From: David Duque <david@davness.dev>
Date: Fri, 16 Oct 2020 21:22:36 +0100
Subject: [PATCH 2/2] Display certificate expiry dates in ISO format (#1841)

---
 management/ssl_certificates.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/management/ssl_certificates.py b/management/ssl_certificates.py
index 1b1e9f83..3e1b5856 100755
--- a/management/ssl_certificates.py
+++ b/management/ssl_certificates.py
@@ -216,12 +216,12 @@ def get_certificates_to_provision(env, limit_domains=None, show_valid_certs=True
 				response = query_dns(domain, rtype)
 				if response != normalize_ip(value):
 					bad_dns.append("%s (%s)" % (response, rtype))
-	
+
 			if bad_dns:
 				domains_cant_provision[domain] = "The domain name does not resolve to this machine: " \
 					+ (", ".join(bad_dns)) \
 					+ "."
-			
+
 			else:
 				# DNS is all good.
 
@@ -606,10 +606,10 @@ def check_certificate(domain, ssl_certificate, ssl_private_key, warn_if_expiring
 		ndays = (cert_expiration_date-now).days
 		if not rounded_time or ndays <= 10:
 			# Yikes better renew soon!
-			expiry_info = "The certificate expires in %d days on %s." % (ndays, cert_expiration_date.strftime("%x"))
+			expiry_info = "The certificate expires in %d days on %s." % (ndays, cert_expiration_date.date().isoformat())
 		else:
 			# We'll renew it with Lets Encrypt.
-			expiry_info = "The certificate expires on %s." % cert_expiration_date.strftime("%x")
+			expiry_info = "The certificate expires on %s." % cert_expiration_date.date().isoformat()
 
 		if warn_if_expiring_soon and ndays <= warn_if_expiring_soon:
 			# Warn on day 10 to give 4 days for us to automatically renew the