diff options
| author | Erik Johnston <erikj@jki.re> | 2019-02-18 09:42:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-18 09:42:45 +0000 |
| commit | 4151111d953696856bbe1d9256c629ad6f340470 (patch) | |
| tree | b494b9cbe8b164a9292d4894183b38924d91e258 | |
| parent | Merge pull request #4647 from matrix-org/erikj/add_room_publishing_rules (diff) | |
| parent | UPGRADE.rst: Fix a typo in "Upgrading Synapse" section (diff) | |
| download | synapse-4151111d953696856bbe1d9256c629ad6f340470.tar.xz | |
Merge pull request #4657 from matrix-org/travis/linda/spelling
Fix spelling mistakes
| -rw-r--r-- | UPGRADE.rst | 2 | ||||
| -rw-r--r-- | changelog.d/4657.misc | 1 | ||||
| -rw-r--r-- | synapse/config/key.py | 2 |
3 files changed, 3 insertions, 2 deletions
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 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. 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() |