From f3062f5fbcb40f0df8c01118b59f68718443bccd Mon Sep 17 00:00:00 2001
From: Reg <reg+funkwhale@disroot.org>
Date: Mon, 25 Jun 2018 21:48:28 +0000
Subject: [PATCH] Typos
---
CONTRIBUTING | 2 +-
changes/changelog.d/typos.doc | 1 +
deploy/apache.conf | 2 +-
deploy/nginx.conf | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
create mode 100644 changes/changelog.d/typos.doc
diff --git a/CONTRIBUTING b/CONTRIBUTING
index 6fb76a56..9fbda153 100644
--- a/CONTRIBUTING
+++ b/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
diff --git a/changes/changelog.d/typos.doc b/changes/changelog.d/typos.doc
new file mode 100644
index 00000000..51cc5e8c
--- /dev/null
+++ b/changes/changelog.d/typos.doc
@@ -0,0 +1 @@
+Fixed a couple of typos
diff --git a/deploy/apache.conf b/deploy/apache.conf
index 5f86db7b..b74e04b3 100644
--- a/deploy/apache.conf
+++ b/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
diff --git a/deploy/nginx.conf b/deploy/nginx.conf
index c8f64cc3..2d8412ed 100644
--- a/deploy/nginx.conf
+++ b/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;
--
GitLab