diff --git a/CHANGELOG b/CHANGELOG
index 539060694..086937e4a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -57,28 +57,31 @@ Update instructions:
   ```
 
   .. note::
-     If you need to customize your nginx template, e.g. to work around `problems with
-     Docker's resolver <https://docs.funkwhale.audio/admin/external-storages.html#no-resolver-found>`_, you can mount your
-     custom nginx configuration into the container. Uncomment the commented volumes in the `nginx` section of your `docker-compose.yml`.
-  	 Additionally you need to update the paths in `nginx/funkwhale.template`.
-  	 Replace all occurrences of `/funkwhale` by `/usr/share/nginx/html`.
-     This loads the templates from your `nginx` folder and overrides the template files in the Docker container.
+    If you need to customize your nginx template, e.g. to work around `problems with
+    Docker's resolver <https://docs.funkwhale.audio/admin/external-storages.html#no-resolver-found>`_, you can mount your
+    custom nginx configuration into the container. Uncomment the commented volumes in the `nginx` section of your `docker-compose.yml`.
+    Additionally you need to update the paths in `nginx/funkwhale.template`.
+    Replace all occurrences of `/funkwhale` by `/usr/share/nginx/html`.
+    This loads the templates from your `nginx` folder and overrides the template files in the Docker container.
 
   ```
   docker-compose up -d
   ```
+
 - The Docker instructions now use the updated Docker compose plugin. If you previously used the ``docker-compose`` standalone installation, do the following while upgrading:
 
   1. Download the `Docker compose plugin <https://docs.docker.com/compose/install/linux/#install-using-the-repository>`_
   2. Stop your containers using the **docker-compose** syntax.
 
-  .. code-block:: sh
-     sudo docker-compose down
+  ```sh
+  sudo docker-compose down
+  ```
 
   3. Bring the containers back up using the **docker compose** syntax.
 
-  .. code-block:: sh
-     sudo docker compose up -d
+  ```sh
+  sudo docker compose up -d
+  ```
 
   After this you can continue to use the **docker compose** syntax for all Docker management tasks.
 - Upgrade Postgres to version 15. [Make sure to migrate!](https://docs.funkwhale.audio/administrator_documentation/upgrade_docs/docker.html#upgrade-the-postgres-container)
@@ -3842,7 +3845,7 @@ tend to be a lot bigger than other files, you may want to increase the
 to upload flac files.
 
 Missing subsonic configuration block in vhost files
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Because of a missing block in the sample Nginx and Apache configurations,
 instances that were deployed after the 0.13 release are likely to be unable
diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index 7ce1085b9..518f85bf8 100644
--- a/api/config/settings/common.py
+++ b/api/config/settings/common.py
@@ -871,6 +871,7 @@ Example:
 
 - ``redis://127.0.0.1:6379/0``
 - ``redis+socket:///run/redis/redis.sock?virtual_host=0``
+
 """
 # END CELERY
 # Location of root django.contrib.admin URL, use {% url 'admin:index' %}
diff --git a/docs/conf.py b/docs/conf.py
index 095e5042d..59ea6a617 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -99,7 +99,7 @@ release = version
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -247,8 +247,8 @@ def setup(app):
     app.connect("build-finished", copy_legacy_redirects)
 
 
-smv_tag_whitelist = None
-smv_branch_whitelist = r"(stable|develop)$"
+smv_tag_whitelist = r"^$"
+smv_branch_whitelist = r"^(stable|develop)$"
 
 # Internationalization settings
 locale_dirs = ["locales/"]
diff --git a/docs/user_documentation/info/cli.rst b/docs/user_documentation/info/cli.rst
index dde6a426a..574a3d451 100644
--- a/docs/user_documentation/info/cli.rst
+++ b/docs/user_documentation/info/cli.rst
@@ -82,7 +82,7 @@ To get started, you need to create an application for the CLI. To do this:
 
 Once you have your app's Access Token, you can either:
 
-1. Run ``funkwhale login`. The CLI asks you for your token and stores it in your machine's keyring. The CLI uses this token to authenticate.
+1. Run ``funkwhale login``. The CLI asks you for your token and stores it in your machine's keyring. The CLI uses this token to authenticate.
 2. Explicitly pass a token to the command via the ``-t`` flag or the ``FUNKWHALE_TOKEN`` environment variable
 
 If you use ``funkwhale login``, you can delete the local token with ``funkwhale logout``.