From e981f005dc2eb9447c0cccb1fd7fa4f01be02f90 Mon Sep 17 00:00:00 2001
From: Tony Wasserka <neobrain@users.noreply.github.com>
Date: Sat, 25 Apr 2020 11:58:52 +0200
Subject: [PATCH] Fix spelling of "occurrences"
---
CHANGELOG | 4 ++--
.../federation/management/commands/fix_federation_ids.py | 2 +-
docs/admin/url.rst | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 569dbfe36..28205caea 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1952,11 +1952,11 @@ existing instance, do a backup of your ``.env`` and ``docker-compose.yml`` files
- Ensure MUSIC_DIRECTORY_SERVE_PATH is uncommented and set to the absolute path on your host were your music files
are stored (``/srv/funkwhale/data/music`` by default)
- Edit your docker-compose.yml file to reflect the changes:
- - Search for volumes (there should be two occurences) that contains ``/app/funkwhale_api/media`` on the right side, and
+ - Search for volumes (there should be two occurrences) that contains ``/app/funkwhale_api/media`` on the right side, and
replace the whole line with ``- "${MEDIA_ROOT}:${MEDIA_ROOT}"``
- Search for a volume that contains ``/app/staticfiles`` on the right side, and
replace the whole line with ``- "${STATIC_ROOT}:${STATIC_ROOT}"``
- - If you use in-place import, search for volumes (there should be two occurences) that contains ``/music:ro`` on the right side, and
+ - If you use in-place import, search for volumes (there should be two occurrences) that contains ``/music:ro`` on the right side, and
replace the whole line with ``- "${MUSIC_DIRECTORY_SERVE_PATH}:${MUSIC_DIRECTORY_PATH}:ro"``
In the end, the ``volumes`` directives of your containers should look like that::
diff --git a/api/funkwhale_api/federation/management/commands/fix_federation_ids.py b/api/funkwhale_api/federation/management/commands/fix_federation_ids.py
index e53eb62b4..764a9c1e4 100644
--- a/api/funkwhale_api/federation/management/commands/fix_federation_ids.py
+++ b/api/funkwhale_api/federation/management/commands/fix_federation_ids.py
@@ -78,7 +78,7 @@ class Command(BaseCommand):
if total:
self.stdout.write(
self.style.WARNING(
- "Will replace {} found occurences of '{}' by '{}':".format(
+ "Will replace {} found occurrences of '{}' by '{}':".format(
total, old_prefix, new_prefix
)
)
diff --git a/docs/admin/url.rst b/docs/admin/url.rst
index daa11a805..0e37a6208 100644
--- a/docs/admin/url.rst
+++ b/docs/admin/url.rst
@@ -22,7 +22,7 @@ Example output:
python manage.py fix_federation_ids https://old-url https://new-url --no-dry-run --no-input
# Output
- Will replace 108 found occurences of 'https://old-url' by 'https://new-url':
+ Will replace 108 found occurrences of 'https://old-url' by 'https://new-url':
- 20 music.Artist
- 13 music.Album
--
GitLab