From da95867d30bf5abeac2c70707927f8733d30d881 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 15 Feb 2019 22:21:18 -0700 Subject: [PATCH 1/3] Changelog --- changelog.d/4657.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/4657.misc diff --git a/changelog.d/4657.misc b/changelog.d/4657.misc new file mode 100644 index 0000000000..8872765819 --- /dev/null +++ b/changelog.d/4657.misc @@ -0,0 +1 @@ +Fix various spelling mistakes. From 68d2869c8dd2358270d3eb45f06658ceea59b907 Mon Sep 17 00:00:00 2001 From: "Juuso \"Linda\" Lapinlampi" Date: Wed, 13 Feb 2019 12:09:57 +0000 Subject: [PATCH 2/3] config: Remove a repeated word from a logger warning The warning for missing macaroon_secret_key was "missing missing". --- synapse/config/key.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/config/key.py b/synapse/config/key.py index dce4b19a2d..499ffd4e06 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -56,7 +56,7 @@ class KeyConfig(Config): if not self.macaroon_secret_key: # Unfortunately, there are people out there that don't have this # set. Lets just be "nice" and derive one from their secret key. - logger.warn("Config is missing missing macaroon_secret_key") + logger.warn("Config is missing macaroon_secret_key") seed = bytes(self.signing_key[0]) self.macaroon_secret_key = hashlib.sha256(seed).digest() From 6575df647da9d946dae0a41881d27b1569fff9c5 Mon Sep 17 00:00:00 2001 From: "Juuso \"Linda\" Lapinlampi" Date: Fri, 8 Feb 2019 21:26:16 +0000 Subject: [PATCH 3/3] UPGRADE.rst: Fix a typo in "Upgrading Synapse" section See: https://en.wiktionary.org/wiki/successful --- UPGRADE.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPGRADE.rst b/UPGRADE.rst index d869b7111b..228222d534 100644 --- a/UPGRADE.rst +++ b/UPGRADE.rst @@ -39,7 +39,7 @@ instructions that may be required are listed later in this document. ./synctl restart -To check whether your update was sucessful, you can check the Server header +To check whether your update was successful, you can check the Server header returned by the Client-Server API: .. code:: bash