From 8f6d9c4cf0c36180ad26bb84cdbb55b503a942e2 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Fri, 21 Feb 2020 08:53:01 +0000
Subject: Small grammar fixes to the ACME v1 deprecation notice (#6944)

Some small fixes to the copy in #6907.
---
 INSTALL.md               |  9 ++++-----
 changelog.d/6944.doc     |  1 +
 synapse/handlers/acme.py | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 changelog.d/6944.doc

diff --git a/INSTALL.md b/INSTALL.md
index 9fe767704b..aa5eb882bb 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -420,11 +420,10 @@ so, you will need to edit `homeserver.yaml`, as follows:
   Note that, as pointed out in that document, this feature will not
   work with installs set up after November 2020. 
   
-  If you are using your
-  own certificate, be sure to use a `.pem` file that includes the full
-  certificate chain including any intermediate certificates (for
-  instance, if using certbot, use `fullchain.pem` as your certificate,
-  not `cert.pem`).
+  If you are using your own certificate, be sure to use a `.pem` file that
+  includes the full certificate chain including any intermediate certificates
+  (for instance, if using certbot, use `fullchain.pem` as your certificate, not
+  `cert.pem`).
 
 For a more detailed guide to configuring your server for federation, see
 [federate.md](docs/federate.md)
diff --git a/changelog.d/6944.doc b/changelog.d/6944.doc
new file mode 100644
index 0000000000..eb0c534b56
--- /dev/null
+++ b/changelog.d/6944.doc
@@ -0,0 +1 @@
+Small grammatical fixes to the ACME v1 deprecation notice.
\ No newline at end of file
diff --git a/synapse/handlers/acme.py b/synapse/handlers/acme.py
index 250faa997b..a2d7959abe 100644
--- a/synapse/handlers/acme.py
+++ b/synapse/handlers/acme.py
@@ -27,11 +27,11 @@ logger = logging.getLogger(__name__)
 
 ACME_REGISTER_FAIL_ERROR = """
 --------------------------------------------------------------------------------
-Failed to register with the ACME provider. This is likely happening because the install
-is new, and ACME v1 has been deprecated by Let's Encrypt and is disabled for installs set
-up after November 2019.
-At the moment, Synapse doesn't support ACME v2. For more info and alternative solution,
-check out https://github.com/matrix-org/synapse/blob/master/docs/ACME.md#deprecation-of-acme-v1
+Failed to register with the ACME provider. This is likely happening because the installation
+is new, and ACME v1 has been deprecated by Let's Encrypt and disabled for
+new installations since November 2019.
+At the moment, Synapse doesn't support ACME v2. For more information and alternative
+solutions, please read https://github.com/matrix-org/synapse/blob/master/docs/ACME.md#deprecation-of-acme-v1
 --------------------------------------------------------------------------------"""
 
 
-- 
cgit 1.4.1