Merge branch 'typos' into 'develop'

Typos

See merge request funkwhale/funkwhale!282

CONTRIBUTING

@@ -82,7 +82,7 @@ Visit https://code.eliotberriot.com/funkwhale/funkwhale and clone the repository
 A note about branches
 ^^^^^^^^^^^^^^^^^^^^^
 
-Next release development occurs on the "develop" branch, and releases are made on the "master" branch. Therefor, when submitting Merge Requests, ensure you are merging on the develop branch.
+Next release development occurs on the "develop" branch, and releases are made on the "master" branch. Therefore, when submitting Merge Requests, ensure you are merging on the develop branch.
 
 
 Working with docker

changes/changelog.d/typos.doc

@@ -0,0 +1 @@
+Fixed a couple of typos

deploy/apache.conf

@@ -34,7 +34,7 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
    # TLS
    # Feel free to use your own configuration for SSL here or simply remove the
    # lines and move the configuration to the previous server block if you
-   # don't want to run funkwhale behind https (this is not recommanded)
+   # don't want to run funkwhale behind https (this is not recommended)
    # have a look here for let's encrypt configuration:
    # https://certbot.eff.org/lets-encrypt/debianstretch-apache.html
    SSLEngine on

deploy/nginx.conf

@@ -31,7 +31,7 @@ server {
     # TLS
     # Feel free to use your own configuration for SSL here or simply remove the
     # lines and move the configuration to the previous server block if you
-    # don't want to run funkwhale behind https (this is not recommanded)
+    # don't want to run funkwhale behind https (this is not recommended)
     # have a look here for let's encrypt configuration:
     # https://certbot.eff.org/all-instructions/#debian-9-stretch-nginx
     ssl_protocols TLSv1.2;