tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge pull request #4657 from matrix-org/travis/linda/spelling

Browse source 
Fix spelling mistakes
This commit is contained in:
Erik Johnston 2019-02-18 09:42:45 +00:00 committed by GitHub
commit 4151111d95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UPGRADE.rst
View file

@ -39,7 +39,7 @@ instructions that may be required are listed later in this document.
./synctl restart ./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: returned by the Client-Server API:
.. code:: bash .. code:: bash

1
changelog.d/4657.misc Normal file
View file

@ -0,0 +1 @@
Fix various spelling mistakes.

2
synapse/config/key.py
View file

@ -56,7 +56,7 @@ class KeyConfig(Config):
if not self.macaroon_secret_key: if not self.macaroon_secret_key:
# Unfortunately, there are people out there that don't have this # Unfortunately, there are people out there that don't have this
# set. Lets just be "nice" and derive one from their secret key. # 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]) seed = bytes(self.signing_key[0])
self.macaroon_secret_key = hashlib.sha256(seed).digest() self.macaroon_secret_key = hashlib.sha256(seed).digest()