diff --git a/docs/locales/gettext/administrator/configuration/change-url.pot b/docs/locales/gettext/administrator/configuration/change-url.pot
index 2f5c41435..c0d63610e 100644
--- a/docs/locales/gettext/administrator/configuration/change-url.pot
+++ b/docs/locales/gettext/administrator/configuration/change-url.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,74 +16,74 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:1
+#: ../../administrator/configuration/change-url.md:1
 msgid "Change your instance URL"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:4
+#: ../../administrator/configuration/change-url.md:4
 msgid "We recommend you don't change your instance URL. Changing it __will__ cause instability and problems with federation. If you change your URL, the Funkwhale project can't offer support for problems that arise."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:7
+#: ../../administrator/configuration/change-url.md:7
 msgid "Your instance URL is your pod's unique identifier in the {term}`fediverse`. If you want to change it, you need to update a lot of information"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:9
+#: ../../administrator/configuration/change-url.md:9
 msgid "The instance URL in your {file}`.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:10
+#: ../../administrator/configuration/change-url.md:10
 msgid "The instance URL in your webserver config."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:11
+#: ../../administrator/configuration/change-url.md:11
 msgid "Any references to the old URL in your database."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:13
+#: ../../administrator/configuration/change-url.md:13
 msgid "To clean the database, the `funkwhale-manage` command line interface contains a `fix_federation_ids` command."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:16
-msgid "Running `fix_federation_ids` with the `--no-dry-run` flag is irreversible. Make sure you [back up your data](../upgrade_docs/backup.md)."
+#: ../../administrator/configuration/change-url.md:16
+msgid "Running `fix_federation_ids` with the `--no-dry-run` flag is irreversible. Make sure you [back up your data](../upgrade/backup.md)."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:19
+#: ../../administrator/configuration/change-url.md:19
 msgid "Update your instance URL"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:21
+#: ../../administrator/configuration/change-url.md:21
 msgid "Change the `FUNKWHALE_HOSTNAME` and `DJANGO_ALLOWED_HOSTS` value in your {file}`.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:22
+#: ../../administrator/configuration/change-url.md:22
 msgid "Change the `server_name` values in your {file}`/etc/nginx/sites-enabled/funkwhale.conf` file."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:23
+#: ../../administrator/configuration/change-url.md:23
 msgid "Run the `fix_federation_ids` command to clean up your database."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:0
+#: ../../administrator/configuration/change-url.md:0
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:0
+#: ../../administrator/configuration/change-url.md:0
 msgid "Docker"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:46
+#: ../../administrator/configuration/change-url.md:46
 msgid "Example output:"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:72
+#: ../../administrator/configuration/change-url.md:72
 msgid "Restart your webserver to pick up the changes."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:0
+#: ../../administrator/configuration/change-url.md:0
 msgid "Nginx"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md:0
+#: ../../administrator/configuration/change-url.md:0
 msgid "Apache"
 msgstr ""
diff --git a/docs/locales/gettext/administrator/configuration/env-file.pot b/docs/locales/gettext/administrator/configuration/env-file.pot
index a559c9393..1912fe585 100644
--- a/docs/locales/gettext/administrator/configuration/env-file.pot
+++ b/docs/locales/gettext/administrator/configuration/env-file.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,39 +16,39 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:1
+#: ../../administrator/configuration/env-file.md:1
 msgid "Customize your environment file"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:3
+#: ../../administrator/configuration/env-file.md:3
 msgid "Your `.env` (environment) file contains variables you can change to customize your pod. You can change these variables at any time to alter how your pod runs."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:5
+#: ../../administrator/configuration/env-file.md:5
 msgid "You need to restart your Funkwhale services after changing your `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:0
+#: ../../administrator/configuration/env-file.md:0
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:0
+#: ../../administrator/configuration/env-file.md:0
 msgid "Docker"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:28
+#: ../../administrator/configuration/env-file.md:28
 msgid "Variables"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:32
+#: ../../administrator/configuration/env-file.md:32
 msgid "Some environment variables accept a URL as a value. To encode URLs and avoid problems with special characters, use `urllib.parse` on your URL value."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:39
+#: ../../administrator/configuration/env-file.md:39
 msgid "The [django-environ documentation](https://github.com/joke2k/django-environ/blob/main/docs/tips.rst#using-unsafe-characters-in-urls)."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:44
+#: ../../administrator/configuration/env-file.md:44
 msgid "Pod configuration"
 msgstr ""
 
@@ -60,7 +60,7 @@ msgstr ""
 msgid "Protocol end users will use to access your pod, either ``http`` or ``https``."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:53
+#: ../../administrator/configuration/env-file.md:53
 msgid "Database and redis configuration"
 msgstr ""
 
@@ -115,7 +115,7 @@ msgstr ""
 msgid "``redis+socket:///run/redis/redis.sock?virtual_host=0``"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:65
+#: ../../administrator/configuration/env-file.md:65
 msgid "Accounts and registration"
 msgstr ""
 
@@ -139,15 +139,15 @@ msgstr ""
 msgid "List of usernames that can't be used for registration. Given as a list of strings."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:80
+#: ../../administrator/configuration/env-file.md:80
 msgid "Whether to enable LDAP authentication."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:82
-msgid "See {doc}`/administrator_documentation/configuration_docs/ldap` for more information."
+#: ../../administrator/configuration/env-file.md:82
+msgid "See {doc}`/administrator/configuration/ldap` for more information."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:90
+#: ../../administrator/configuration/env-file.md:90
 msgid "Media storage and serving configuration"
 msgstr ""
 
@@ -195,15 +195,15 @@ msgstr ""
 msgid "Don't insert a slash at the end of this path."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:111
+#: ../../administrator/configuration/env-file.md:111
 msgid "Controls the maximum size of file that users can upload."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:114
+#: ../../administrator/configuration/env-file.md:114
 msgid "You can control how much total storage a user can access with the :term:`Upload Quota` setting."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:118
+#: ../../administrator/configuration/env-file.md:118
 msgid "S3 storage configuration"
 msgstr ""
 
@@ -265,7 +265,7 @@ msgstr ""
 msgid "A directory in your S3 bucket where you store files. Use this if you plan to share the bucket between services."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:137
+#: ../../administrator/configuration/env-file.md:137
 msgid "In-place import configuration"
 msgstr ""
 
@@ -294,7 +294,7 @@ msgstr ""
 msgid "In this case, you need to set :attr:`MUSIC_DIRECTORY_SERVE_PATH` to ``/srv/funkwhale/data/music``. The webserver needs to be able to read this directory."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:148
+#: ../../administrator/configuration/env-file.md:148
 msgid "API configuration"
 msgstr ""
 
@@ -310,7 +310,7 @@ msgstr ""
 msgid "``signup=5/d,password-reset=2/d,anonymous-reports=5/d``"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:158
+#: ../../administrator/configuration/env-file.md:158
 msgid "See [Rate limit API endpoints](rate-limiting.md) for a list of available endpoints and their default limits."
 msgstr ""
 
@@ -338,7 +338,7 @@ msgstr ""
 msgid "Default timeout for external requests."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:168
+#: ../../administrator/configuration/env-file.md:168
 msgid "Federation configuration"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid "The delay in seconds between two manual fetches of the same remote object."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:177
+#: ../../administrator/configuration/env-file.md:177
 msgid "Metadata configuration"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "Length of time in seconds to cache MusicBrainz results."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:187
+#: ../../administrator/configuration/env-file.md:187
 msgid "Channels and podcast configuration"
 msgstr ""
 
@@ -398,7 +398,7 @@ msgstr ""
 msgid "Changing this value only affect new podcasts."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:197
+#: ../../administrator/configuration/env-file.md:197
 msgid "Subsonic configuration"
 msgstr ""
 
@@ -406,7 +406,7 @@ msgstr ""
 msgid "The default format files are transcoded into when using the Subsonic API."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:205
+#: ../../administrator/configuration/env-file.md:205
 msgid "Email configuration"
 msgstr ""
 
@@ -458,7 +458,7 @@ msgstr ""
 msgid "Subject prefix for system emails."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:217
+#: ../../administrator/configuration/env-file.md:217
 msgid "Plugin configuration"
 msgstr ""
 
@@ -466,11 +466,11 @@ msgstr ""
 msgid "Path to a directory containing Funkwhale plugins. These are imported at runtime."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:226
+#: ../../administrator/configuration/env-file.md:226
 msgid "List of Funkwhale plugins to load."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:233
+#: ../../administrator/configuration/env-file.md:233
 msgid "Other settings"
 msgstr ""
 
diff --git a/docs/locales/gettext/administrator/configuration/frontend.pot b/docs/locales/gettext/administrator/configuration/frontend.pot
index 48ba68625..eb205465a 100644
--- a/docs/locales/gettext/administrator/configuration/frontend.pot
+++ b/docs/locales/gettext/administrator/configuration/frontend.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,158 +16,158 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:1
+#: ../../administrator/configuration/frontend.md:1
 msgid "Customize the Funkwhale frontend"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:3
+#: ../../administrator/configuration/frontend.md:3
 msgid "You can customize the look and behavior of the Funkwhale UI using a JSON configuration file. This file enables you to make very basic changes to the Funkwhale web app."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:5
+#: ../../administrator/configuration/frontend.md:5
 msgid "Set up your custom configuration"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:7
+#: ../../administrator/configuration/frontend.md:7
 msgid "Create your configuration file"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:9
+#: ../../administrator/configuration/frontend.md:9
 msgid "To customize your Funkwhale pod, you need to serve a {file}`settings.json` file at `https://yourinstanceurl/settings.json`. Follow these steps to set up your configuration file:"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:11
+#: ../../administrator/configuration/frontend.md:11
 msgid "SSH into your Funkwhale server."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:12
+#: ../../administrator/configuration/frontend.md:12
 msgid "Navigate to your `/srv/funkwhale` folder"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:18
+#: ../../administrator/configuration/frontend.md:18
 msgid "Create a new `custom` directory for your file."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:24
+#: ../../administrator/configuration/frontend.md:24
 msgid "Create a new config file and populate it with placeholder settings."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:0
+#: ../../administrator/configuration/frontend.md:0
 msgid "Supported parameters"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:41
+#: ../../administrator/configuration/frontend.md:41
 msgid "Parameter"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:42
+#: ../../administrator/configuration/frontend.md:42
 msgid "Data type"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:43
+#: ../../administrator/configuration/frontend.md:43
 msgid "Description"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:44
+#: ../../administrator/configuration/frontend.md:44
 msgid "Example"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:46
+#: ../../administrator/configuration/frontend.md:46
 msgid "`additionalStylesheets`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:47
+#: ../../administrator/configuration/frontend.md:47
 msgid "Array<URL>"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:48
+#: ../../administrator/configuration/frontend.md:48
 msgid "A list of URLs (relative or absolute) pointing to stylesheets."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:49
+#: ../../administrator/configuration/frontend.md:49
 msgid "`[\"https://test/theme.css\"]`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:51
+#: ../../administrator/configuration/frontend.md:51
 msgid "`defaultServerUrl`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:52
+#: ../../administrator/configuration/frontend.md:52
 msgid "URL"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:53
+#: ../../administrator/configuration/frontend.md:53
 msgid "The URL of the API server you want to connect the frontend to. Defaults to the current domain."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:54
+#: ../../administrator/configuration/frontend.md:54
 msgid "`\"https://api.yourdomain.com\"`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:59
+#: ../../administrator/configuration/frontend.md:59
 msgid "Configure your reverse proxy"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:61
+#: ../../administrator/configuration/frontend.md:61
 msgid "Once you've created your {file}`settings.json` file you need to configure your reverse proxy to serve it."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:0
+#: ../../administrator/configuration/frontend.md:0
 msgid "Nginx"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:69
+#: ../../administrator/configuration/frontend.md:69
 msgid "Add the following snippet to your {file}`/etc/nginx/sites-available/funkwhale.conf` config file:"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:0
+#: ../../administrator/configuration/frontend.md:0
 msgid "Apache"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:82
+#: ../../administrator/configuration/frontend.md:82
 msgid "Add the following snippet to your webserver configuration:"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:90
+#: ../../administrator/configuration/frontend.md:90
 msgid "Reload your webserver. You should be able to see the contents of your configuration file at `https://yourinstanceurl/settings.json`."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:92
+#: ../../administrator/configuration/frontend.md:92
 msgid "Add a custom theme"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:94
+#: ../../administrator/configuration/frontend.md:94
 msgid "You can use a custom stylesheet to theme your Funkwhale pod. To do this:"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:96
+#: ../../administrator/configuration/frontend.md:96
 msgid "Navigate to your {file}`/srv/funkwhale/custom` directory."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:102
+#: ../../administrator/configuration/frontend.md:102
 msgid "Copy your CSS file to this directory, or create a new one."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:114
+#: ../../administrator/configuration/frontend.md:114
 msgid "Add the location of your CSS file to the `additionalStylesheets` parameter in your {file}`settings.json` file."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:127
+#: ../../administrator/configuration/frontend.md:127
 msgid "Add the whole {file}`custom` dir to your webserver configuration."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:135
+#: ../../administrator/configuration/frontend.md:135
 msgid "Add the following to your {file}`/etc/nginx/sites-available/funkwhale.conf` file:"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:148
+#: ../../administrator/configuration/frontend.md:148
 msgid "Add the following to your webserver configuration file."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:162
+#: ../../administrator/configuration/frontend.md:162
 msgid "Restart your webserver."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/frontend.md:164
+#: ../../administrator/configuration/frontend.md:164
 msgid "Refresh your Funkwhale app. The background should now be red."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/configuration/index.pot b/docs/locales/gettext/administrator/configuration/index.pot
index fe0bb7a74..179ede483 100644
--- a/docs/locales/gettext/administrator/configuration/index.pot
+++ b/docs/locales/gettext/administrator/configuration/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,26 +16,26 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/configuration_docs/index.md:5
+#: ../../administrator/configuration/index.md:5
 msgid "Environment file"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/index.md:5
+#: ../../administrator/configuration/index.md:5
 msgid "Instance settings"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/index.md:5
+#: ../../administrator/configuration/index.md:5
 msgid "Frontend customization"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/index.md:5
+#: ../../administrator/configuration/index.md:5
 msgid "Configuration options"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/index.md:1
+#: ../../administrator/configuration/index.md:1
 msgid "Configure your Funkwhale pod"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/index.md:3
+#: ../../administrator/configuration/index.md:3
 msgid "You can customize a lot of settings relating to your Funkwhale pod. These range from server-level settings to user-specific settings. Check out the guides in this section to get started."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/configuration/instance-settings.pot b/docs/locales/gettext/administrator/configuration/instance-settings.pot
index e0b10bb34..24e9ac6b9 100644
--- a/docs/locales/gettext/administrator/configuration/instance-settings.pot
+++ b/docs/locales/gettext/administrator/configuration/instance-settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,352 +16,352 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:1
+#: ../../administrator/configuration/instance-settings.md:1
 msgid "Instance settings"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:3
+#: ../../administrator/configuration/instance-settings.md:3
 msgid "You can find instance settings on your pod's web interface. These settings control high level pod configuration. You don't need to restart the pod after changing these settings."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:5
+#: ../../administrator/configuration/instance-settings.md:5
 msgid "To find your instance settings:"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:0
+#: ../../administrator/configuration/instance-settings.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:13
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:22
+#: ../../administrator/configuration/instance-settings.md:13
+#: ../../administrator/configuration/instance-settings.md:22
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:14
+#: ../../administrator/configuration/instance-settings.md:14
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:15
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:24
+#: ../../administrator/configuration/instance-settings.md:15
+#: ../../administrator/configuration/instance-settings.md:24
 msgid "Select {guilabel}`Settings`. The {guilabel}`Instance settings` page opens."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:0
+#: ../../administrator/configuration/instance-settings.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:23
+#: ../../administrator/configuration/instance-settings.md:23
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the page to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:28
+#: ../../administrator/configuration/instance-settings.md:28
 msgid "Available settings"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:30
+#: ../../administrator/configuration/instance-settings.md:30
 msgid "Instance information"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:0
+#: ../../administrator/configuration/instance-settings.md:0
 msgid "Pod name"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:34
+#: ../../administrator/configuration/instance-settings.md:34
 msgid "The public name of your Funkwhale pod. This is displayed on the \"Home\" and \"About\" pages."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:3
+#: ../../administrator/configuration/instance-settings.md:3
 msgid "Short description"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:37
+#: ../../administrator/configuration/instance-settings.md:37
 msgid "A short description of your pod. Users see this on the pod's \"Home\" page."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:6
+#: ../../administrator/configuration/instance-settings.md:6
 msgid "Long description"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:40
+#: ../../administrator/configuration/instance-settings.md:40
 msgid "A longer description of your pod. Users see this on the pod's \"About\" page. Supports markdown formatting."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:9
+#: ../../administrator/configuration/instance-settings.md:9
 msgid "Contact email"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:43
+#: ../../administrator/configuration/instance-settings.md:43
 msgid "A contact email address that users and visitors can use to contact the pod administrator."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:12
+#: ../../administrator/configuration/instance-settings.md:12
 msgid "Rules"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:46
+#: ../../administrator/configuration/instance-settings.md:46
 msgid "A free text field for you to add your pod's rules and code of conduct. This is seen on the pod's \"About\" page. Supports markdown formatting"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:15
+#: ../../administrator/configuration/instance-settings.md:15
 msgid "Terms of service"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:49
+#: ../../administrator/configuration/instance-settings.md:49
 msgid "A free text field for you to add your pod's terms of service and privacy policy. This is seen on the pod's \"About\" page. Supports markdown formatting."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:18
+#: ../../administrator/configuration/instance-settings.md:18
 msgid "Banner image"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:52
+#: ../../administrator/configuration/instance-settings.md:52
 msgid "A large image seen on the pod's \"Home\" and \"About\" pages. The image should be at least 600x100px."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:21
+#: ../../administrator/configuration/instance-settings.md:21
 msgid "Support message"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:55
+#: ../../administrator/configuration/instance-settings.md:55
 msgid "A short message you can display to your pod's users to ask for support or just send a periodic message. Supports markdown."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:62
+#: ../../administrator/configuration/instance-settings.md:62
 msgid "Sign-ups"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:0
+#: ../../administrator/configuration/instance-settings.md:0
 msgid "Open registration to new users"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:66
+#: ../../administrator/configuration/instance-settings.md:66
 msgid "Enable this setting to allow new users to create an account on your pod."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:3
+#: ../../administrator/configuration/instance-settings.md:3
 msgid "Enable manual sign-up validation"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:69
+#: ../../administrator/configuration/instance-settings.md:69
 msgid "Enable this setting to require all new registrations to be validated by a moderator."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:6
+#: ../../administrator/configuration/instance-settings.md:6
 msgid "Sign-up form customization"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:72
+#: ../../administrator/configuration/instance-settings.md:72
 msgid "Use this tool to create a custom sign-up form. New users see this form when creating a new account. Supports markdown"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:79
+#: ../../administrator/configuration/instance-settings.md:79
 msgid "Security"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:0
+#: ../../administrator/configuration/instance-settings.md:0
 msgid "API Requires authentication"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:83
+#: ../../administrator/configuration/instance-settings.md:83
 msgid "Controls whether {term}`unauthenticated users <Anonymous>` can access content on your pod. If __enabled__, users need to have an account on your pod to access content. If __disabled__, users without an account can listen to content stored in public libraries."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:86
-msgid "{doc}`../../moderator_documentation/content/library_visibility`."
+#: ../../administrator/configuration/instance-settings.md:86
+msgid "{doc}`../../moderator/content/library`."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:7
+#: ../../administrator/configuration/instance-settings.md:7
 msgid "Default permissions"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:90
+#: ../../administrator/configuration/instance-settings.md:90
 msgid "A list of {term}`permissions` that are added to users by default. If your pod is publicly accessible, you should leave this empty."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:10
+#: ../../administrator/configuration/instance-settings.md:10
 msgid "Upload quota"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:93
+#: ../../administrator/configuration/instance-settings.md:93
 msgid "The default upload quota for users in MB. You can override this on a per-user basis."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:96
-msgid "{doc}`../../moderator_documentation/reports/handle_users`"
+#: ../../administrator/configuration/instance-settings.md:96
+msgid "{doc}`../../moderator/reports/users`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:104
+#: ../../administrator/configuration/instance-settings.md:104
 msgid "Music"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:0
+#: ../../administrator/configuration/instance-settings.md:0
 msgid "Transcoding enabled"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:108
+#: ../../administrator/configuration/instance-settings.md:108
 msgid "Enable this setting to let your server transcode files into a different format if the client requests it. This is useful if a device doesn't support formats like Ogg or FLAC."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:3
+#: ../../administrator/configuration/instance-settings.md:3
 msgid "Transcoding cache duration"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:111
+#: ../../administrator/configuration/instance-settings.md:111
 msgid "The number of minutes you want to store transcoded files on your server. Funkwhale removes transcoded tracks that haven't been downloaded within this duration to save space."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:116
+#: ../../administrator/configuration/instance-settings.md:116
 msgid "Channels"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:0
+#: ../../administrator/configuration/instance-settings.md:0
 msgid "Enable channels"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:120
+#: ../../administrator/configuration/instance-settings.md:120
 msgid "Whether user channels can be created and followed on your pod."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:3
+#: ../../administrator/configuration/instance-settings.md:3
 msgid "Max channels allowed per user"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:123
+#: ../../administrator/configuration/instance-settings.md:123
 msgid "The maximum number of channels each user can create."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:130
+#: ../../administrator/configuration/instance-settings.md:130
 msgid "Playlists"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:0
+#: ../../administrator/configuration/instance-settings.md:0
 msgid "Max tracks per playlist"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:134
+#: ../../administrator/configuration/instance-settings.md:134
 msgid "The maximum number of tracks a user can add to a playlist."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:141
+#: ../../administrator/configuration/instance-settings.md:141
 msgid "Moderation"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:0
+#: ../../administrator/configuration/instance-settings.md:0
 msgid "Enable allow-listing"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:145
+#: ../../administrator/configuration/instance-settings.md:145
 msgid "Enable this setting to ensure your pod only communicates with pods you have added to your allow list. When this setting is disabled, your pod will communicate with all other servers not included in your deny list."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:3
+#: ../../administrator/configuration/instance-settings.md:3
 msgid "Publish your allowed-domains list"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:148
+#: ../../administrator/configuration/instance-settings.md:148
 msgid "Whether to make your list of allowed domains public. Enable this if you want users to check who you are federating with."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:6
+#: ../../administrator/configuration/instance-settings.md:6
 msgid "Accountless report categories"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:151
+#: ../../administrator/configuration/instance-settings.md:151
 msgid "A list of {term}`categories <Report categories>` that {term}`anonymous` users can submit."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:158
+#: ../../administrator/configuration/instance-settings.md:158
 msgid "Federation"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:0
+#: ../../administrator/configuration/instance-settings.md:0
 msgid "Federation enabled"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:162
+#: ../../administrator/configuration/instance-settings.md:162
 msgid "Whether to enable federation features on your pod."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:3
+#: ../../administrator/configuration/instance-settings.md:3
 msgid "Enable public index"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:165
+#: ../../administrator/configuration/instance-settings.md:165
 msgid "Whether to allow other pods and bots to index public content on your pod."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:6
+#: ../../administrator/configuration/instance-settings.md:6
 msgid "Federation collection page size"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:168
+#: ../../administrator/configuration/instance-settings.md:168
 msgid "The number of items to display in ActivityPub collections."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:9
+#: ../../administrator/configuration/instance-settings.md:9
 msgid "Music cache duration"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:171
+#: ../../administrator/configuration/instance-settings.md:171
 msgid "The number of minutes you want to store local copies of federated tracks on your server. Funkwhale removes federated tracks that haven't been downloaded within this duration to save space."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:12
+#: ../../administrator/configuration/instance-settings.md:12
 msgid "Federation actor fetch delay"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:174
+#: ../../administrator/configuration/instance-settings.md:174
 msgid "The number of minutes the server waits before refetching actors on request authentication."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:181
+#: ../../administrator/configuration/instance-settings.md:181
 msgid "Subsonic"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:0
+#: ../../administrator/configuration/instance-settings.md:0
 msgid "Enabled Subsonic API"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:185
+#: ../../administrator/configuration/instance-settings.md:185
 msgid "Whether to enable the Subsonic API. This controls whether users are able to connect to your pod using Subsonic apps."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:192
+#: ../../administrator/configuration/instance-settings.md:192
 msgid "User Interface"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:0
+#: ../../administrator/configuration/instance-settings.md:0
 msgid "Custom CSS code"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:196
+#: ../../administrator/configuration/instance-settings.md:196
 msgid "Add CSS rules to control the look and feel of your pod. These rules are added to a `<style>` tag on each page."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:3
+#: ../../administrator/configuration/instance-settings.md:3
 msgid "Funkwhale Support message"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:199
+#: ../../administrator/configuration/instance-settings.md:199
 msgid "Whether to show a notification to your pod's users to support the Funkwhale project."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:206
+#: ../../administrator/configuration/instance-settings.md:206
 msgid "Statistics"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:0
+#: ../../administrator/configuration/instance-settings.md:0
 msgid "Enable usage and library stats in nodeinfo endpoint"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:210
+#: ../../administrator/configuration/instance-settings.md:210
 msgid "Whether to share anonymized usage and library statistics in your pod's nodeinfo endpoint."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:3
+#: ../../administrator/configuration/instance-settings.md:3
 msgid "Private mode in nodeinfo"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/instance_settings.md:214
+#: ../../administrator/configuration/instance-settings.md:214
 msgid "Enable this setting to indicate you don't want your instance to be tracked by third-party services."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/configuration/ldap.pot b/docs/locales/gettext/administrator/configuration/ldap.pot
index c9b986b99..04b15c1ba 100644
--- a/docs/locales/gettext/administrator/configuration/ldap.pot
+++ b/docs/locales/gettext/administrator/configuration/ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,122 +16,122 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:1
+#: ../../administrator/configuration/ldap.md:1
 msgid "Configure LDAP"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:3
+#: ../../administrator/configuration/ldap.md:3
 msgid "{abbr}`LDAP (Lightweight Directory Access Protocol)` is a protocol for providing directory services. It acts as a central authority for user login information. Funkwhale supports LDAP through the [Django LDAP authentication module](https://django-auth-ldap.readthedocs.io/)."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:6
+#: ../../administrator/configuration/ldap.md:6
 msgid "LDAP users can't change their password in the app."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:9
+#: ../../administrator/configuration/ldap.md:9
 msgid "Dependencies"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:11
+#: ../../administrator/configuration/ldap.md:11
 msgid "LDAP support requires extra dependencies. We include these in our requirements files to make it easier to set up. If you aren't using LDAP, you can safely remove these."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:0
+#: ../../administrator/configuration/ldap.md:0
 msgid "OS dependencies"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:15
+#: ../../administrator/configuration/ldap.md:15
 msgid "`libldap2-dev`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:16
+#: ../../administrator/configuration/ldap.md:16
 msgid "`libsasl2-dev`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:0
+#: ../../administrator/configuration/ldap.md:0
 msgid "Python dependencies"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:22
+#: ../../administrator/configuration/ldap.md:22
 msgid "`python-ldap`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:23
+#: ../../administrator/configuration/ldap.md:23
 msgid "`python-django-auth-ldap`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:27
+#: ../../administrator/configuration/ldap.md:27
 msgid "Environment variables"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:29
+#: ../../administrator/configuration/ldap.md:29
 msgid "You can configure LDAP authentication using environment variables in your `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:31
+#: ../../administrator/configuration/ldap.md:31
 msgid "Basic features"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:34
+#: ../../administrator/configuration/ldap.md:34
 msgid "Set this to `True` to enable LDAP support"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:44
+#: ../../administrator/configuration/ldap.md:44
 msgid "The LDAP {abbr}`URI (Uniform Resource Identifier)` of your authentication server."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:53
+#: ../../administrator/configuration/ldap.md:53
 msgid "LDAP user {abbr}`DN (Distinguished Name)` to bind on so you can perform searches."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:62
+#: ../../administrator/configuration/ldap.md:62
 msgid "LDAP user password for bind {abbr}`DN (Distinguished Name)`."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:71
+#: ../../administrator/configuration/ldap.md:71
 msgid "The LDAP user filter, using `{0}` as the username placeholder. Uses standard [LDAP search syntax](https://social.technet.microsoft.com/wiki/contents/articles/5392.active-directory-ldap-syntax-filters.aspx)."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:80
+#: ../../administrator/configuration/ldap.md:80
 msgid "Set to `True` to enable LDAP StartTLS support."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:89
+#: ../../administrator/configuration/ldap.md:89
 msgid "The LDAP search root {abbr}`DN (Distinguished Name)`. Supports several entries in a comma-delimited list."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:98
+#: ../../administrator/configuration/ldap.md:98
 msgid "A mapping of Django user attributes to LDAP values."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:107
+#: ../../administrator/configuration/ldap.md:107
 msgid "Controls whether to use direct binding."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:115
+#: ../../administrator/configuration/ldap.md:115
 msgid "Group features"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:117
+#: ../../administrator/configuration/ldap.md:117
 msgid "LDAP provides extra features for working with groups. Group configuration is an advanced feature. Most users don't need to configure these settings."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:120
+#: ../../administrator/configuration/ldap.md:120
 msgid "[Django's LDAP documentation](https://django-auth-ldap.readthedocs.io/en/latest/groups.html) for groups."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:124
+#: ../../administrator/configuration/ldap.md:124
 msgid "The LDAP group search root {abbr}`DN (Distinguished Name)`. This needs to be set to `True` to enable group features."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:133
+#: ../../administrator/configuration/ldap.md:133
 msgid "The LDAP group filter."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:142
+#: ../../administrator/configuration/ldap.md:142
 msgid "The group that users need to be a member of to authenticate."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/ldap.md:151
+#: ../../administrator/configuration/ldap.md:151
 msgid "A group whose members can't authenticate."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/configuration/mrf.pot b/docs/locales/gettext/administrator/configuration/mrf.pot
index 8169fd2a3..6747e935f 100644
--- a/docs/locales/gettext/administrator/configuration/mrf.pot
+++ b/docs/locales/gettext/administrator/configuration/mrf.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,102 +16,102 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:1
+#: ../../administrator/configuration/mrf.md:1
 msgid "Message Rewrite Facility (MRF)"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:3
-msgid "Funkwhale includes a feature that mimics [Pleroma’s Message Rewrite Facility (MRF)](https://docs-develop.pleroma.social/backend/configuration/mrf/). The MRF enables instance admins to create custom moderation rules. You can use these rules to complement Funkwhale's [built-in moderation tools](../../moderator_documentation/index.md)."
+#: ../../administrator/configuration/mrf.md:3
+msgid "Funkwhale includes a feature that mimics [Pleroma’s Message Rewrite Facility (MRF)](https://docs-develop.pleroma.social/backend/configuration/mrf/). The MRF enables instance admins to create custom moderation rules. You can use these rules to complement Funkwhale's [built-in moderation tools](../../moderator/index.md)."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:5
+#: ../../administrator/configuration/mrf.md:5
 msgid "Architecture"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:7
+#: ../../administrator/configuration/mrf.md:7
 msgid "The MRF is a pluggable system that processes messages and forwards them to a list of registered policies. Each policy can mutate the message, leave it as is, or discard it."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:9
+#: ../../administrator/configuration/mrf.md:9
 msgid "We implement some of Funkwhale's built-in moderation tools as a MRF policy. For example:"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:11
+#: ../../administrator/configuration/mrf.md:11
 msgid "Allow-list, when checking incoming messages ([code](https://dev.funkwhale.audio/funkwhale/funkwhale/blob/stable/api/funkwhale_api/moderation/mrf_policies.py))."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:12
+#: ../../administrator/configuration/mrf.md:12
 msgid "Domain and user blocking, when checking incoming messages ([code](https://dev.funkwhale.audio/funkwhale/funkwhale/blob/stable/api/funkwhale_api/federation/mrf_policies.py))"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:15
+#: ../../administrator/configuration/mrf.md:15
 msgid "Pleroma MRF policies can also affect outgoing messages. This is not currently supported in Funkwhale."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:18
+#: ../../administrator/configuration/mrf.md:18
 msgid "Disclaimer"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:20
+#: ../../administrator/configuration/mrf.md:20
 msgid "Writing custom MRF rules can impact the performance and stability of your pod. It can also affect message delivery. Every time your pod receives a message it calls your policy."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:22
+#: ../../administrator/configuration/mrf.md:22
 msgid "The Funkwhale project consider all custom MRF policies to fall under the purview of the AGPL. This means you're required to release the source of your custom MRF policy modules publicly."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:24
+#: ../../administrator/configuration/mrf.md:24
 msgid "Write your first MRF policy"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:26
+#: ../../administrator/configuration/mrf.md:26
 msgid "MRF policies are written as Python 3 functions that take at least one `payload` parameter. This payload is the raw ActivityPub message, received via HTTP, following the HTTP signature check."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:28
+#: ../../administrator/configuration/mrf.md:28
 msgid "In the example below we write a policy that discards all Follow requests from listed domains:"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:55
+#: ../../administrator/configuration/mrf.md:55
 msgid "You need to store this code in a Funkwhale plugin. To create one, execute the following:"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:79
+#: ../../administrator/configuration/mrf.md:79
 msgid "Once you've created the plugin, put your code in an `mrf_policies.py` file. Place this file inside the plugin directory. Next, enable the plugin in your {file}`.env` file by adding its name to the {attr}`FUNKWHALE_PLUGINS` list. Add this variable if it's not there."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:81
+#: ../../administrator/configuration/mrf.md:81
 msgid "Test your MRF policy"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:83
+#: ../../administrator/configuration/mrf.md:83
 msgid "To make the job of writing and debugging MRF policies easier, we provide a management command."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:85
+#: ../../administrator/configuration/mrf.md:85
 msgid "List registered MRF policies."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:0
+#: ../../administrator/configuration/mrf.md:0
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:0
+#: ../../administrator/configuration/mrf.md:0
 msgid "Docker"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:108
+#: ../../administrator/configuration/mrf.md:108
 msgid "Check how your MRF policy handles a follow."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:132
+#: ../../administrator/configuration/mrf.md:132
 msgid "Check how your MRF handles a problematic follow."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:157
+#: ../../administrator/configuration/mrf.md:157
 msgid "Check a payload against activity already present in the database. You can find the UUID of an activity by visiting `/api/admin/federation/activity`."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md:185
+#: ../../administrator/configuration/mrf.md:185
 msgid "There are extra options for testing MRF policies. Check the command help for more options."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/configuration/object-storage.pot b/docs/locales/gettext/administrator/configuration/object-storage.pot
index f1e06209d..95fcf8610 100644
--- a/docs/locales/gettext/administrator/configuration/object-storage.pot
+++ b/docs/locales/gettext/administrator/configuration/object-storage.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,39 +16,39 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:1
+#: ../../administrator/configuration/object-storage.md:1
 msgid "Store media in an object store"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:3
+#: ../../administrator/configuration/object-storage.md:3
 msgid "By default, Funkwhale stores all media data in the `/srv/funkwhale/data/media` directory. If you prefer to use an S3-compatible object store, follow the instructions in this guide."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:10
+#: ../../administrator/configuration/object-storage.md:10
 msgid "Secure your object store"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:12
+#: ../../administrator/configuration/object-storage.md:12
 msgid "Before you begin, you need to secure your object store. Many S3-compatible stores list contents in the root by default. This exposes the URLs of your audio files and means that users can bypass authentication."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:14
+#: ../../administrator/configuration/object-storage.md:14
 msgid "To prevent listing content, add the following policy to your S3-compatible object store."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:39
+#: ../../administrator/configuration/object-storage.md:39
 msgid "If you're using `awscli`, you can store this policy in a `/tmp/policy` file and apply it using the following command:"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:45
+#: ../../administrator/configuration/object-storage.md:45
 msgid "Update your environment file"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:47
+#: ../../administrator/configuration/object-storage.md:47
 msgid "To set up S3-compatible storage, fill out the relevant details in the `.env` file. If you want to serve audio files from the bucket, set `PROXY_MEDIA` to `false`."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:0
+#: ../../administrator/configuration/object-storage.md:0
 msgid "Environment variables"
 msgstr ""
 
@@ -120,66 +120,66 @@ msgstr ""
 msgid "If you're using S3 storage with :attr:`AWS_QUERYSTRING_AUTH` enabled, it's safe to disable this setting."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:81
+#: ../../administrator/configuration/object-storage.md:81
 msgid "Set up your reverse proxy"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:84
+#: ../../administrator/configuration/object-storage.md:84
 msgid "Serving files from object storage is not currently supported on Apache deployments."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:87
+#: ../../administrator/configuration/object-storage.md:87
 msgid "Serving files from an object store requires some changes to the reverse proxy."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:89
+#: ../../administrator/configuration/object-storage.md:89
 msgid "Open your Nginx configuration file in an editor."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:0
+#: ../../administrator/configuration/object-storage.md:0
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:0
+#: ../../administrator/configuration/object-storage.md:0
 msgid "Docker"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:112
+#: ../../administrator/configuration/object-storage.md:112
 msgid "Comment out the `location /_protected/media/` block by adding a `#` to the start of each line."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:121
+#: ../../administrator/configuration/object-storage.md:121
 msgid "Uncomment the `location ~ /_protected/media/(.+)` block by removing the `#` from the start of each line."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:131
+#: ../../administrator/configuration/object-storage.md:131
 msgid "Add your S3 store URL to the `img-src` and `media-src` headers."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:137
+#: ../../administrator/configuration/object-storage.md:137
 msgid "Test your Nginx configuration."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:143
+#: ../../administrator/configuration/object-storage.md:143
 msgid "Restart Funkwhale and Nginx to pick up the changes."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:168
+#: ../../administrator/configuration/object-storage.md:168
 msgid "That's it! Files are now uploaded to and stored from your S3 bucket."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:170
+#: ../../administrator/configuration/object-storage.md:170
 msgid "Troubleshooting"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:0
+#: ../../administrator/configuration/object-storage.md:0
 msgid "No Resolver Found"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:174
+#: ../../administrator/configuration/object-storage.md:174
 msgid "You may see the following error when streaming music from your S3-compatible store:"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/object_storage.md:180
+#: ../../administrator/configuration/object-storage.md:180
 msgid "This happens when the Nginx config is unable to use your server’s DNS resolver. We're still looking into this issue. You can work around this by adding a resolver to the `location ~/_protected/media/(.+)` block."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/configuration/optimize.pot b/docs/locales/gettext/administrator/configuration/optimize.pot
index 2cebb1473..76efbe8a3 100644
--- a/docs/locales/gettext/administrator/configuration/optimize.pot
+++ b/docs/locales/gettext/administrator/configuration/optimize.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,62 +16,62 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/configuration_docs/optimize.md:1
+#: ../../administrator/configuration/optimize.md:1
 msgid "Optimize memory usage"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/optimize.md:3
+#: ../../administrator/configuration/optimize.md:3
 msgid "Funkwhale has a reasonable memory footprint. If you're running Funkwhale on a limited device, you can use these tweaks to reduce the footprint."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/optimize.md:5
+#: ../../administrator/configuration/optimize.md:5
 msgid "Reduce workers concurrency"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/optimize.md:7
+#: ../../administrator/configuration/optimize.md:7
 msgid "Funkwhale uses Celery to handle asynchronous tasks. By default, Celery spawns a worker per CPU core. This can lead to higher memory usage."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/optimize.md:9
+#: ../../administrator/configuration/optimize.md:9
 msgid "You can set the number of workers using the `CELERYD_CONCURRENCY` variable in your `.env` file. For example, a value of `CELERYD_CONCURRENCY=1` spawns a single worker."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/optimize.md:12
+#: ../../administrator/configuration/optimize.md:12
 msgid "Reducing the number of celery workers slows down the handling of asynchronous tasks. On larger instances, this can cause performance problems."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/optimize.md:15
+#: ../../administrator/configuration/optimize.md:15
 msgid "Switch to solo pool execution"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/optimize.md:17
+#: ../../administrator/configuration/optimize.md:17
 msgid "Celery uses a `prefork` pool by default. This enables the server to process many tasks at the same time. You can switch to a `solo` pool which handles tasks one at a time. This reduces memory overhead but removes the ability to process tasks concurrently."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/optimize.md:0
+#: ../../administrator/configuration/optimize.md:0
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/optimize.md:25
+#: ../../administrator/configuration/optimize.md:25
 msgid "Open your `funkwhale-worker` unit file in an editor."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/optimize.md:31
+#: ../../administrator/configuration/optimize.md:31
 msgid "Add the `--pool=solo` flag to the `ExecStart` line of your unit file."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/optimize.md:42
+#: ../../administrator/configuration/optimize.md:42
 msgid "Restart the Celery service."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/optimize.md:0
+#: ../../administrator/configuration/optimize.md:0
 msgid "Docker"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/optimize.md:53
+#: ../../administrator/configuration/optimize.md:53
 msgid "Add the `--pool=solo` flag to the `celerybeat` command in `docker-compose.yml`."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/optimize.md:61
+#: ../../administrator/configuration/optimize.md:61
 msgid "Restart Celery."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/configuration/rate-limiting.pot b/docs/locales/gettext/administrator/configuration/rate-limiting.pot
index be8b083e7..cc908fb82 100644
--- a/docs/locales/gettext/administrator/configuration/rate-limiting.pot
+++ b/docs/locales/gettext/administrator/configuration/rate-limiting.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,322 +16,322 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:1
+#: ../../administrator/configuration/rate-limiting.md:1
 msgid "Rate limit API endpoints"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:3
-msgid "This article contains a summary of the endpoints you can control using rate-limiting. You can change the rate limits for these endpoints using the [`THROTTLING_RATES`](env_file.md#api-configuration) environment variable."
+#: ../../administrator/configuration/rate-limiting.md:3
+msgid "This article contains a summary of the endpoints you can control using rate-limiting. You can change the rate limits for these endpoints using the [`THROTTLING_RATES`](env-file.md#api-configuration) environment variable."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:5
+#: ../../administrator/configuration/rate-limiting.md:5
 msgid "Standard endpoints"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:11
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:61
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:93
+#: ../../administrator/configuration/rate-limiting.md:11
+#: ../../administrator/configuration/rate-limiting.md:61
+#: ../../administrator/configuration/rate-limiting.md:93
 msgid "Endpoint name"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:12
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:62
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:94
+#: ../../administrator/configuration/rate-limiting.md:12
+#: ../../administrator/configuration/rate-limiting.md:62
+#: ../../administrator/configuration/rate-limiting.md:94
 msgid "Description"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:13
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:63
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:95
+#: ../../administrator/configuration/rate-limiting.md:13
+#: ../../administrator/configuration/rate-limiting.md:63
+#: ../../administrator/configuration/rate-limiting.md:95
 msgid "Default rate (per user)"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:14
+#: ../../administrator/configuration/rate-limiting.md:14
 msgid "`anonymous-wildcard`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:15
+#: ../../administrator/configuration/rate-limiting.md:15
 msgid "Anonymous requests not covered by other limits"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:16
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:22
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:46
+#: ../../administrator/configuration/rate-limiting.md:16
+#: ../../administrator/configuration/rate-limiting.md:22
+#: ../../administrator/configuration/rate-limiting.md:46
 msgid "1000 per hour"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:17
+#: ../../administrator/configuration/rate-limiting.md:17
 msgid "`authenticated-wildcard`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:18
+#: ../../administrator/configuration/rate-limiting.md:18
 msgid "Authenticated requests not covered by other limits"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:19
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:52
+#: ../../administrator/configuration/rate-limiting.md:19
+#: ../../administrator/configuration/rate-limiting.md:52
 msgid "2000 per hour"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:20
+#: ../../administrator/configuration/rate-limiting.md:20
 msgid "`authenticated-create`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:21
+#: ../../administrator/configuration/rate-limiting.md:21
 msgid "Authenticated POST requests"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:23
+#: ../../administrator/configuration/rate-limiting.md:23
 msgid "`anonymous-create`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:24
+#: ../../administrator/configuration/rate-limiting.md:24
 msgid "Anonymous POST requests"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:25
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:43
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:49
+#: ../../administrator/configuration/rate-limiting.md:25
+#: ../../administrator/configuration/rate-limiting.md:43
+#: ../../administrator/configuration/rate-limiting.md:49
 msgid "1000 per day"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:26
+#: ../../administrator/configuration/rate-limiting.md:26
 msgid "`authenticated-list`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:27
+#: ../../administrator/configuration/rate-limiting.md:27
 msgid "Authenticated GET requests"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:28
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:34
+#: ../../administrator/configuration/rate-limiting.md:28
+#: ../../administrator/configuration/rate-limiting.md:34
 msgid "10000 per hour"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:29
+#: ../../administrator/configuration/rate-limiting.md:29
 msgid "`anonymous-list`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:30
+#: ../../administrator/configuration/rate-limiting.md:30
 msgid "Anonymous GET requests"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:31
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:37
+#: ../../administrator/configuration/rate-limiting.md:31
+#: ../../administrator/configuration/rate-limiting.md:37
 msgid "10000 per day"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:32
+#: ../../administrator/configuration/rate-limiting.md:32
 msgid "`authenticated-retrieve`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:33
+#: ../../administrator/configuration/rate-limiting.md:33
 msgid "Authenticated GET requests on resource details"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:35
+#: ../../administrator/configuration/rate-limiting.md:35
 msgid "`anonymous-retrieve`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:36
+#: ../../administrator/configuration/rate-limiting.md:36
 msgid "Anonymous GET requests on resource details"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:38
+#: ../../administrator/configuration/rate-limiting.md:38
 msgid "`authenticated-destroy`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:39
+#: ../../administrator/configuration/rate-limiting.md:39
 msgid "Authenticated DELETE requests on resource details"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:40
+#: ../../administrator/configuration/rate-limiting.md:40
 msgid "500 per hour"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:41
+#: ../../administrator/configuration/rate-limiting.md:41
 msgid "`anonymous-destroy`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:42
+#: ../../administrator/configuration/rate-limiting.md:42
 msgid "Anonymous DELETE requests on resource details"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:44
+#: ../../administrator/configuration/rate-limiting.md:44
 msgid "`authenticated-update`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:45
+#: ../../administrator/configuration/rate-limiting.md:45
 msgid "Authenticated PATCH and PUT requests on resource details"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:47
+#: ../../administrator/configuration/rate-limiting.md:47
 msgid "`anonymous-update`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:48
+#: ../../administrator/configuration/rate-limiting.md:48
 msgid "Anonymous PATCH and PUT requests on resource details"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:50
+#: ../../administrator/configuration/rate-limiting.md:50
 msgid "`subsonic`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:51
+#: ../../administrator/configuration/rate-limiting.md:51
 msgid "All Subsonic API requests"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:55
+#: ../../administrator/configuration/rate-limiting.md:55
 msgid "User action endpoints"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:64
+#: ../../administrator/configuration/rate-limiting.md:64
 msgid "`login`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:65
+#: ../../administrator/configuration/rate-limiting.md:65
 msgid "User login"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:66
+#: ../../administrator/configuration/rate-limiting.md:66
 msgid "30 per hour"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:67
+#: ../../administrator/configuration/rate-limiting.md:67
 msgid "`signup`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:68
+#: ../../administrator/configuration/rate-limiting.md:68
 msgid "User signup"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:69
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:101
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:107
+#: ../../administrator/configuration/rate-limiting.md:69
+#: ../../administrator/configuration/rate-limiting.md:101
+#: ../../administrator/configuration/rate-limiting.md:107
 msgid "10 per day"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:70
+#: ../../administrator/configuration/rate-limiting.md:70
 msgid "`verify-email`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:71
+#: ../../administrator/configuration/rate-limiting.md:71
 msgid "Email address confirmation"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:72
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:75
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:78
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:81
+#: ../../administrator/configuration/rate-limiting.md:72
+#: ../../administrator/configuration/rate-limiting.md:75
+#: ../../administrator/configuration/rate-limiting.md:78
+#: ../../administrator/configuration/rate-limiting.md:81
 msgid "20 per hour"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:73
+#: ../../administrator/configuration/rate-limiting.md:73
 msgid "`password-change`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:74
+#: ../../administrator/configuration/rate-limiting.md:74
 msgid "Password change (when authenticated)"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:76
+#: ../../administrator/configuration/rate-limiting.md:76
 msgid "`password-reset`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:77
+#: ../../administrator/configuration/rate-limiting.md:77
 msgid "Password reset request"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:79
+#: ../../administrator/configuration/rate-limiting.md:79
 msgid "`password-reset-confirm`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:80
+#: ../../administrator/configuration/rate-limiting.md:80
 msgid "Password reset confirmation"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:82
+#: ../../administrator/configuration/rate-limiting.md:82
 msgid "`fetch`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:83
+#: ../../administrator/configuration/rate-limiting.md:83
 msgid "Fetch remote objects"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:84
+#: ../../administrator/configuration/rate-limiting.md:84
 msgid "200 per day"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:87
+#: ../../administrator/configuration/rate-limiting.md:87
 msgid "Dangerous endpoints"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:96
+#: ../../administrator/configuration/rate-limiting.md:96
 msgid "`authenticated-reports`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:97
+#: ../../administrator/configuration/rate-limiting.md:97
 msgid "Authenticated report submissions"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:98
+#: ../../administrator/configuration/rate-limiting.md:98
 msgid "100 per day"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:99
+#: ../../administrator/configuration/rate-limiting.md:99
 msgid "`anonymous-reports`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:100
+#: ../../administrator/configuration/rate-limiting.md:100
 msgid "Anonymous report submissions"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:102
+#: ../../administrator/configuration/rate-limiting.md:102
 msgid "`authenticated-oauth-app`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:103
+#: ../../administrator/configuration/rate-limiting.md:103
 msgid "Authenticated OAuth app creation"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:104
+#: ../../administrator/configuration/rate-limiting.md:104
 msgid "10 per hour"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:105
+#: ../../administrator/configuration/rate-limiting.md:105
 msgid "`anonymous-oauth-app`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:106
+#: ../../administrator/configuration/rate-limiting.md:106
 msgid "Anonymous OAuth app creation"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:108
+#: ../../administrator/configuration/rate-limiting.md:108
 msgid "`oauth-authorize`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:109
+#: ../../administrator/configuration/rate-limiting.md:109
 msgid "OAuth app authorization"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:110
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:113
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:116
+#: ../../administrator/configuration/rate-limiting.md:110
+#: ../../administrator/configuration/rate-limiting.md:113
+#: ../../administrator/configuration/rate-limiting.md:116
 msgid "100 per hour"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:111
+#: ../../administrator/configuration/rate-limiting.md:111
 msgid "`oauth-token`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:112
+#: ../../administrator/configuration/rate-limiting.md:112
 msgid "OAuth token creation"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:114
+#: ../../administrator/configuration/rate-limiting.md:114
 msgid "`oauth-revoke-token`"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/rate-limiting.md:115
+#: ../../administrator/configuration/rate-limiting.md:115
 msgid "OAuth token deletion"
 msgstr ""
diff --git a/docs/locales/gettext/administrator/django/delete-content.pot b/docs/locales/gettext/administrator/django/delete-content.pot
index 52aa4d793..c58adec59 100644
--- a/docs/locales/gettext/administrator/django/delete-content.pot
+++ b/docs/locales/gettext/administrator/django/delete-content.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,135 +16,135 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/django/delete_content.md:1
+#: ../../administrator/django/delete-content.md:1
 msgid "Delete content in the Django dashboard"
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:4
-msgid "Deleting content using the Django dashboard isn't recommended. Use an object's [moderation page](../../moderator_documentation/content/delete_content.md) where possible."
+#: ../../administrator/django/delete-content.md:4
+msgid "Deleting content using the Django dashboard isn't recommended. Use an object's [moderation page](../../moderator/content/delete.md) where possible."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:7
+#: ../../administrator/django/delete-content.md:7
 msgid "You can delete content from your pod in the Django dashboard. The dashboard gives you access to all data associated with the content."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:10
+#: ../../administrator/django/delete-content.md:10
 msgid "Deleting content removes it from associated playlists, channels, libraries, and favorites lists."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:13
+#: ../../administrator/django/delete-content.md:13
 msgid "Delete tracks"
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:15
+#: ../../administrator/django/delete-content.md:15
 msgid "To delete tracks in the Django dashboard:"
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:17
-#: ../../administrator_documentation/django/delete_content.md:29
-#: ../../administrator_documentation/django/delete_content.md:41
-#: ../../administrator_documentation/django/delete_content.md:53
+#: ../../administrator/django/delete-content.md:17
+#: ../../administrator/django/delete-content.md:29
+#: ../../administrator/django/delete-content.md:41
+#: ../../administrator/django/delete-content.md:53
 msgid "Open the Django dashboard."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:18
+#: ../../administrator/django/delete-content.md:18
 msgid "Select {guilabel}`Tracks` in the {guilabel}`MUSIC` table."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:19
+#: ../../administrator/django/delete-content.md:19
 msgid "Search for the track(s) you want to delete."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:20
+#: ../../administrator/django/delete-content.md:20
 msgid "Check ({fa}`check-square`) the checkbox next to the track(s) you want to delete."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:21
+#: ../../administrator/django/delete-content.md:21
 msgid "Select {guilabel}`Delete selected tracks` in the {guilabel}`Action` dropdown."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:22
-#: ../../administrator_documentation/django/delete_content.md:34
-#: ../../administrator_documentation/django/delete_content.md:46
-#: ../../administrator_documentation/django/delete_content.md:58
+#: ../../administrator/django/delete-content.md:22
+#: ../../administrator/django/delete-content.md:34
+#: ../../administrator/django/delete-content.md:46
+#: ../../administrator/django/delete-content.md:58
 msgid "Select {guilabel}`Go`. A confirmation page opens showing you the items that are affected by the action."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:23
-#: ../../administrator_documentation/django/delete_content.md:35
-#: ../../administrator_documentation/django/delete_content.md:47
-#: ../../administrator_documentation/django/delete_content.md:59
+#: ../../administrator/django/delete-content.md:23
+#: ../../administrator/django/delete-content.md:35
+#: ../../administrator/django/delete-content.md:47
+#: ../../administrator/django/delete-content.md:59
 msgid "Review the information and select {guilabel}`Yes, I'm sure` to delete the item(s)."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:25
+#: ../../administrator/django/delete-content.md:25
 msgid "Delete albums"
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:27
+#: ../../administrator/django/delete-content.md:27
 msgid "To delete albums in the Django dashboard:"
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:30
+#: ../../administrator/django/delete-content.md:30
 msgid "Select {guilabel}`Albums` in the {guilabel}`MUSIC` table."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:31
+#: ../../administrator/django/delete-content.md:31
 msgid "Search for the album(s) you want to delete."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:32
+#: ../../administrator/django/delete-content.md:32
 msgid "Check ({fa}`check-square`) the checkbox next to the album(s) you want to delete."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:33
+#: ../../administrator/django/delete-content.md:33
 msgid "Select {guilabel}`Delete selected albums` in the {guilabel}`Action` dropdown."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:37
+#: ../../administrator/django/delete-content.md:37
 msgid "Delete artists"
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:39
+#: ../../administrator/django/delete-content.md:39
 msgid "To delete artists in the Django dashboard:"
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:42
+#: ../../administrator/django/delete-content.md:42
 msgid "Select {guilabel}`Artists` in the {guilabel}`MUSIC` table."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:43
+#: ../../administrator/django/delete-content.md:43
 msgid "Search for the artist(s) you want to delete."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:44
+#: ../../administrator/django/delete-content.md:44
 msgid "Check ({fa}`check-square`) the checkbox next to the artist(s) you want to delete."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:45
+#: ../../administrator/django/delete-content.md:45
 msgid "Select {guilabel}`Delete selected artists` in the {guilabel}`Action` dropdown."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:49
+#: ../../administrator/django/delete-content.md:49
 msgid "Delete followed libraries"
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:51
+#: ../../administrator/django/delete-content.md:51
 msgid "In Funkwhale, unfollowing a library leaves the items in place but you can't access them. To completely remove them:"
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:54
+#: ../../administrator/django/delete-content.md:54
 msgid "Select {guilabel}`Librarys` in the {guilabel}`MUSIC` table."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:55
+#: ../../administrator/django/delete-content.md:55
 msgid "Search for the libraries you want to delete."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:56
+#: ../../administrator/django/delete-content.md:56
 msgid "Check ({fa}`check-square`) the checkbox next to the libraries you want to delete."
 msgstr ""
 
-#: ../../administrator_documentation/django/delete_content.md:57
+#: ../../administrator/django/delete-content.md:57
 msgid "Select {guilabel}`Delete selected libraries` in the {guilabel}`Action` dropdown."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/django/index.pot b/docs/locales/gettext/administrator/django/index.pot
index d9d9697ee..85439a6f0 100644
--- a/docs/locales/gettext/administrator/django/index.pot
+++ b/docs/locales/gettext/administrator/django/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,26 +16,26 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/django/index.md:10
+#: ../../administrator/django/index.md:10
 msgid "Administrative tasks"
 msgstr ""
 
-#: ../../administrator_documentation/django/index.md:1
+#: ../../administrator/django/index.md:1
 msgid "Use the Django dashboard"
 msgstr ""
 
-#: ../../administrator_documentation/django/index.md:3
+#: ../../administrator/django/index.md:3
 msgid "For some administration you need to access data that isn't available on the frontend. Funkwhale makes use of the [Django web framework](https://www.djangoproject.com/). This provides a dashboard that gives pod admins access to more tools and data than the frontend."
 msgstr ""
 
-#: ../../administrator_documentation/django/index.md:5
+#: ../../administrator/django/index.md:5
 msgid "There are two ways to access the Django administration dashboard:"
 msgstr ""
 
-#: ../../administrator_documentation/django/index.md:7
+#: ../../administrator/django/index.md:7
 msgid "Navigate to `https://<yourdomain>/api/admin` and log in with your pod admin credentials."
 msgstr ""
 
-#: ../../administrator_documentation/django/index.md:8
+#: ../../administrator/django/index.md:8
 msgid "Navigate to an object's moderation page and select {guilabel}`View in Django's admin` from the dropdown menu."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/import.pot b/docs/locales/gettext/administrator/import.pot
index 561055a21..4edc88729 100644
--- a/docs/locales/gettext/administrator/import.pot
+++ b/docs/locales/gettext/administrator/import.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,298 +16,298 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/import_docs/index.md:1
+#: ../../administrator/import.md:1
 msgid "Import music from your server"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:3
-msgid "You can import music files you have saved on your server. You need to make sure your files have the [required ID3 tags](../../user_documentation/libraries/tag_music.md). We recommend using [Musicbrainz Picard](https://picard.musicbrainz.org/) for tagging."
+#: ../../administrator/import.md:3
+msgid "You can import music files you have saved on your server. You need to make sure your files have the [required ID3 tags](../user/libraries/content/tag.md). We recommend using [Musicbrainz Picard](https://picard.musicbrainz.org/) for tagging."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:5
+#: ../../administrator/import.md:5
 msgid "Funkwhale supports the following import methods:"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:7
+#: ../../administrator/import.md:7
 msgid "Copy (default) – Funkwhale copies files from your server into the media store."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:8
+#: ../../administrator/import.md:8
 msgid "In-place import – Funkwhale adds the storage location of your files to the database. This uses less space than the copy method and ensures your collection is always up-to-date."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:10
+#: ../../administrator/import.md:10
 msgid "To see a full list of options, run the command with the `--help` flag."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:0
+#: ../../administrator/import.md:0
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:0
+#: ../../administrator/import.md:0
 msgid "Docker"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:37
+#: ../../administrator/import.md:37
 msgid "Get demo music"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:39
+#: ../../administrator/import.md:39
 msgid "If you don't have music on your server, you can download creative commons music to test imports with. The Funkwhale project provides a collection courtesy of [Jamendo](https://jamendo.com). To download these tracks:"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:41
+#: ../../administrator/import.md:41
 msgid "Download the shell script."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:47
+#: ../../administrator/import.md:47
 msgid "Download the music list."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:53
+#: ../../administrator/import.md:53
 msgid "Run the shell script against the music list to download the tracks."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:59
+#: ../../administrator/import.md:59
 msgid "This downloads a set compressed albums to your `data/music` directory and unzips them. You can then import these tracks using the methods in this article."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:61
+#: ../../administrator/import.md:61
 msgid "Find your library ID"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:63
-msgid "You need to create a library before you can import music. Follow the instructions in [Create a library](../../user_documentation/libraries/create_library.md) to get started."
+#: ../../administrator/import.md:63
+msgid "You need to create a library before you can import music. Follow the instructions in [Create a library](../user/libraries/create.md) to get started."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:65
+#: ../../administrator/import.md:65
 msgid "Once you've created your library, you can find its ID by following these steps:"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:67
+#: ../../administrator/import.md:67
 msgid "Visit `https://<yourdomain>/content/libraries/` in your browser. This page contains a list of your libraries."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:68
+#: ../../administrator/import.md:68
 msgid "Find the library you want to upload content into. Select {guilabel}`Library details` to open the library details page."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:69
+#: ../../administrator/import.md:69
 msgid "Your library's ID is the long string of letters and numbers shown in the URL bar. Copy the content before the first hyphen (`-`)."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:71
+#: ../../administrator/import.md:71
 msgid "For example, if your library ID is `769a2bc3-eb1d-4aff-9f84-2c4d80d5c2d1`, copy the `769a2bc3`. You can use this as a shorthand reference for your library."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:73
+#: ../../administrator/import.md:73
 msgid "Import your music"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:75
+#: ../../administrator/import.md:75
 msgid "Copy files from your server"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:77
+#: ../../administrator/import.md:77
 msgid "Once you have your library ID, you can copy content from your server and import it into the library. To do this:"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:79
-#: ../../administrator_documentation/import_docs/index.md:162
+#: ../../administrator/import.md:79
+#: ../../administrator/import.md:162
 msgid "Log in to your server and navigate to your Funkwhale directory."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:85
-#: ../../administrator_documentation/import_docs/index.md:169
+#: ../../administrator/import.md:85
+#: ../../administrator/import.md:169
 msgid "Export your library ID to reference it later. In this example, the library ID is \"769a2bc3\". Replace this with your library ID."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:91
+#: ../../administrator/import.md:91
 msgid "Run the `import_files` command to copy your files. In this example, the music is stored in `data/music`. Replace this with your music directory."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:97
+#: ../../administrator/import.md:97
 msgid "Funkwhale copies your files to your media store."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:99
+#: ../../administrator/import.md:99
 msgid "Access your files in-place"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:101
+#: ../../administrator/import.md:101
 msgid "The in-place import method references your files in their current directory. This is useful if you have limited storage space."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:103
+#: ../../administrator/import.md:103
 msgid "Link your file directory"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:105
+#: ../../administrator/import.md:105
 msgid "We recommend you symbolically link your music directories to `/srv/funkwhale/data/music`. You can then run the `import_files` command from that directory. This means you can use many directories without needing to add to them to your webserver."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:113
+#: ../../administrator/import.md:113
 msgid "To link your storage directory to the Funkwhale store, use the `ln -s` command. For example, if you have an NFS share at `/media/nfsshare`, you can link it to a folder like this:"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:119
-#: ../../administrator_documentation/import_docs/index.md:148
+#: ../../administrator/import.md:119
+#: ../../administrator/import.md:148
 msgid "You can then run the `import_files` command against `/srv/funkwhale/data/music/nfsshare`."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:126
+#: ../../administrator/import.md:126
 msgid "On a Docker install you can use bind mounts to reference your storage directory. To do this, you need to add the directory to the `api` and `celeryworker` blocks in your `docker-compose.yml` file. For example, if you have an NFS share at `/media/nfsshare`, you can add the following to your `docker-compose.yml` file:"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:152
+#: ../../administrator/import.md:152
 msgid "Import your files"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:154
+#: ../../administrator/import.md:154
 msgid "To use the in-place import method, follow these steps:"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:168
-msgid "Add your storage location to your `.env` file if you don't want to link it to the Funkwhale store. See the [in-place import configuration variables](../configuration_docs/env_file.md#in-place-import-configuration) for more information."
+#: ../../administrator/import.md:168
+msgid "Add your storage location to your `.env` file if you don't want to link it to the Funkwhale store. See the [in-place import configuration variables](configuration/env-file.md#in-place-import-configuration) for more information."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:175
+#: ../../administrator/import.md:175
 msgid "Run your import command against your music storage directory. In this example, the storage directory is `/srv/funkwhale/data/music/nfsshare`. Replace this with your storage directory."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:181
-#: ../../administrator_documentation/import_docs/index.md:195
+#: ../../administrator/import.md:181
+#: ../../administrator/import.md:195
 msgid "Funkwhale imports the music in your storage directory into the specified library."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:188
-msgid "Add your storage location to your `.env` file if you don't want to bind it to the Funkwhale store. See the [in-place import configuration variables](../configuration_docs/env_file.md#in-place-import-configuration) for more information."
+#: ../../administrator/import.md:188
+msgid "Add your storage location to your `.env` file if you don't want to bind it to the Funkwhale store. See the [in-place import configuration variables](configuration/env-file.md#in-place-import-configuration) for more information."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:189
+#: ../../administrator/import.md:189
 msgid "Run your import command against your music storage directory:"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:199
+#: ../../administrator/import.md:199
 msgid "Album art"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:201
+#: ../../administrator/import.md:201
 msgid "Funkwhale attempts to import album art for your music library. The import process checks for the following."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:203
+#: ../../administrator/import.md:203
 msgid "The cover embedded in the audio files (works with FLAC and MP3 files)."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:204
+#: ../../administrator/import.md:204
 msgid "A `cover.jpg` or `cover.png` in the the track's directory."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:205
+#: ../../administrator/import.md:205
 msgid "An `mbid` in the file's tags. If there is an `mbid`, the import process tries to fetch cover art from Musicbrainz."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:207
+#: ../../administrator/import.md:207
 msgid "Watch for filesystem changes"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:209
+#: ../../administrator/import.md:209
 msgid "You can run the `import_files` command any time you add new files or update files. For larger collections, this may not be practical. To watch for changes, run the `import_files` command with the `--watch` flag. This instructs the `import_files` command to watch for filesystem events and update your database when something changes."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:211
+#: ../../administrator/import.md:211
 msgid "The `--watch` flag performs the following actions when it detects a change:"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:213
+#: ../../administrator/import.md:213
 msgid "File created – imports the track."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:214
+#: ../../administrator/import.md:214
 msgid "File moved – updates the location of the track in the database."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:215
+#: ../../administrator/import.md:215
 msgid "File metadata updated – updates the track metadata in the database."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:216
+#: ../../administrator/import.md:216
 msgid "File deleted – removes the file from the database."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:0
+#: ../../administrator/import.md:0
 msgid "Watched metadata"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:220
+#: ../../administrator/import.md:220
 msgid "The `import_files --watch` command watches for changes to the following metadata fields:"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:222
+#: ../../administrator/import.md:222
 msgid "Track mbid"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:223
+#: ../../administrator/import.md:223
 msgid "Track title"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:224
+#: ../../administrator/import.md:224
 msgid "Track position and disc number"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:225
+#: ../../administrator/import.md:225
 msgid "Track license and copyright"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:226
+#: ../../administrator/import.md:226
 msgid "Track genre"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:227
+#: ../../administrator/import.md:227
 msgid "Album cover"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:228
+#: ../../administrator/import.md:228
 msgid "Album title"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:229
+#: ../../administrator/import.md:229
 msgid "Album mbid"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:230
+#: ../../administrator/import.md:230
 msgid "Album release date"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:231
+#: ../../administrator/import.md:231
 msgid "Artist name"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:232
+#: ../../administrator/import.md:232
 msgid "Artist mbid"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:233
+#: ../../administrator/import.md:233
 msgid "Album artist name"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:234
+#: ../../administrator/import.md:234
 msgid "Album artist mbid"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:259
+#: ../../administrator/import.md:259
 msgid "Prune dangling metadata"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:261
+#: ../../administrator/import.md:261
 msgid "Funkwhale doesn't delete track metadata when you delete a track. This is useful if you want to delete a file but keep a record of a track for created playlists or favorites."
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:263
+#: ../../administrator/import.md:263
 msgid "If you want to remove the file's metadata when you delete the file, run `import_files` with the `--prune` flag. This flag removes the metadata of any"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md:266
+#: ../../administrator/import.md:266
 msgid "You can use the `--prune` flag with the `--watch` flag. This means Funkwhale removes the metadata of referenced files you delete from your storage."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/index.pot b/docs/locales/gettext/administrator/index.pot
index 15a4be06a..a6f0c3686 100644
--- a/docs/locales/gettext/administrator/index.pot
+++ b/docs/locales/gettext/administrator/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,42 +16,42 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/index.md:1
+#: ../../administrator/index.md:1
 msgid "Get started"
 msgstr ""
 
-#: ../../administrator_documentation/index.md:3
+#: ../../administrator/index.md:3
 msgid "Follow the guides in this section to set up and administrate your pod."
 msgstr ""
 
-#: ../../administrator_documentation/index.md:9
+#: ../../administrator/index.md:9
 msgid "Install Funkwhale on your server"
 msgstr ""
 
-#: ../../administrator_documentation/index.md:11
-msgid "Funkwhale is self-hosted, meaning you run it on your own server. To set up your own Funkwhale pod, check out [our installation guides](installation_docs/index.md). Choose the installation method that works for you!"
+#: ../../administrator/index.md:11
+msgid "Funkwhale is self-hosted, meaning you run it on your own server. To set up your own Funkwhale pod, check out [our installation guides](installation/index.md). Choose the installation method that works for you!"
 msgstr ""
 
-#: ../../administrator_documentation/index.md:13
+#: ../../administrator/index.md:13
 msgid "Configure your Funkwhale pod"
 msgstr ""
 
-#: ../../administrator_documentation/index.md:15
-msgid "Once you've installed Funkwhale, you can use [the guides in this section](configuration_docs/index.md) to configure it."
+#: ../../administrator/index.md:15
+msgid "Once you've installed Funkwhale, you can use [the guides in this section](configuration/index.md) to configure it."
 msgstr ""
 
-#: ../../administrator_documentation/index.md:17
+#: ../../administrator/index.md:17
 msgid "Upgrade your Funkwhale pod"
 msgstr ""
 
-#: ../../administrator_documentation/index.md:19
-msgid "Funkwhale releases new updates regularly. To keep up-to-date with these changes, check out our [upgrade guides](upgrade_docs/index.md). If you're moving from our deprecated mono-container Docker setup, check out our [migration guide](migration_guide/index.md)."
+#: ../../administrator/index.md:19
+msgid "Funkwhale releases new updates regularly. To keep up-to-date with these changes, check out our [upgrade guides](upgrade/index.md). If you're moving from our deprecated mono-container Docker setup, check out our [migration guide](migration.md)."
 msgstr ""
 
-#: ../../administrator_documentation/index.md:21
+#: ../../administrator/index.md:21
 msgid "Manage your Funkwhale pod"
 msgstr ""
 
-#: ../../administrator_documentation/index.md:23
-msgid "Funkwhale provides tools for managing content and users on your Funkwhale pod. In addition to the [frontend moderation tools](../moderator_documentation/index.md), pod admins can use some extra tools for more powerful administration. Check out our [guide to the Django dashboard](django/index.md) and our [management script](manage_script/index.md) to get started."
+#: ../../administrator/index.md:23
+msgid "Funkwhale provides tools for managing content and users on your Funkwhale pod. In addition to the [frontend moderation tools](../moderator/index.md), pod admins can use some extra tools for more powerful administration. Check out our [guide to the Django dashboard](django/index.md) and our [management script](manage-script/index.md) to get started."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/installation/debian.pot b/docs/locales/gettext/administrator/installation/debian.pot
index a9b76e4d4..dd236f355 100644
--- a/docs/locales/gettext/administrator/installation/debian.pot
+++ b/docs/locales/gettext/administrator/installation/debian.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,334 +16,334 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/installation_docs/debian.md:1
+#: ../../administrator/installation/debian.md:1
 msgid "Install Funkwhale on Debian"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:3
+#: ../../administrator/installation/debian.md:3
 msgid "We support [Debian](https://debian.org) and Debian-based Linux distributions. Follow these steps to set up Funkwhale on a Debian server."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:10
+#: ../../administrator/installation/debian.md:10
 msgid "Before you begin"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:12
+#: ../../administrator/installation/debian.md:12
 msgid "Set a `FUNKWHALE_VERSION` variable to the version you want to install. You will use this version for all commands in this guide."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:18
+#: ../../administrator/installation/debian.md:18
 msgid "Install `curl`"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:25
+#: ../../administrator/installation/debian.md:25
 msgid "1. Install Funkwhale dependencies"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:27
+#: ../../administrator/installation/debian.md:27
 msgid "To install Funkwhale on your server, you first need to install its dependencies. We provide all dependencies in a single file to enable you to install everything at once. You can pass the information from this file to `apt` using the following command:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:33
+#: ../../administrator/installation/debian.md:33
 msgid "When prompted, hit {kbd}`y` to confirm the install."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:35
+#: ../../administrator/installation/debian.md:35
 msgid "That's it! `apt` installs all dependencies and tells you once it has finished."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:37
+#: ../../administrator/installation/debian.md:37
 msgid "2. Create a Funkwhale user"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:39
+#: ../../administrator/installation/debian.md:39
 msgid "It's good practice to create a user on your server for Funkwhale administration. Doing this makes it easy to make sure you're running commands from the right place. Follow these steps to set up your user."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:41
+#: ../../administrator/installation/debian.md:41
 msgid "Create the `funkwhale` user and set its shell to `bash` and its home directory to `/srv/funkwhale`."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:48
+#: ../../administrator/installation/debian.md:48
 msgid "To perform any tasks as the `funkwhale` user, prefix your commands with `sudo -u funkwhale`."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:54
+#: ../../administrator/installation/debian.md:54
 msgid "Or log in as `funkwhale` with `sudo su funkwhale` before running your commands."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:62
+#: ../../administrator/installation/debian.md:62
 msgid "That's it! You've created your `funkwhale` user."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:64
+#: ../../administrator/installation/debian.md:64
 msgid "3. Download Funkwhale"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:66
+#: ../../administrator/installation/debian.md:66
 msgid "Once you've created your `funkwhale` user you can download the Funkwhale software itself."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:68
+#: ../../administrator/installation/debian.md:68
 msgid "Create the directory layout"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:70
+#: ../../administrator/installation/debian.md:70
 msgid "Go to the `/srv/funkwhale` directory."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:76
+#: ../../administrator/installation/debian.md:76
 msgid "Create the directories for Funkwhale."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:82
+#: ../../administrator/installation/debian.md:82
 msgid "Allow the Funkwhale user to write to the data directories."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:88
+#: ../../administrator/installation/debian.md:88
 msgid "That's it! Your directory structure should look like this:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:101
+#: ../../administrator/installation/debian.md:101
 msgid "Download the Funkwhale release"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:103
+#: ../../administrator/installation/debian.md:103
 msgid "Once you've created the directory structure you can download Funkwhale. Funkwhale comes in two parts: the API and the Frontend. You need both to run the application."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:105
+#: ../../administrator/installation/debian.md:105
 msgid "Download the API."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:114
+#: ../../administrator/installation/debian.md:114
 msgid "Download the frontend"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:123
+#: ../../administrator/installation/debian.md:123
 msgid "You're done! These commands put the software in the correct location for Funkwhale to serve them."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:125
+#: ../../administrator/installation/debian.md:125
 msgid "4. Install the Funkwhale API"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:127
+#: ../../administrator/installation/debian.md:127
 msgid "The Funkwhale API is written in Python. You need to install the API's package to run the software:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:129
+#: ../../administrator/installation/debian.md:129
 msgid "Set up a Python virtual environment:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:137
+#: ../../administrator/installation/debian.md:137
 msgid "Install the Funkwhale API package and dependencies:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:143
+#: ../../administrator/installation/debian.md:143
 msgid "You're done!"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:145
+#: ../../administrator/installation/debian.md:145
 msgid "5. Set up your environment file"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:147
+#: ../../administrator/installation/debian.md:147
 msgid "The environment file contains options you can use to control your Funkwhale pod. Follow these steps to get a working environment up and running."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:149
+#: ../../administrator/installation/debian.md:149
 msgid "Download the `.env` template to your `/srv/funkwhale/config` directory."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:155
+#: ../../administrator/installation/debian.md:155
 msgid "Generate a secret key for Django. This keeps your Funkwhale data secure. Do not share this key with anybody."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:161
+#: ../../administrator/installation/debian.md:161
 msgid "Reduce the permissions on your `.env` file to `600`. This means that only the `funkwhale` user can read and write this file."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:168
+#: ../../administrator/installation/debian.md:168
 msgid "Open the `.env` file in a text editor. For this example, we will use `nano`."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:174
+#: ../../administrator/installation/debian.md:174
 msgid "Update the following settings:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:176
+#: ../../administrator/installation/debian.md:176
 msgid "Paste the secret key in the `DJANGO_SECRET_KEY` field."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:177
+#: ../../administrator/installation/debian.md:177
 msgid "Populate the `DATABASE_URL` field:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:183
+#: ../../administrator/installation/debian.md:183
 msgid "Populate the `CACHE_URL` field:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:189
+#: ../../administrator/installation/debian.md:189
 msgid "Populate the `FUNKWHALE_HOSTNAME` field with the domain name of your server."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:191
+#: ../../administrator/installation/debian.md:191
 msgid "Hit {kbd}`ctrl + x` then {kbd}`y` to save the file and close `nano`."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:193
+#: ../../administrator/installation/debian.md:193
 msgid "You're done! Your environment file is now ready to go. You can check out a full list of configuration options in our Environment file guide."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:195
+#: ../../administrator/installation/debian.md:195
 msgid "6. Set up your database"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:197
+#: ../../administrator/installation/debian.md:197
 msgid "Funkwhale uses a [PostgreSQL](https://www.postgresql.org/) database to store information. Follow these steps to set up your database."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:199
+#: ../../administrator/installation/debian.md:199
 msgid "Install PostgreSQL and the `postgresql-contrib` package. This package contains extra features that Funkwhale uses."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:205
+#: ../../administrator/installation/debian.md:205
 msgid "Once you've installed PostgreSQL, launch a `psql` shell as the `postgres` user to set up your database."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:211
+#: ../../administrator/installation/debian.md:211
 msgid "Create your Funkwhale database."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:217
+#: ../../administrator/installation/debian.md:217
 msgid "Create a user for Funkwhale. This user needs all privileges so it can manage the database."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:224
+#: ../../administrator/installation/debian.md:224
 msgid "Once you're finished, exit the shell"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:230
+#: ../../administrator/installation/debian.md:230
 msgid "Run the following commands to create extra extensions for the `funkwhale` database."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:237
+#: ../../administrator/installation/debian.md:237
 msgid "Your database is ready to be populated! Use the `funkwhale-manage` command line interface to create the database structure."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:245
+#: ../../administrator/installation/debian.md:245
 msgid "You may see the following warning when applying migrations:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:251
+#: ../../administrator/installation/debian.md:251
 msgid "You can safely ignore this warning."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:254
+#: ../../administrator/installation/debian.md:254
 msgid "That's it! You've finished setting up your database."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:256
+#: ../../administrator/installation/debian.md:256
 msgid "7. Set up Funkwhale"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:258
+#: ../../administrator/installation/debian.md:258
 msgid "Once you've got your database up and running, you can get Funkwhale ready to launch. Use the built-in `funkwhale-manage` command line interface to get things ready."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:260
+#: ../../administrator/installation/debian.md:260
 msgid "Create a superuser for your pod"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:263
+#: ../../administrator/installation/debian.md:263
 msgid "You can create several superusers."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:266
+#: ../../administrator/installation/debian.md:266
 msgid "To start using Funkwhale, you need to create a superuser for your pod. This user has all the permissions needed to administrate the pod. Follow these steps to create a superuser."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:272
+#: ../../administrator/installation/debian.md:272
 msgid "That's it! You can log in as this user when you finish setting up Funkwhale."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:274
+#: ../../administrator/installation/debian.md:274
 msgid "Collect static files"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:276
+#: ../../administrator/installation/debian.md:276
 msgid "Funkwhale uses several static assets to serve its frontend. Use the `funkwhale-manage` command line interface to collect these files so that the webserver can serve them."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:282
+#: ../../administrator/installation/debian.md:282
 msgid "8. Set up systemd unit files"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:284
+#: ../../administrator/installation/debian.md:284
 msgid "Funkwhale uses [systemd](https://www.freedesktop.org/wiki/Software/systemd/) to manage its services. systemd helps prevent downtime by bringing services back up if they fail. It also starts your Funkwhale services after a reboot. Follow these steps to set up Funkwhale services with systemd."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:286
+#: ../../administrator/installation/debian.md:286
 msgid "Download the sample unit files from Funkwhale."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:295
+#: ../../administrator/installation/debian.md:295
 msgid "Reload systemd to register the new services."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:301
+#: ../../administrator/installation/debian.md:301
 msgid "Start all Funkwhale services."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:307
+#: ../../administrator/installation/debian.md:307
 msgid "Enable the services. Systemd can then start the services after a reboot."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:313
+#: ../../administrator/installation/debian.md:313
 msgid "That's it! systemd keeps these services running and starts them up in the correct order after a reboot."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:315
+#: ../../administrator/installation/debian.md:315
 msgid "9. Set up a reverse proxy"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:317
+#: ../../administrator/installation/debian.md:317
 msgid "Funkwhale uses a reverse proxy to serve content to users. We use [Nginx](https://nginx.com) to serve this proxy. Follow this guide to install an Nginx configuration using details from your `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:319
+#: ../../administrator/installation/debian.md:319
 msgid "Install Nginx."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:326
+#: ../../administrator/installation/debian.md:326
 msgid "Download the Nginx templates from Funkwhale."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:333
+#: ../../administrator/installation/debian.md:333
 msgid "Create an Nginx template with details from your `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:356
+#: ../../administrator/installation/debian.md:356
 msgid "That's it! You've created your Nginx file. Run the following command to check the `.env` details populated correctly."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:362
+#: ../../administrator/installation/debian.md:362
 msgid "10. Set up TLS"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:364
+#: ../../administrator/installation/debian.md:364
 msgid "To enable your users to connect to your pod securely, you need to set up {abbr}`TLS (Transport Layer Security)`. To do this, we recommend using [certbot](https://certbot.eff.org/)."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:366
+#: ../../administrator/installation/debian.md:366
 msgid "Install certbot"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:373
+#: ../../administrator/installation/debian.md:373
 msgid "Run certbot"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/debian.md:379
+#: ../../administrator/installation/debian.md:379
 msgid "That's it! certbot renews your certificate every 60 days, so you don't need to worry about renewing it."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/installation/docker.pot b/docs/locales/gettext/administrator/installation/docker.pot
index 0f9d5b58d..3d73335b7 100644
--- a/docs/locales/gettext/administrator/installation/docker.pot
+++ b/docs/locales/gettext/administrator/installation/docker.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,242 +16,242 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/installation_docs/docker.md:1
+#: ../../administrator/installation/docker.md:1
 msgid "Install Funkwhale using Docker"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:3
+#: ../../administrator/installation/docker.md:3
 msgid "Funkwhale is available as a containerized application. This enables you to run each service in containers rather than install them on your server. You can run Funkwhale using [Docker](https://docker.com)."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:6
+#: ../../administrator/installation/docker.md:6
 msgid "This guide assumes you are using a [Debian](https://debian.org)-based system."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:13
+#: ../../administrator/installation/docker.md:13
 msgid "Before you begin"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:15
+#: ../../administrator/installation/docker.md:15
 msgid "Set a `FUNKWHALE_VERSION` variable to the version you want to install. You will use this version for all commands in this guide."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:21
+#: ../../administrator/installation/docker.md:21
 msgid "Install [Docker](https://docs.docker.com/engine/install/) and the [compose plugin](https://docs.docker.com/compose/install/linux/#install-using-the-repository)."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:22
+#: ../../administrator/installation/docker.md:22
 msgid "Install `curl`."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:29
+#: ../../administrator/installation/docker.md:29
 msgid "1. Create a Funkwhale user"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:31
+#: ../../administrator/installation/docker.md:31
 msgid "It's good practice to create a user on your server for Funkwhale administration. Doing this makes it easy to make sure you're running commands from the right place. Follow these steps to set up your user."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:33
+#: ../../administrator/installation/docker.md:33
 msgid "Create the `funkwhale` user and set its shell to `bash` and its home directory to `/srv/funkwhale`."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:40
+#: ../../administrator/installation/docker.md:40
 msgid "To perform any tasks as the `funkwhale` user, prefix your commands with `sudo -u funkwhale`."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:46
+#: ../../administrator/installation/docker.md:46
 msgid "Or log in as `funkwhale` with `sudo su funkwhale` before running your commands."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:54
+#: ../../administrator/installation/docker.md:54
 msgid "That's it! You've created your `funkwhale` user."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:56
+#: ../../administrator/installation/docker.md:56
 msgid "2. Download the project files"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:58
+#: ../../administrator/installation/docker.md:58
 msgid "Create the project directory structure."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:64
+#: ../../administrator/installation/docker.md:64
 msgid "Navigate to the project directory"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:70
+#: ../../administrator/installation/docker.md:70
 msgid "Download the `docker compose` template. This contains information about the containers and how they work together."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:76
+#: ../../administrator/installation/docker.md:76
 msgid "That's it! You've set up your project files."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:78
+#: ../../administrator/installation/docker.md:78
 msgid "3. Set up your environment file"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:80
+#: ../../administrator/installation/docker.md:80
 msgid "The environment file contains options you can use to control your Funkwhale pod. Follow these steps to get a working environment up and running."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:82
+#: ../../administrator/installation/docker.md:82
 msgid "Download the `.env` template to your `/srv/funkwhale` directory."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:88
+#: ../../administrator/installation/docker.md:88
 msgid "Update `FUNKWHALE_VERSION` in the `.env` file to the `$FUNKWHALE_VERSION` variable you set earlier."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:94
+#: ../../administrator/installation/docker.md:94
 msgid "Reduce the permissions on your `.env` file to `600`. This means that only your user can read and write this file."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:100
+#: ../../administrator/installation/docker.md:100
 msgid "Generate a secret key for Django. This keeps your Funkwhale data secure. Do not share this key with anybody."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:106
+#: ../../administrator/installation/docker.md:106
 msgid "Open the `.env` file in a text editor. For this example, we will use `nano`."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:112
+#: ../../administrator/installation/docker.md:112
 msgid "Update the following settings:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:114
+#: ../../administrator/installation/docker.md:114
 msgid "Paste the secret key in the `DJANGO_SECRET_KEY` field."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:115
+#: ../../administrator/installation/docker.md:115
 msgid "Populate the `FUNKWHALE_HOSTNAME` field with the URL of your server."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:117
+#: ../../administrator/installation/docker.md:117
 msgid "Hit {kbd}`ctrl + x` then {kbd}`y` to save the file and close `nano`."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:119
+#: ../../administrator/installation/docker.md:119
 msgid "You're done! Your environment file is now ready to go. You can check out a full list of configuration options in our Environment file guide."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:121
+#: ../../administrator/installation/docker.md:121
 msgid "4. Set up Funkwhale"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:123
+#: ../../administrator/installation/docker.md:123
 msgid "Once you've filled in your environment file, you can set up Funkwhale. Follow these steps to create your database and create a superuser."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:125
+#: ../../administrator/installation/docker.md:125
 msgid "Pull the containers to download all the required services."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:132
+#: ../../administrator/installation/docker.md:132
 msgid "Bring up the database container so you can run the database migrations."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:138
+#: ../../administrator/installation/docker.md:138
 msgid "Run the database migrations."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:145
+#: ../../administrator/installation/docker.md:145
 msgid "You may see the following warning when applying migrations:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:151
+#: ../../administrator/installation/docker.md:151
 msgid "You can safely ignore this warning."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:154
+#: ../../administrator/installation/docker.md:154
 msgid "Create your superuser."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:160
+#: ../../administrator/installation/docker.md:160
 msgid "Launch all the containers to bring up your pod."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:166
+#: ../../administrator/installation/docker.md:166
 msgid "That's it! Your Funkwhale pod is now up and running."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:168
+#: ../../administrator/installation/docker.md:168
 msgid "5. Set up your reverse proxy"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:170
+#: ../../administrator/installation/docker.md:170
 msgid "Funkwhale requires a reverse proxy to serve content to users. We recommend using [Nginx](https://nginx.com) to handle requests to your container. To do this:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:172
+#: ../../administrator/installation/docker.md:172
 msgid "Install Nginx."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:179
+#: ../../administrator/installation/docker.md:179
 msgid "Download the Nginx templates from Funkwhale."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:186
+#: ../../administrator/installation/docker.md:186
 msgid "Create an Nginx template with details from your `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:209
+#: ../../administrator/installation/docker.md:209
 msgid "That's it! You've created your Nginx file. Run the following command to check the `.env` details populated correctly."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:215
+#: ../../administrator/installation/docker.md:215
 msgid "Override default Nginx templates"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:217
+#: ../../administrator/installation/docker.md:217
 msgid "The frontend container ships default Nginx templates which serve content to the reverse proxy. These files read variables from your `.env` file to correctly serve content. In some cases, you might want to override these defaults. To do this:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:219
+#: ../../administrator/installation/docker.md:219
 msgid "Create a `/srv/funkwhale/nginx` directory to house your files."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:225
+#: ../../administrator/installation/docker.md:225
 msgid "Download the Nginx template files to the `/srv/funkwhale/nginx` directory."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:232
+#: ../../administrator/installation/docker.md:232
 msgid "Make any changes you want to make to these files."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:233
+#: ../../administrator/installation/docker.md:233
 msgid "Open your `docker-compose.yml` file in a text editor. For this example, we will use `nano`."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:239
+#: ../../administrator/installation/docker.md:239
 msgid "Uncomment the lines in the `volumes` section of the `front` service by deleting the `#` in front of them."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:253
+#: ../../administrator/installation/docker.md:253
 msgid "Bring the `front` container up again to pick up the changes."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:259
+#: ../../administrator/installation/docker.md:259
 msgid "That's it! The container mounts your custom nginx files and uses its values to serve Funkwhale content. To revert to the default values, comment out the volumes by adding a `#` in front of them and bring the `front` container back up."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:261
+#: ../../administrator/installation/docker.md:261
 msgid "6. Set up TLS"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:263
+#: ../../administrator/installation/docker.md:263
 msgid "To enable your users to connect to your pod securely, you need to set up {abbr}`TLS (Transport Layer Security)`. To do this, we recommend using [certbot](https://certbot.eff.org/)."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:265
+#: ../../administrator/installation/docker.md:265
 msgid "Install certbot"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:272
+#: ../../administrator/installation/docker.md:272
 msgid "Run certbot"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/docker.md:278
+#: ../../administrator/installation/docker.md:278
 msgid "That's it! certbot renews your certificate every 60 days, so you don't need to worry about renewing it."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/installation/index.pot b/docs/locales/gettext/administrator/installation/index.pot
index 5dd7ac6b4..19574c57b 100644
--- a/docs/locales/gettext/administrator/installation/index.pot
+++ b/docs/locales/gettext/administrator/installation/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,30 +16,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/installation_docs/index.md:10
+#: ../../administrator/installation/index.md:10
 msgid "Choose your installation method"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/index.md:23
+#: ../../administrator/installation/index.md:23
 msgid "Migrate your installation"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/index.md:1
+#: ../../administrator/installation/index.md:1
 msgid "Install Funkwhale on your server"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/index.md:3
+#: ../../administrator/installation/index.md:3
 msgid "Choose your installation method and follow the guides to set up your pod."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/index.md:5
+#: ../../administrator/installation/index.md:5
 msgid "Funkwhale requires the following:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/index.md:7
+#: ../../administrator/installation/index.md:7
 msgid "**A dedicated domain or subdomain** – you can't run Funkwhale in a subdirectory of a domain. You need to run it on a domain or a subdomain. For example: `https://mypod.io` or `https://funkwhale.mysite.io`."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/index.md:8
+#: ../../administrator/installation/index.md:8
 msgid "**Access to ports `80` and `443`** – Funkwhale uses these ports for federation."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/installation/migrate.pot b/docs/locales/gettext/administrator/installation/migrate.pot
index aab545d00..589552082 100644
--- a/docs/locales/gettext/administrator/installation/migrate.pot
+++ b/docs/locales/gettext/administrator/installation/migrate.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,190 +16,190 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/installation_docs/migrate.md:1
+#: ../../administrator/installation/migrate.md:1
 msgid "Migrate to a new server"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:3
+#: ../../administrator/installation/migrate.md:3
 msgid "You can migrate your Funkwhale installation if you are setting up a new server. This can be useful if you are moving to a different hosting provider or upgrading your server."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:5
+#: ../../administrator/installation/migrate.md:5
 msgid "In this guide we refer to your servers like this:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:0
+#: ../../administrator/installation/migrate.md:0
 msgid "Original server"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:9
+#: ../../administrator/installation/migrate.md:9
 msgid "The server on which you are running Funkwhale."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:3
+#: ../../administrator/installation/migrate.md:3
 msgid "Destination server"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:12
+#: ../../administrator/installation/migrate.md:12
 msgid "The server to which you want to move your Funkwhale installation."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:17
-msgid "Make sure you [back up your data](../upgrade_docs/backup.md) before proceeding. This ensures you don't lose anything during the migration."
+#: ../../administrator/installation/migrate.md:17
+msgid "Make sure you [back up your data](../upgrade/backup.md) before proceeding. This ensures you don't lose anything during the migration."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:24
+#: ../../administrator/installation/migrate.md:24
 msgid "Requirements"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:26
+#: ../../administrator/installation/migrate.md:26
 msgid "To get started with your new setup, you need to do the following:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:28
+#: ../../administrator/installation/migrate.md:28
 msgid "[Set up SSH access between both servers](https://kerneltalks.com/howto/establish-passwordless-ssh-between-two-servers/)."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:29
+#: ../../administrator/installation/migrate.md:29
 msgid "Install [rsync](https://linux.die.net/man/1/rsync) on the {term}`destination server`."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:31
+#: ../../administrator/installation/migrate.md:31
 msgid "1. Install Funkwhale on your destination server"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:33
+#: ../../administrator/installation/migrate.md:33
 msgid "Before you move your data, you need to install Funkwhale on your {term}`destination server`."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:0
+#: ../../administrator/installation/migrate.md:0
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:41
+#: ../../administrator/installation/migrate.md:41
 msgid "On your {term}`destination server`, follow the [installation guide](debian.md). Skip the following steps:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:43
+#: ../../administrator/installation/migrate.md:43
 msgid "Don't enable the `unaccent` and `citext` extensions when you set up the database."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:44
-#: ../../administrator_documentation/installation_docs/migrate.md:60
+#: ../../administrator/installation/migrate.md:44
+#: ../../administrator/installation/migrate.md:60
 msgid "Don't run the `funkwhale-manage migrate` command to migrate the database."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:45
-#: ../../administrator_documentation/installation_docs/migrate.md:61
+#: ../../administrator/installation/migrate.md:45
+#: ../../administrator/installation/migrate.md:61
 msgid "Don't create a superuser."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:47
-#: ../../administrator_documentation/installation_docs/migrate.md:63
+#: ../../administrator/installation/migrate.md:47
+#: ../../administrator/installation/migrate.md:63
 msgid "Once you have finished the installation, stop the Funkwhale services. These shouldn't be running when you copy your existing data over."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:0
+#: ../../administrator/installation/migrate.md:0
 msgid "Docker"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:58
+#: ../../administrator/installation/migrate.md:58
 msgid "On your {term}`destination server`, follow the [installation guide](docker.md). Skip the following steps:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:71
+#: ../../administrator/installation/migrate.md:71
 msgid "2. Create a database backup"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:73
+#: ../../administrator/installation/migrate.md:73
 msgid "You need to create a database backup on your {term}`original server` so that you can migrate your database. To do this, run the following command:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:96
+#: ../../administrator/installation/migrate.md:96
 msgid "3. Copy files to your destination server"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:98
+#: ../../administrator/installation/migrate.md:98
 msgid "Next, you can copy your files from your {term}`original server` to your {term}`destination server`. You need to copy the following data:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:100
+#: ../../administrator/installation/migrate.md:100
 msgid "Your `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:101
+#: ../../administrator/installation/migrate.md:101
 msgid "The database backup."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:102
+#: ../../administrator/installation/migrate.md:102
 msgid "The `/srv/funkwhale/data/media` directory."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:103
+#: ../../administrator/installation/migrate.md:103
 msgid "The `/srv/funkwhale/data/music` directory."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:105
+#: ../../administrator/installation/migrate.md:105
 msgid "To do this:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:107
+#: ../../administrator/installation/migrate.md:107
 msgid "Log in to your {term}`destination server`."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:108
+#: ../../administrator/installation/migrate.md:108
 msgid "Export your server hostname or IP address and your user name on the server. In this example, the IP address is `123.123.123.123` and the username is `funkwhale`."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:115
+#: ../../administrator/installation/migrate.md:115
 msgid "Use `rsync` to copy the information to your {term}`destination server`."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:124
+#: ../../administrator/installation/migrate.md:124
 msgid "4. Restore your database backup"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:126
+#: ../../administrator/installation/migrate.md:126
 msgid "When you've copied everything to the {term}`destination server`, you need to import your database backup. To do this:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:134
+#: ../../administrator/installation/migrate.md:134
 msgid "Run the following on your {term}`destination server`:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:140
-#: ../../administrator_documentation/installation_docs/migrate.md:170
+#: ../../administrator/installation/migrate.md:140
+#: ../../administrator/installation/migrate.md:170
 msgid "When the import finishes, run the `funkwhale-manage migrate` command to set up the database."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:152
+#: ../../administrator/installation/migrate.md:152
 msgid "You need to initialize the postgres container on your {term}`destination server`. To do this:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:154
+#: ../../administrator/installation/migrate.md:154
 msgid "Export the permissions and create an `init.sql` database dump."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:164
+#: ../../administrator/installation/migrate.md:164
 msgid "Import your database backup."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:178
+#: ../../administrator/installation/migrate.md:178
 msgid "5. Check your DNS settings"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:180
+#: ../../administrator/installation/migrate.md:180
 msgid "Before you start Funkwhale on your {term}`destination server`, check your DNS changes have propagated. Once your hostname is pointing to your {term}`destination server's <destination server>` IP address, proceed to the next step."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:182
+#: ../../administrator/installation/migrate.md:182
 msgid "6. Start your new Funkwhale installation"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:184
+#: ../../administrator/installation/migrate.md:184
 msgid "Once you confirm DNS points to your {term}`destination server`, start the Funkwhale services:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/migrate.md:207
+#: ../../administrator/installation/migrate.md:207
 msgid "That's it! You've migrated your Funkwhale instance to a new server."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/installation/quick-install.pot b/docs/locales/gettext/administrator/installation/quick-install.pot
index 7b7d5310a..559d52977 100644
--- a/docs/locales/gettext/administrator/installation/quick-install.pot
+++ b/docs/locales/gettext/administrator/installation/quick-install.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,46 +16,46 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/installation_docs/quick_install.md:1
+#: ../../administrator/installation/quick-install.md:1
 msgid "Install Funkwhale with the quick install script"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/quick_install.md:3
+#: ../../administrator/installation/quick-install.md:3
 msgid "The quick install script is the easiest way to install Funkwhale. Run this script on a [Debian](https://debian.org)-based server to get your pod set up."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/quick_install.md:5
+#: ../../administrator/installation/quick-install.md:5
 msgid "Before you begin"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/quick_install.md:7
+#: ../../administrator/installation/quick-install.md:7
 msgid "You need `sudo` access to run the quick install script."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/quick_install.md:8
+#: ../../administrator/installation/quick-install.md:8
 msgid "The quick install script installs Nginx, PostgreSQL, and Redis by default. You can customize this behavior by selecting the options in the script."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/quick_install.md:10
+#: ../../administrator/installation/quick-install.md:10
 msgid "1. Install dependencies"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/quick_install.md:12
+#: ../../administrator/installation/quick-install.md:12
 msgid "To download the quick install script, install `curl`:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/quick_install.md:19
+#: ../../administrator/installation/quick-install.md:19
 msgid "2. Install Funkwhale"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/quick_install.md:21
+#: ../../administrator/installation/quick-install.md:21
 msgid "Now that you have `curl` installed, download and run the quick install script:"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/quick_install.md:27
+#: ../../administrator/installation/quick-install.md:27
 msgid "The script will prompt you to enter information about your instance. Follow the onscreen prompts until the script completes."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/quick_install.md:29
+#: ../../administrator/installation/quick-install.md:29
 msgid "That's it! You've finished installing Funkwhale. You should now be able to visit your pod in your web browser."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/installation/third-party.pot b/docs/locales/gettext/administrator/installation/third-party.pot
index dc96a680d..41644772b 100644
--- a/docs/locales/gettext/administrator/installation/third-party.pot
+++ b/docs/locales/gettext/administrator/installation/third-party.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,34 +16,34 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/installation_docs/third_party.md:1
+#: ../../administrator/installation/third-party.md:1
 msgid "Third-party installation methods"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/third_party.md:3
+#: ../../administrator/installation/third-party.md:3
 msgid "These installation methods are not provided by the Funkwhale project. If you have any issues with your installation, please contact the installation maintainers."
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/third_party.md:5
+#: ../../administrator/installation/third-party.md:5
 msgid "[YunoHost](https://github.com/YunoHost-Apps/funkwhale_ynh)"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/third_party.md:6
+#: ../../administrator/installation/third-party.md:6
 msgid "[Arch Linux](https://wiki.archlinux.org/index.php/Funkwhale)"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/third_party.md:7
+#: ../../administrator/installation/third-party.md:7
 msgid "[NixOS](https://github.com/mmai/funkwhale-nixos)"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/third_party.md:8
+#: ../../administrator/installation/third-party.md:8
 msgid "[Kubernetes helm chart](https://gitlab.com/ananace/charts/)"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/third_party.md:9
+#: ../../administrator/installation/third-party.md:9
 msgid "[HomelabOS](https://homelabos.com/docs/software/funkwhale/)"
 msgstr ""
 
-#: ../../administrator_documentation/installation_docs/third_party.md:10
+#: ../../administrator/installation/third-party.md:10
 msgid "[Docker swarm](https://github.com/fedeb95/funkwhale-swarm)"
 msgstr ""
diff --git a/docs/locales/gettext/administrator/manage-script/create-library.pot b/docs/locales/gettext/administrator/manage-script/create-library.pot
index 16d2c2690..8057645f6 100644
--- a/docs/locales/gettext/administrator/manage-script/create-library.pot
+++ b/docs/locales/gettext/administrator/manage-script/create-library.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,109 +16,109 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/manage_script/create_library.md:1
+#: ../../administrator/manage-script/create-library.md:1
 msgid "Create a library"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:3
+#: ../../administrator/manage-script/create-library.md:3
 msgid "Use the `create_library` command to create new libraries for a given user."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:9
+#: ../../administrator/manage-script/create-library.md:9
 msgid "Parameter"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:10
+#: ../../administrator/manage-script/create-library.md:10
 msgid "Data type"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:11
+#: ../../administrator/manage-script/create-library.md:11
 msgid "Description"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:13
+#: ../../administrator/manage-script/create-library.md:13
 msgid "`username`*"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:14
-#: ../../administrator_documentation/manage_script/create_library.md:18
+#: ../../administrator/manage-script/create-library.md:14
+#: ../../administrator/manage-script/create-library.md:18
 msgid "String"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:15
+#: ../../administrator/manage-script/create-library.md:15
 msgid "The user you want to create the library for."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:17
+#: ../../administrator/manage-script/create-library.md:17
 msgid "`--name`"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:19
+#: ../../administrator/manage-script/create-library.md:19
 msgid "The name of the library. Defaults to \"default\"."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:21
+#: ../../administrator/manage-script/create-library.md:21
 msgid "`--privacy-level`"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:22
+#: ../../administrator/manage-script/create-library.md:22
 msgid "Enum (String)"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:23
-msgid "The [privacy level](../../user_documentation/libraries/create_library.md) of the library"
+#: ../../administrator/manage-script/create-library.md:23
+msgid "The [privacy level](../../user/libraries/create.md) of the library"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:24
+#: ../../administrator/manage-script/create-library.md:24
 msgid "`\"me\"` (default)"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:25
+#: ../../administrator/manage-script/create-library.md:25
 msgid "`\"instance\"`"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:26
+#: ../../administrator/manage-script/create-library.md:26
 msgid "`\"everyone\"`"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:29
+#: ../../administrator/manage-script/create-library.md:29
 msgid "Examples"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:31
+#: ../../administrator/manage-script/create-library.md:31
 msgid "Create a new library"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:33
+#: ../../administrator/manage-script/create-library.md:33
 msgid "Use the following command to create a new library with a custom name and privacy level."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:0
+#: ../../administrator/manage-script/create-library.md:0
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:0
+#: ../../administrator/manage-script/create-library.md:0
 msgid "Docker"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:57
-#: ../../administrator_documentation/manage_script/create_library.md:89
-#: ../../administrator_documentation/manage_script/create_library.md:121
+#: ../../administrator/manage-script/create-library.md:57
+#: ../../administrator/manage-script/create-library.md:89
+#: ../../administrator/manage-script/create-library.md:121
 msgid "Returns"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:63
+#: ../../administrator/manage-script/create-library.md:63
 msgid "Create a new library with no name or privacy level"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:65
+#: ../../administrator/manage-script/create-library.md:65
 msgid "You can create a library using only a username. The script substitutes default values for the library name and privacy level."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:95
+#: ../../administrator/manage-script/create-library.md:95
 msgid "Library with the same name already exists"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md:97
+#: ../../administrator/manage-script/create-library.md:97
 msgid "If a library with the same name already exists for the given user, the script will **not** create a new library."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/manage-script/database.pot b/docs/locales/gettext/administrator/manage-script/database.pot
index c9add26d1..8089b35f4 100644
--- a/docs/locales/gettext/administrator/manage-script/database.pot
+++ b/docs/locales/gettext/administrator/manage-script/database.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,30 +16,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/manage_script/database.md:1
+#: ../../administrator/manage-script/database.md:1
 msgid "Delete obsolete files from the database"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/database.md:3
+#: ../../administrator/manage-script/database.md:3
 msgid "Funkwhale keeps references to files imported using the in-place method. If you move or remove these, it invalidates the reference and Funkwhale can't serve the files."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/database.md:5
+#: ../../administrator/manage-script/database.md:5
 msgid "Use the `check_inplace_files` command to check the database for invalid references. This command loops through all in-place imports and checks if the file is accessible. If the file isn't accessible, the command deletes the database object."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/database.md:8
-msgid "Running `check_inplace_files` with the `--no-dry-run` flag is irreversible. Make sure you [back up your data](../upgrade_docs/backup.md)."
+#: ../../administrator/manage-script/database.md:8
+msgid "Running `check_inplace_files` with the `--no-dry-run` flag is irreversible. Make sure you [back up your data](../upgrade/backup.md)."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/database.md:11
+#: ../../administrator/manage-script/database.md:11
 msgid "To ensure you don't remove data by accident, this command runs in dry run mode by default. In dry run mode, the command lists the items it will delete. Run the command with the `--no-dry-run` flag to perform the pruning action."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/database.md:0
+#: ../../administrator/manage-script/database.md:0
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/database.md:0
+#: ../../administrator/manage-script/database.md:0
 msgid "Docker"
 msgstr ""
diff --git a/docs/locales/gettext/administrator/manage-script/fix-uploads.pot b/docs/locales/gettext/administrator/manage-script/fix-uploads.pot
index d31adcedb..df468126c 100644
--- a/docs/locales/gettext/administrator/manage-script/fix-uploads.pot
+++ b/docs/locales/gettext/administrator/manage-script/fix-uploads.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,62 +16,62 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/manage_script/fix_uploads.md:1
+#: ../../administrator/manage-script/fix-uploads.md:1
 msgid "Fix uploads"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/fix_uploads.md:3
+#: ../../administrator/manage-script/fix-uploads.md:3
 msgid "Use the `fix_uploads` command to let Funkwhale sort out common issues with your audio files."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/fix_uploads.md:5
+#: ../../administrator/manage-script/fix-uploads.md:5
 msgid "Commands"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/fix_uploads.md:7
+#: ../../administrator/manage-script/fix-uploads.md:7
 msgid "Fix mimetypes"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/fix_uploads.md:9
+#: ../../administrator/manage-script/fix-uploads.md:9
 msgid "Check and fix file mimetypes with the `--mimetype` flag. This helps prevent issues with serving music files."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/fix_uploads.md:0
+#: ../../administrator/manage-script/fix-uploads.md:0
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/fix_uploads.md:0
+#: ../../administrator/manage-script/fix-uploads.md:0
 msgid "Docker"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/fix_uploads.md:32
+#: ../../administrator/manage-script/fix-uploads.md:32
 msgid "Fix bitrate and duration"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/fix_uploads.md:34
+#: ../../administrator/manage-script/fix-uploads.md:34
 msgid "Check and fix bitrate and duration with the `--audio-data` flag. This process can take a long time as it needs to access all files."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/fix_uploads.md:57
+#: ../../administrator/manage-script/fix-uploads.md:57
 msgid "Fix file size"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/fix_uploads.md:59
+#: ../../administrator/manage-script/fix-uploads.md:59
 msgid "Check and fix the file size with the `--size` flag."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/fix_uploads.md:82
+#: ../../administrator/manage-script/fix-uploads.md:82
 msgid "Fix file checksums"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/fix_uploads.md:84
+#: ../../administrator/manage-script/fix-uploads.md:84
 msgid "Check and fix file checksums with the `--checksum` flag."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/fix_uploads.md:107
+#: ../../administrator/manage-script/fix-uploads.md:107
 msgid "Change command batch size"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/fix_uploads.md:109
+#: ../../administrator/manage-script/fix-uploads.md:109
 msgid "Choose the batch size you want to process with the `--batch-size` or -`s` flag. Smaller batches process faster. Defaults to `1000`."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/manage-script/index.pot b/docs/locales/gettext/administrator/manage-script/index.pot
index 1d9c32b9d..8208685f4 100644
--- a/docs/locales/gettext/administrator/manage-script/index.pot
+++ b/docs/locales/gettext/administrator/manage-script/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,30 +16,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/manage_script/index.md:5
+#: ../../administrator/manage-script/index.md:5
 msgid "Manage users"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/index.md:5
+#: ../../administrator/manage-script/index.md:5
 msgid "Prune library"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/index.md:5
+#: ../../administrator/manage-script/index.md:5
 msgid "Clean database"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/index.md:5
+#: ../../administrator/manage-script/index.md:5
 msgid "Add album and artist tags"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/index.md:5
+#: ../../administrator/manage-script/index.md:5
 msgid "Administration tasks"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/index.md:1
+#: ../../administrator/manage-script/index.md:1
 msgid "Funkwhale management command line interface"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/index.md:3
+#: ../../administrator/manage-script/index.md:3
 msgid "Funkwhale includes a `funkwhale-manage` command line interface that can help you automate a lot of admin tasks. Check out the guides in this section for instructions on how to use this tool."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/manage-script/library.pot b/docs/locales/gettext/administrator/manage-script/library.pot
index 16f4bd3cd..f6eed8b91 100644
--- a/docs/locales/gettext/administrator/manage-script/library.pot
+++ b/docs/locales/gettext/administrator/manage-script/library.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,70 +16,70 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/manage_script/library.md:1
+#: ../../administrator/manage-script/library.md:1
 msgid "Prune your Funkwhale library"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:3
+#: ../../administrator/manage-script/library.md:3
 msgid "Funkwhale doesn't delete data objects from the database when you delete a file. This is because they might exist in users' playlists, favorites, and listening history. These objects might also be present in another user's private libraries."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:5
+#: ../../administrator/manage-script/library.md:5
 msgid "Sometimes you may want to clear out dangling metadata. For example, if you import a lot of files with incorrect tags and then delete them."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:7
+#: ../../administrator/manage-script/library.md:7
 msgid "To help with this, the `funkwhale-manage` command line interface includes commands to prune dangling metadata from your database. All prune commands are available under the `funkwhale-manage prune_library` namespace. To ensure you don't remove data by accident, all commands run in dry run mode by default. Run commands with the `--no-dry-run` flag to perform the pruning action."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:10
-msgid "Running `prune_library` commands with the `--no-dry-run` flag is irreversible. Make sure you [back up your data](../upgrade_docs/backup.md)."
+#: ../../administrator/manage-script/library.md:10
+msgid "Running `prune_library` commands with the `--no-dry-run` flag is irreversible. Make sure you [back up your data](../upgrade/backup.md)."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:13
+#: ../../administrator/manage-script/library.md:13
 msgid "Commands"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:15
+#: ../../administrator/manage-script/library.md:15
 msgid "Prune tracks with no associated uploads"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:0
+#: ../../administrator/manage-script/library.md:0
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:0
+#: ../../administrator/manage-script/library.md:0
 msgid "Docker"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:38
+#: ../../administrator/manage-script/library.md:38
 msgid "Prune albums with no associated tracks"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:61
+#: ../../administrator/manage-script/library.md:61
 msgid "Prune artists with no associated tracks or albums"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:84
+#: ../../administrator/manage-script/library.md:84
 msgid "Prune all tracks, albums, and artist without associated data"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:107
+#: ../../administrator/manage-script/library.md:107
 msgid "There are extra options for pruning your database. Check the command help for more options."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:131
+#: ../../administrator/manage-script/library.md:131
 msgid "The command excludes tracks that are in users' favorites, playlists, and listen history. To include these tracks, add the corresponding `ignore` flag:"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:133
+#: ../../administrator/manage-script/library.md:133
 msgid "`--ignore-favorites`"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:134
+#: ../../administrator/manage-script/library.md:134
 msgid "`--ignore-playlists`"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:135
+#: ../../administrator/manage-script/library.md:135
 msgid "`--ignore-listenings`"
 msgstr ""
diff --git a/docs/locales/gettext/administrator/manage-script/tags.pot b/docs/locales/gettext/administrator/manage-script/tags.pot
index 0fe8d65f0..a570c91cc 100644
--- a/docs/locales/gettext/administrator/manage-script/tags.pot
+++ b/docs/locales/gettext/administrator/manage-script/tags.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,74 +16,74 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/manage_script/tags.md:1
+#: ../../administrator/manage-script/tags.md:1
 msgid "Add artist and album tags from track metadata"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/tags.md:3
+#: ../../administrator/manage-script/tags.md:3
 msgid "Funkwhale extracts track tags from the file's metadata. Funkwhale applies these tags to the track's album and artist by running a check every few days. You can run the process at any time using the `funkwhale-manage` command line interface."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/tags.md:5
+#: ../../administrator/manage-script/tags.md:5
 msgid "The command performs the following actions:"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/tags.md:7
+#: ../../administrator/manage-script/tags.md:7
 msgid "Finds all local artists or albums with no tags."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/tags.md:8
+#: ../../administrator/manage-script/tags.md:8
 msgid "Gets all the tags associated with the album/artist's tracks."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/tags.md:9
+#: ../../administrator/manage-script/tags.md:9
 msgid "Applies the track's tags to the album/artist."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/tags.md:11
+#: ../../administrator/manage-script/tags.md:11
 msgid "Add tags to albums"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/tags.md:13
+#: ../../administrator/manage-script/tags.md:13
 msgid "To add tags to untagged albums:"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/tags.md:0
+#: ../../administrator/manage-script/tags.md:0
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/tags.md:21
-#: ../../administrator_documentation/manage_script/tags.md:39
-#: ../../administrator_documentation/manage_script/tags.md:64
-#: ../../administrator_documentation/manage_script/tags.md:82
+#: ../../administrator/manage-script/tags.md:21
+#: ../../administrator/manage-script/tags.md:39
+#: ../../administrator/manage-script/tags.md:64
+#: ../../administrator/manage-script/tags.md:82
 msgid "SSH into your Funkwhale server."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/tags.md:22
-#: ../../administrator_documentation/manage_script/tags.md:40
-#: ../../administrator_documentation/manage_script/tags.md:65
-#: ../../administrator_documentation/manage_script/tags.md:83
+#: ../../administrator/manage-script/tags.md:22
+#: ../../administrator/manage-script/tags.md:40
+#: ../../administrator/manage-script/tags.md:65
+#: ../../administrator/manage-script/tags.md:83
 msgid "Navigate to the Funkwhale directory."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/tags.md:28
-#: ../../administrator_documentation/manage_script/tags.md:46
+#: ../../administrator/manage-script/tags.md:28
+#: ../../administrator/manage-script/tags.md:46
 msgid "Run the `funkwhale-manage` command line interface to generate tags for untagged albums."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/tags.md:0
+#: ../../administrator/manage-script/tags.md:0
 msgid "Docker"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/tags.md:54
+#: ../../administrator/manage-script/tags.md:54
 msgid "Add tags to artists"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/tags.md:56
+#: ../../administrator/manage-script/tags.md:56
 msgid "To add tags to untagged artists:"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/tags.md:71
-#: ../../administrator_documentation/manage_script/tags.md:89
+#: ../../administrator/manage-script/tags.md:71
+#: ../../administrator/manage-script/tags.md:89
 msgid "Run the `funkwhale-manage` command line interface to generate tags for untagged artists."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/manage-script/thumbnails.pot b/docs/locales/gettext/administrator/manage-script/thumbnails.pot
index a29e3f19d..f9d818b54 100644
--- a/docs/locales/gettext/administrator/manage-script/thumbnails.pot
+++ b/docs/locales/gettext/administrator/manage-script/thumbnails.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,50 +16,50 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/manage_script/thumbnails.md:1
+#: ../../administrator/manage-script/thumbnails.md:1
 msgid "Regenerate thumbnails"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/thumbnails.md:3
+#: ../../administrator/manage-script/thumbnails.md:3
 msgid "We increased the quality of thumbnails from 70px to 95px in Funkwhale 1.0. This action removes visual artifacts that affect lower quality thumbnails. You can run the `funkwhale-manage` command line interface to generate new thumbnails. If you want to keep thumbnails at their original quality, add `THUMBNAIL_JPEG_RESIZE_QUALITY=70` to your `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/thumbnails.md:6
+#: ../../administrator/manage-script/thumbnails.md:6
 msgid "If you're using S3 storage, the `__sized__` folder is located in your S3 bucket."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/thumbnails.md:9
+#: ../../administrator/manage-script/thumbnails.md:9
 msgid "To generate new thumbnails:"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/thumbnails.md:0
+#: ../../administrator/manage-script/thumbnails.md:0
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/thumbnails.md:17
-#: ../../administrator_documentation/manage_script/thumbnails.md:41
+#: ../../administrator/manage-script/thumbnails.md:17
+#: ../../administrator/manage-script/thumbnails.md:41
 msgid "SSH into your Funkwhale server."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/thumbnails.md:18
-#: ../../administrator_documentation/manage_script/thumbnails.md:42
+#: ../../administrator/manage-script/thumbnails.md:18
+#: ../../administrator/manage-script/thumbnails.md:42
 msgid "Navigate to your Funkwhale directory."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/thumbnails.md:24
-#: ../../administrator_documentation/manage_script/thumbnails.md:48
+#: ../../administrator/manage-script/thumbnails.md:24
+#: ../../administrator/manage-script/thumbnails.md:48
 msgid "Delete the `__sized__` directory inside your `MEDIA_ROOT` directory. By default this is `/srv/funkwhale/data/media`. This directory contains the current thumbnails."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/thumbnails.md:30
-#: ../../administrator_documentation/manage_script/thumbnails.md:54
+#: ../../administrator/manage-script/thumbnails.md:30
+#: ../../administrator/manage-script/thumbnails.md:54
 msgid "Run the `funkwhale-manage` command line interface to regenerate the thumbnails."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/thumbnails.md:0
+#: ../../administrator/manage-script/thumbnails.md:0
 msgid "Docker"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/thumbnails.md:62
+#: ../../administrator/manage-script/thumbnails.md:62
 msgid "The script generates new thumbnails for all album and artist art on your pod."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/manage-script/users.pot b/docs/locales/gettext/administrator/manage-script/users.pot
index 237dc10c7..5257df65c 100644
--- a/docs/locales/gettext/administrator/manage-script/users.pot
+++ b/docs/locales/gettext/administrator/manage-script/users.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,106 +16,106 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/manage_script/users.md:1
+#: ../../administrator/manage-script/users.md:1
 msgid "Manage users"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:3
+#: ../../administrator/manage-script/users.md:3
 msgid "The `funkwhale-manage` command line interface includes commands for user management. Use these commands to automate managing users from the command line."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:5
+#: ../../administrator/manage-script/users.md:5
 msgid "All users-related commands are available under the `funkwhale-manage fw users` namespace."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:7
+#: ../../administrator/manage-script/users.md:7
 msgid "Create users"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:9
+#: ../../administrator/manage-script/users.md:9
 msgid "You can create users with the `funkwhale-manage` command line interface. There are different ways to create users depending on what approach you want to take."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:11
+#: ../../administrator/manage-script/users.md:11
 msgid "Create a user interactively"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:0
+#: ../../administrator/manage-script/users.md:0
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:0
+#: ../../administrator/manage-script/users.md:0
 msgid "Docker"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:34
+#: ../../administrator/manage-script/users.md:34
 msgid "Create a user with a random password"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:57
+#: ../../administrator/manage-script/users.md:57
 msgid "Create a user with a password set from an environment variable"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:82
+#: ../../administrator/manage-script/users.md:82
 msgid "There are extra options for user configuration, such as quota and {term}`permissions`. Check the command help for more options."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:105
+#: ../../administrator/manage-script/users.md:105
 msgid "Update users"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:107
+#: ../../administrator/manage-script/users.md:107
 msgid "You can update user accounts using the `funkwhale-manage` command line interface. Update commands are available under the `funkwhale-manage fw users set` namespace."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:109
+#: ../../administrator/manage-script/users.md:109
 msgid "Set upload quota for a user"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:132
+#: ../../administrator/manage-script/users.md:132
 msgid "Make users staff members"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:155
+#: ../../administrator/manage-script/users.md:155
 msgid "Remove a user's staff privileges"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:178
+#: ../../administrator/manage-script/users.md:178
 msgid "Give a user moderation permissions"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:201
+#: ../../administrator/manage-script/users.md:201
 msgid "Reset a user's password"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:224
+#: ../../administrator/manage-script/users.md:224
 msgid "Reset a user's password using an environment variable"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:249
+#: ../../administrator/manage-script/users.md:249
 msgid "There are extra options for updating users. Check the command help for more options."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:272
+#: ../../administrator/manage-script/users.md:272
 msgid "Delete users"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:274
+#: ../../administrator/manage-script/users.md:274
 msgid "Delete a user's account but leave a reference to them in the database"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:276
+#: ../../administrator/manage-script/users.md:276
 msgid "This prevents the same username being used in future."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:299
+#: ../../administrator/manage-script/users.md:299
 msgid "Delete a user's account, including all references in the database"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:301
+#: ../../administrator/manage-script/users.md:301
 msgid "This means the username can be reused."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/users.md:324
+#: ../../administrator/manage-script/users.md:324
 msgid "There are extra options for deleting users. Check the command help for more options."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/migration.pot b/docs/locales/gettext/administrator/migration.pot
index 7364cddb7..2c77bba41 100644
--- a/docs/locales/gettext/administrator/migration.pot
+++ b/docs/locales/gettext/administrator/migration.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,130 +16,130 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/migration_guide/index.md:1
+#: ../../administrator/migration.md:1
 msgid "Docker migration guide"
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:3
+#: ../../administrator/migration.md:3
 msgid "Funkwhale used to offer two Docker-based installation methods. The multi-container method separates each services into its own container. The mono-container method kept all services into a single container."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:5
+#: ../../administrator/migration.md:5
 msgid "The project deprecated the mono-container method as of Funkwhale 1.3.0. We decided not to continue supporting it for the following reasons:"
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:7
+#: ../../administrator/migration.md:7
 msgid "It required a lot of maintenance when upgrading dependencies."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:8
+#: ../../administrator/migration.md:8
 msgid "It offers no advantages over the multi-container method. Not separating the processes defeats the point of containerization."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:10
+#: ../../administrator/migration.md:10
 msgid "Follow this guide to migrate a mono-container installation to a multi-container setup."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:12
+#: ../../administrator/migration.md:12
 msgid "Back up your Funkwhale directory"
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:14
+#: ../../administrator/migration.md:14
 msgid "Before you begin, log in as your `funkwhale` user"
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:20
+#: ../../administrator/migration.md:20
 msgid "Create a full backup of your `/srv/funkwhale` directory."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:27
+#: ../../administrator/migration.md:27
 msgid "Go to the original `/srv/funkwhale` folder to run the migration."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:33
+#: ../../administrator/migration.md:33
 msgid "Dump your Funkwhale database"
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:35
+#: ../../administrator/migration.md:35
 msgid "Create a backup of your Funkwhale database. We will import this into the new postgres container later."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:41
+#: ../../administrator/migration.md:41
 msgid "Stop your Funkwhale instance"
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:43
+#: ../../administrator/migration.md:43
 msgid "Stop all Funkwhale services. This ensures that no data is changed while you migrate your instance."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:49
+#: ../../administrator/migration.md:49
 msgid "Prepare the multi-container setup"
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:51
+#: ../../administrator/migration.md:51
 msgid "Export the Funkwhale version you want to install."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:57
+#: ../../administrator/migration.md:57
 msgid "Take a backup of your current `docker-compose.yml` file."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:63
+#: ../../administrator/migration.md:63
 msgid "Download the required template files."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:71
+#: ../../administrator/migration.md:71
 msgid "Update your instance env file"
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:73
+#: ../../administrator/migration.md:73
 msgid "Take a backup of your current `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:79
+#: ../../administrator/migration.md:79
 msgid "Download the `.env` file template."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:85
+#: ../../administrator/migration.md:85
 msgid "Change the permissions on your `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:91
+#: ../../administrator/migration.md:91
 msgid "Replace the version number in your new `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:97
+#: ../../administrator/migration.md:97
 msgid "Copy the settings from your old `.env` file to your new `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:103
+#: ../../administrator/migration.md:103
 msgid "Update the database URL in your new `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:109
+#: ../../administrator/migration.md:109
 msgid "Check the file and remove any duplicated settings after copying."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:111
+#: ../../administrator/migration.md:111
 msgid "Migrate your database"
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:113
+#: ../../administrator/migration.md:113
 msgid "Start up your new database container."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:119
+#: ../../administrator/migration.md:119
 msgid "Import your database dump into the new container."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:125
+#: ../../administrator/migration.md:125
 msgid "Run the database migrations."
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:131
+#: ../../administrator/migration.md:131
 msgid "Start your Funkwhale instance"
 msgstr ""
 
-#: ../../administrator_documentation/migration_guide/index.md:133
+#: ../../administrator/migration.md:133
 msgid "Once you have imported your database and run migrations, you can start all containers."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/troubleshooting/backend.pot b/docs/locales/gettext/administrator/troubleshooting/backend.pot
index cbcb322c0..2758832be 100644
--- a/docs/locales/gettext/administrator/troubleshooting/backend.pot
+++ b/docs/locales/gettext/administrator/troubleshooting/backend.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,195 +16,195 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/troubleshooting/backend.md:1
+#: ../../administrator/troubleshooting/backend.md:1
 msgid "Troubleshoot backend issues"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:3
+#: ../../administrator/troubleshooting/backend.md:3
 msgid "The Funkwhale backend is made up of lots of moving parts. This guide shows you how to troubleshoot and gather information about the most important elements of the backend."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:5
+#: ../../administrator/troubleshooting/backend.md:5
 msgid "Tools"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:7
+#: ../../administrator/troubleshooting/backend.md:7
 msgid "If you have access to the Funkwhale backend, you can use logs to get more information about an issue."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:9
+#: ../../administrator/troubleshooting/backend.md:9
 msgid "**Reverse proxy logs** – check these logs if you have connectivity issues."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:0
+#: ../../administrator/troubleshooting/backend.md:0
 msgid "Nginx"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:0
+#: ../../administrator/troubleshooting/backend.md:0
 msgid "Apache2"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:33
+#: ../../administrator/troubleshooting/backend.md:33
 msgid "**API logs** – check these if you are having issues with the Funkwhale app, federation, or imports."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:0
+#: ../../administrator/troubleshooting/backend.md:0
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:0
+#: ../../administrator/troubleshooting/backend.md:0
 msgid "Docker"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:56
+#: ../../administrator/troubleshooting/backend.md:56
 msgid "**Celery logs** – check these if a federation or import task isn't working."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:79
+#: ../../administrator/troubleshooting/backend.md:79
 msgid "Troubleshoot issues"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:81
+#: ../../administrator/troubleshooting/backend.md:81
 msgid "API issues"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:83
+#: ../../administrator/troubleshooting/backend.md:83
 msgid "If the API isn't serving audio files, try the following:"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:85
+#: ../../administrator/troubleshooting/backend.md:85
 msgid "If you’re using Docker, check you have commented out the `MEDIA_ROOT` variable in your `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:86
+#: ../../administrator/troubleshooting/backend.md:86
 msgid "Check the `_protected/media` block in your webserver points to your media path. This is `/srv/funkwhale/data/media` by default."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:87
+#: ../../administrator/troubleshooting/backend.md:87
 msgid "If you’re using the in-place import, check you have configured your media paths. Check the `MUSIC_DIRECTORY_PATH`, `MUSIC_DIRECTORY_SERVE_PATH` and `REVERSE_PROXY_TYPE` variables in your `.env` file. Make sure the webserver can read these directories."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:89
+#: ../../administrator/troubleshooting/backend.md:89
 msgid "Import issues"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:91
+#: ../../administrator/troubleshooting/backend.md:91
 msgid "If you're having issues importing files, try the following:"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:93
+#: ../../administrator/troubleshooting/backend.md:93
 msgid "Check that the file is encoded in a supported format"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:0
+#: ../../administrator/troubleshooting/backend.md:0
 msgid "Supported formats"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:97
+#: ../../administrator/troubleshooting/backend.md:97
 msgid "flac"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:98
+#: ../../administrator/troubleshooting/backend.md:98
 msgid "ogg"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:99
+#: ../../administrator/troubleshooting/backend.md:99
 msgid "mp3"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:100
+#: ../../administrator/troubleshooting/backend.md:100
 msgid "opus"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:101
+#: ../../administrator/troubleshooting/backend.md:101
 msgid "aac"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:102
+#: ../../administrator/troubleshooting/backend.md:102
 msgid "m4a"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:103
+#: ../../administrator/troubleshooting/backend.md:103
 msgid "aiff"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:104
+#: ../../administrator/troubleshooting/backend.md:104
 msgid "aif"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:108
+#: ../../administrator/troubleshooting/backend.md:108
 msgid "Make sure your files play in another media player."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:109
-msgid "Make sure your files are [tagged correctly](../../user_documentation/libraries/tag_music.md)."
+#: ../../administrator/troubleshooting/backend.md:109
+msgid "Make sure your files are [tagged correctly](../../user/libraries/content/tag.md)."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:110
+#: ../../administrator/troubleshooting/backend.md:110
 msgid "Check the Celery logs for errors during the import."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:112
+#: ../../administrator/troubleshooting/backend.md:112
 msgid "Federation issues"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:114
+#: ../../administrator/troubleshooting/backend.md:114
 msgid "If you are having issues accessing federated content, try the following:"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:116
+#: ../../administrator/troubleshooting/backend.md:116
 msgid "Check that the remote library received your follow request and approved it."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:117
+#: ../../administrator/troubleshooting/backend.md:117
 msgid "Trigger a library scan in the Funkwhale frontend."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:118
+#: ../../administrator/troubleshooting/backend.md:118
 msgid "Check the Celery logs for errors during the scan."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:120
+#: ../../administrator/troubleshooting/backend.md:120
 msgid "Memory tracing"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:122
+#: ../../administrator/troubleshooting/backend.md:122
 msgid "If your Funkwhale server uses more memory than expected, you can check the footprint of requests. This requires a middleware to check memory allocation. To set up this middleware:"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:124
+#: ../../administrator/troubleshooting/backend.md:124
 msgid "Add the middleware to your `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:130
+#: ../../administrator/troubleshooting/backend.md:130
 msgid "Enable memory tracing in your `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:136
-#: ../../administrator_documentation/troubleshooting/backend.md:175
+#: ../../administrator/troubleshooting/backend.md:136
+#: ../../administrator/troubleshooting/backend.md:175
 msgid "Restart your Funkwhale server."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:159
+#: ../../administrator/troubleshooting/backend.md:159
 msgid "The middleware prints out the top 25 memory allocations to the API logs. You can use these to see what requests use the most memory."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:161
+#: ../../administrator/troubleshooting/backend.md:161
 msgid "To disable memory tracing:"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:163
+#: ../../administrator/troubleshooting/backend.md:163
 msgid "Remove the middleware from your `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:169
+#: ../../administrator/troubleshooting/backend.md:169
 msgid "Disable memory tracing in your `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:198
+#: ../../administrator/troubleshooting/backend.md:198
 msgid "Get help"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md:200
-msgid "If you can't solve the issue yourself, ask the community for help. Check out the [get help](get_help.md) guide for information about where to ask your question and what details to provide."
+#: ../../administrator/troubleshooting/backend.md:200
+msgid "If you can't solve the issue yourself, ask the community for help. Check out the [get help](help.md) guide for information about where to ask your question and what details to provide."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/troubleshooting/frontend.pot b/docs/locales/gettext/administrator/troubleshooting/frontend.pot
index 1e397ef6e..4c1ac2fd0 100644
--- a/docs/locales/gettext/administrator/troubleshooting/frontend.pot
+++ b/docs/locales/gettext/administrator/troubleshooting/frontend.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,136 +16,136 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:1
+#: ../../administrator/troubleshooting/frontend.md:1
 msgid "Troubleshoot frontend issues"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:3
+#: ../../administrator/troubleshooting/frontend.md:3
 msgid "The Funkwhale frontend is a {abbr}`SPA (Single Page Application)` written in [Vue.js](https://vuejs.org). It consumes the Funkwhale API to serve content and to federate with other Fediverse software."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:5
+#: ../../administrator/troubleshooting/frontend.md:5
 msgid "Tools"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:7
+#: ../../administrator/troubleshooting/frontend.md:7
 msgid "The most useful tools for troubleshooting issues with the Funkwhale frontend are your web browser's developer tools. The `Console` and `Network` tabs are particularly useful for tracking down issues in the Javascript code and API responses respectively. Use the following shortcut to open the developer tools for your browser:"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:13
+#: ../../administrator/troubleshooting/frontend.md:13
 msgid "Browser"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:14
+#: ../../administrator/troubleshooting/frontend.md:14
 msgid "Shortcut"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:15
+#: ../../administrator/troubleshooting/frontend.md:15
 msgid "Google Chrome/Chromium"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:16
-#: ../../administrator_documentation/troubleshooting/frontend.md:18
-#: ../../administrator_documentation/troubleshooting/frontend.md:20
-#: ../../administrator_documentation/troubleshooting/frontend.md:22
-#: ../../administrator_documentation/troubleshooting/frontend.md:24
+#: ../../administrator/troubleshooting/frontend.md:16
+#: ../../administrator/troubleshooting/frontend.md:18
+#: ../../administrator/troubleshooting/frontend.md:20
+#: ../../administrator/troubleshooting/frontend.md:22
+#: ../../administrator/troubleshooting/frontend.md:24
 msgid "{kbd}`F12`"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:17
+#: ../../administrator/troubleshooting/frontend.md:17
 msgid "Microsoft Edge"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:19
+#: ../../administrator/troubleshooting/frontend.md:19
 msgid "Opera"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:21
+#: ../../administrator/troubleshooting/frontend.md:21
 msgid "Vivaldi"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:23
+#: ../../administrator/troubleshooting/frontend.md:23
 msgid "Firefox"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:25
+#: ../../administrator/troubleshooting/frontend.md:25
 msgid "Safari"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:26
+#: ../../administrator/troubleshooting/frontend.md:26
 msgid "{kbd}`Command+Option+U`"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:29
+#: ../../administrator/troubleshooting/frontend.md:29
 msgid "Troubleshoot the issue"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:31
+#: ../../administrator/troubleshooting/frontend.md:31
 msgid "Crashes or performance issues"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:33
+#: ../../administrator/troubleshooting/frontend.md:33
 msgid "To start troubleshooting your issue, try the following:"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:35
-#: ../../administrator_documentation/troubleshooting/frontend.md:51
+#: ../../administrator/troubleshooting/frontend.md:35
+#: ../../administrator/troubleshooting/frontend.md:51
 msgid "Open your browser's developer tools."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:36
+#: ../../administrator/troubleshooting/frontend.md:36
 msgid "Select the `Console` tab."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:37
-#: ../../administrator_documentation/troubleshooting/frontend.md:53
+#: ../../administrator/troubleshooting/frontend.md:37
+#: ../../administrator/troubleshooting/frontend.md:53
 msgid "Open Funkwhale and try to replicate the issue."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:38
+#: ../../administrator/troubleshooting/frontend.md:38
 msgid "Take note of any errors or warnings that appear in the `Console` tab."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:40
+#: ../../administrator/troubleshooting/frontend.md:40
 msgid "If applicable, try these steps while logged in and again while logged out to see if there is any difference."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:42
+#: ../../administrator/troubleshooting/frontend.md:42
 msgid "Content not appearing"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:44
+#: ../../administrator/troubleshooting/frontend.md:44
 msgid "If content isn't appearing, it is usually due to one of the following reasons:"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:46
+#: ../../administrator/troubleshooting/frontend.md:46
 msgid "A conditional statement in the frontend code isn't working."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:47
+#: ../../administrator/troubleshooting/frontend.md:47
 msgid "The API is not serving content."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:49
+#: ../../administrator/troubleshooting/frontend.md:49
 msgid "You can confirm which of these is causing the issue by checking the `Network` tab in your browser's developer tools."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:52
+#: ../../administrator/troubleshooting/frontend.md:52
 msgid "Select the `Network` tab."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:54
+#: ../../administrator/troubleshooting/frontend.md:54
 msgid "Take not of any `4XX` or `5XX` responses in the API calls."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:56
+#: ../../administrator/troubleshooting/frontend.md:56
 msgid "If you are receiving `4XX` or `5XX` responses, this means the API isn't serving your content properly. You can investigate further by following the [backend troubleshooting guide](backend.md)."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:58
+#: ../../administrator/troubleshooting/frontend.md:58
 msgid "Get help"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/frontend.md:60
-msgid "If you can't solve the issue yourself, ask the community for help. Check out the [get help](get_help.md) guide for information about where to ask your question and what details to provide."
+#: ../../administrator/troubleshooting/frontend.md:60
+msgid "If you can't solve the issue yourself, ask the community for help. Check out the [get help](help.md) guide for information about where to ask your question and what details to provide."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/troubleshooting/help.pot b/docs/locales/gettext/administrator/troubleshooting/help.pot
index 9a1325a53..e97a48410 100644
--- a/docs/locales/gettext/administrator/troubleshooting/help.pot
+++ b/docs/locales/gettext/administrator/troubleshooting/help.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,58 +16,58 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/troubleshooting/get_help.md:1
+#: ../../administrator/troubleshooting/help.md:1
 msgid "Get help with Funkwhale"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/get_help.md:3
+#: ../../administrator/troubleshooting/help.md:3
 msgid "The Funkwhale community is always happy to help! Choose the best place to contact us based on the type of problem you're having."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/get_help.md:5
+#: ../../administrator/troubleshooting/help.md:5
 msgid "The [Funkwhale support chatroom](https://matrix.to/#/#funkwhale-support:tchncs.de) is the best place to ask quick questions and get immediate feedback."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/get_help.md:6
+#: ../../administrator/troubleshooting/help.md:6
 msgid "The [Funkwhale forum](https://forum.funkwhale.audio/t/support) is the best place to investigate trickier problems that require a lot of investigation."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/get_help.md:7
+#: ../../administrator/troubleshooting/help.md:7
 msgid "The [Funkwhale GitLab](https://dev.funkwhale.audio) is the best place to raise bugs in the project code."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/get_help.md:10
+#: ../../administrator/troubleshooting/help.md:10
 msgid "Please go to the forum or chatroom before opening an issue in GitLab. The Funkwhale community will help you work out what the issue is and whether a fix needs to be applied."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/get_help.md:13
+#: ../../administrator/troubleshooting/help.md:13
 msgid "Before you raise an issue, please check out the [other guides in this section](index.md) to see if you can resolve the issue. If you still need help, please provide as much detail as possible. This includes things like:"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/get_help.md:15
+#: ../../administrator/troubleshooting/help.md:15
 msgid "Screenshots or recordings of the issue."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/get_help.md:16
+#: ../../administrator/troubleshooting/help.md:16
 msgid "Logs or error messages you found during your investigation."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/get_help.md:17
+#: ../../administrator/troubleshooting/help.md:17
 msgid "Details about your installation:"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/get_help.md:18
+#: ../../administrator/troubleshooting/help.md:18
 msgid "Operating system"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/get_help.md:19
+#: ../../administrator/troubleshooting/help.md:19
 msgid "Web server"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/get_help.md:20
+#: ../../administrator/troubleshooting/help.md:20
 msgid "Installation method"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/get_help.md:21
+#: ../../administrator/troubleshooting/help.md:21
 msgid "Web browser"
 msgstr ""
diff --git a/docs/locales/gettext/administrator/troubleshooting/index.pot b/docs/locales/gettext/administrator/troubleshooting/index.pot
index 15212606a..2db70c051 100644
--- a/docs/locales/gettext/administrator/troubleshooting/index.pot
+++ b/docs/locales/gettext/administrator/troubleshooting/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,38 +16,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/troubleshooting/index.md:13
+#: ../../administrator/troubleshooting/index.md:13
 msgid "Troubleshoot"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/index.md:1
+#: ../../administrator/troubleshooting/index.md:1
 msgid "Troubleshoot Funkwhale"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/index.md:3
+#: ../../administrator/troubleshooting/index.md:3
 msgid "If you're running into issues with Funkwhale, follow the guides in this section. If you need to report an issue, make sure you include as much information as possible to help us get to the bottom of it."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/index.md:5
+#: ../../administrator/troubleshooting/index.md:5
 msgid "Issues usually fall into one of the following categories:"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/index.md:7
+#: ../../administrator/troubleshooting/index.md:7
 msgid "Frontend – issues relating to the Funkwhale web interface."
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/index.md:8
+#: ../../administrator/troubleshooting/index.md:8
 msgid "Backend – issues affecting one or more of the following:"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/index.md:9
+#: ../../administrator/troubleshooting/index.md:9
 msgid "API – tracks or data not being returned properly"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/index.md:10
+#: ../../administrator/troubleshooting/index.md:10
 msgid "Imports – tracks you have added aren't being imported correctly"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/index.md:11
+#: ../../administrator/troubleshooting/index.md:11
 msgid "Federation – your pod can't contact other fediverse servers or access federated content"
 msgstr ""
diff --git a/docs/locales/gettext/administrator/uninstall/debian.pot b/docs/locales/gettext/administrator/uninstall/debian.pot
index 6f3b71456..81af69b15 100644
--- a/docs/locales/gettext/administrator/uninstall/debian.pot
+++ b/docs/locales/gettext/administrator/uninstall/debian.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,124 +16,124 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:1
+#: ../../administrator/uninstall/debian.md:1
 msgid "Uninstall Debian installation"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:3
+#: ../../administrator/uninstall/debian.md:3
 msgid "To uninstall Funkwhale from your Debian server, follow the instructions in this guide."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:6
-msgid "Removing Funkwhale data is __irreversible__. Make sure you [back up your data](../upgrade_docs/backup.md)."
+#: ../../administrator/uninstall/debian.md:6
+msgid "Removing Funkwhale data is __irreversible__. Make sure you [back up your data](../upgrade/backup.md)."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:14
+#: ../../administrator/uninstall/debian.md:14
 msgid "Stop the Funkwhale server"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:16
+#: ../../administrator/uninstall/debian.md:16
 msgid "Before you uninstall anything from your server, you need to stop the Funkwhale systemd services."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:18
+#: ../../administrator/uninstall/debian.md:18
 msgid "Stop all systemd services listed under the `funkwhale` target"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:24
+#: ../../administrator/uninstall/debian.md:24
 msgid "Disable all systemd services to prevent launch at startup."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:32
+#: ../../administrator/uninstall/debian.md:32
 msgid "Remove the service files."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:41
+#: ../../administrator/uninstall/debian.md:41
 msgid "Reload all services to pick up the changes."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:48
+#: ../../administrator/uninstall/debian.md:48
 msgid "Remove the reverse proxy"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:50
+#: ../../administrator/uninstall/debian.md:50
 msgid "To stop serving Funkwhale from your web server, you need to remove your reverse proxy configuration."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:0
+#: ../../administrator/uninstall/debian.md:0
 msgid "Nginx"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:58
-#: ../../administrator_documentation/uninstall_docs/debian.md:77
+#: ../../administrator/uninstall/debian.md:58
+#: ../../administrator/uninstall/debian.md:77
 msgid "Remove the configuration files from your web host."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:66
-#: ../../administrator_documentation/uninstall_docs/debian.md:84
+#: ../../administrator/uninstall/debian.md:66
+#: ../../administrator/uninstall/debian.md:84
 msgid "Reload the web server."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:0
+#: ../../administrator/uninstall/debian.md:0
 msgid "Apache2"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:92
+#: ../../administrator/uninstall/debian.md:92
 msgid "Remove the Funkwhale database"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:95
-msgid "This action is __irreversible__. Make sure you have [backed up your data](../upgrade_docs/backup.md) before proceeding."
+#: ../../administrator/uninstall/debian.md:95
+msgid "This action is __irreversible__. Make sure you have [backed up your data](../upgrade/backup.md) before proceeding."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:98
+#: ../../administrator/uninstall/debian.md:98
 msgid "Once you have stopped the Funkwhale services, you can remove the Funkwhale database."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:100
+#: ../../administrator/uninstall/debian.md:100
 msgid "Navigate to your Funkwhale directory."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:106
+#: ../../administrator/uninstall/debian.md:106
 msgid "Delete the Funkwhale database."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:112
+#: ../../administrator/uninstall/debian.md:112
 msgid "Delete the Funkwhale user."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:118
+#: ../../administrator/uninstall/debian.md:118
 msgid "Delete the Funkwhale account"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:121
-msgid "This action deletes the `/srv/funkwhale/` directory. Make sure you have [backed up any data](../upgrade_docs/backup.md) you want to keep."
+#: ../../administrator/uninstall/debian.md:121
+msgid "This action deletes the `/srv/funkwhale/` directory. Make sure you have [backed up any data](../upgrade/backup.md) you want to keep."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:124
+#: ../../administrator/uninstall/debian.md:124
 msgid "Once you have removed the database, you can delete the `funkwhale` user and all associated data."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:130
+#: ../../administrator/uninstall/debian.md:130
 msgid "This deletes the `funkwhale` user and everything in their home directory (`/srv/funkwhale/`). If your content is hosted in an S3-compatible store, you need to delete this data separately."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:132
+#: ../../administrator/uninstall/debian.md:132
 msgid "Uninstall dependencies"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:134
+#: ../../administrator/uninstall/debian.md:134
 msgid "Funkwhale uses the following dependencies on your server:"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:0
+#: ../../administrator/uninstall/debian.md:0
 msgid "Apt"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:0
+#: ../../administrator/uninstall/debian.md:0
 msgid "Python"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:170
+#: ../../administrator/uninstall/debian.md:170
 msgid "Uninstall any dependencies you don't need."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/uninstall/docker.pot b/docs/locales/gettext/administrator/uninstall/docker.pot
index 324bb8421..20fe7ccfc 100644
--- a/docs/locales/gettext/administrator/uninstall/docker.pot
+++ b/docs/locales/gettext/administrator/uninstall/docker.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,80 +16,80 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:1
+#: ../../administrator/uninstall/docker.md:1
 msgid "Uninstall Docker installation"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:3
+#: ../../administrator/uninstall/docker.md:3
 msgid "To uninstall a Docker-based Funkwhale installation from your server, follow the instructions in this guide."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:6
-msgid "Removing Funkwhale data is __irreversible__. Make sure you [back up your data](../upgrade_docs/backup.md)."
+#: ../../administrator/uninstall/docker.md:6
+msgid "Removing Funkwhale data is __irreversible__. Make sure you [back up your data](../upgrade/backup.md)."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:14
+#: ../../administrator/uninstall/docker.md:14
 msgid "Stop the Docker containers"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:16
+#: ../../administrator/uninstall/docker.md:16
 msgid "Before you remove any data, you need to stop the Funkwhale containers."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:18
+#: ../../administrator/uninstall/docker.md:18
 msgid "Navigate to your Funkwhale directory."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:24
+#: ../../administrator/uninstall/docker.md:24
 msgid "Stop the containers"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:30
+#: ../../administrator/uninstall/docker.md:30
 msgid "Remove the reverse proxy"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:32
+#: ../../administrator/uninstall/docker.md:32
 msgid "To stop serving Funkwhale from your web server, you need to remove your reverse proxy configuration."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:0
+#: ../../administrator/uninstall/docker.md:0
 msgid "Nginx"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:40
-#: ../../administrator_documentation/uninstall_docs/docker.md:59
+#: ../../administrator/uninstall/docker.md:40
+#: ../../administrator/uninstall/docker.md:59
 msgid "Remove the configuration files from your web host."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:48
-#: ../../administrator_documentation/uninstall_docs/docker.md:66
+#: ../../administrator/uninstall/docker.md:48
+#: ../../administrator/uninstall/docker.md:66
 msgid "Reload the web server."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:0
+#: ../../administrator/uninstall/docker.md:0
 msgid "Apache2"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:74
+#: ../../administrator/uninstall/docker.md:74
 msgid "Remove the containers and their volumes"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:77
-msgid "This action is __irreversible__. Make sure you have [backed up your data](../upgrade_docs/backup.md) before proceeding."
+#: ../../administrator/uninstall/docker.md:77
+msgid "This action is __irreversible__. Make sure you have [backed up your data](../upgrade/backup.md) before proceeding."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:80
+#: ../../administrator/uninstall/docker.md:80
 msgid "Once you have stopped the containers, you can delete all containers and associated volumes."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:86
+#: ../../administrator/uninstall/docker.md:86
 msgid "Remove the Funkwhale directory"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:88
+#: ../../administrator/uninstall/docker.md:88
 msgid "Once you have removed the containers and volumes, you can delete the Funkwhale directory."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/docker.md:94
+#: ../../administrator/uninstall/docker.md:94
 msgid "This deletes everything in the (`/srv/funkwhale/`) directory. If your content is hosted in an S3-compatible store, you need to delete this data separately."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/uninstall/index.pot b/docs/locales/gettext/administrator/uninstall/index.pot
index 03e9930bd..34d9e1fd8 100644
--- a/docs/locales/gettext/administrator/uninstall/index.pot
+++ b/docs/locales/gettext/administrator/uninstall/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,18 +16,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/uninstall_docs/index.md:9
+#: ../../administrator/uninstall/index.md:9
 msgid "Choose your setup"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/index.md:1
+#: ../../administrator/uninstall/index.md:1
 msgid "Uninstall Funkwhale"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/index.md:3
+#: ../../administrator/uninstall/index.md:3
 msgid "If you need to uninstall Funkwhale, follow the instructions in these guides. Uninstalling Funkwhale removes the app, all media, and all user data. Make sure to back up your data before you proceed."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/index.md:6
+#: ../../administrator/uninstall/index.md:6
 msgid "These guides show you how to delete data stored on your server. If you are using S3-compatible storage, you need to delete your media files separately."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/uninstall/quick-install.pot b/docs/locales/gettext/administrator/uninstall/quick-install.pot
index 2aca466d6..d3599de5d 100644
--- a/docs/locales/gettext/administrator/uninstall/quick-install.pot
+++ b/docs/locales/gettext/administrator/uninstall/quick-install.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,124 +16,124 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:1
+#: ../../administrator/uninstall/quick-install.md:1
 msgid "Uninstall using the quick install script"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:3
+#: ../../administrator/uninstall/quick-install.md:3
 msgid "The Funkwhale quick install script doesn't currently offer an uninstall command. This is because you may be using its dependencies for other software. To uninstall a quick install Funkwhale installation, follow the instructions in this guide."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:6
-msgid "Removing Funkwhale data is __irreversible__. Make sure you [back up your data](../upgrade_docs/backup.md)."
+#: ../../administrator/uninstall/quick-install.md:6
+msgid "Removing Funkwhale data is __irreversible__. Make sure you [back up your data](../upgrade/backup.md)."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:14
+#: ../../administrator/uninstall/quick-install.md:14
 msgid "Stop the Funkwhale server"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:16
+#: ../../administrator/uninstall/quick-install.md:16
 msgid "Before you uninstall anything from your server, you need to stop the Funkwhale systemd services."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:18
+#: ../../administrator/uninstall/quick-install.md:18
 msgid "Stop all systemd services listed under the `funkwhale` target"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:24
+#: ../../administrator/uninstall/quick-install.md:24
 msgid "Disable all systemd services to prevent launch at startup."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:32
+#: ../../administrator/uninstall/quick-install.md:32
 msgid "Remove the service files."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:41
+#: ../../administrator/uninstall/quick-install.md:41
 msgid "Reload all services to pick up the changes."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:48
+#: ../../administrator/uninstall/quick-install.md:48
 msgid "Remove the reverse proxy"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:50
+#: ../../administrator/uninstall/quick-install.md:50
 msgid "To stop serving Funkwhale from your web server, you need to remove your reverse proxy configuration."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:0
+#: ../../administrator/uninstall/quick-install.md:0
 msgid "Nginx"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:58
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:77
+#: ../../administrator/uninstall/quick-install.md:58
+#: ../../administrator/uninstall/quick-install.md:77
 msgid "Remove the configuration files from your web host."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:66
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:84
+#: ../../administrator/uninstall/quick-install.md:66
+#: ../../administrator/uninstall/quick-install.md:84
 msgid "Reload the web server."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:0
+#: ../../administrator/uninstall/quick-install.md:0
 msgid "Apache2"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:92
+#: ../../administrator/uninstall/quick-install.md:92
 msgid "Remove the Funkwhale database"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:95
-msgid "This action is __irreversible__. Make sure you have [backed up your data](../upgrade_docs/backup.md) before proceeding."
+#: ../../administrator/uninstall/quick-install.md:95
+msgid "This action is __irreversible__. Make sure you have [backed up your data](../upgrade/backup.md) before proceeding."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:98
+#: ../../administrator/uninstall/quick-install.md:98
 msgid "Once you have stopped the Funkwhale services, you can remove the Funkwhale database."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:100
+#: ../../administrator/uninstall/quick-install.md:100
 msgid "Navigate to your Funkwhale directory."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:106
+#: ../../administrator/uninstall/quick-install.md:106
 msgid "Delete the Funkwhale database."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:112
+#: ../../administrator/uninstall/quick-install.md:112
 msgid "Delete the Funkwhale user."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:118
+#: ../../administrator/uninstall/quick-install.md:118
 msgid "Delete the Funkwhale account"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:121
-msgid "This action deletes the `/srv/funkwhale/` directory. Make sure you have [backed up any data](../upgrade_docs/backup.md) you want to keep."
+#: ../../administrator/uninstall/quick-install.md:121
+msgid "This action deletes the `/srv/funkwhale/` directory. Make sure you have [backed up any data](../upgrade/backup.md) you want to keep."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:124
+#: ../../administrator/uninstall/quick-install.md:124
 msgid "Once you have removed the database, you can delete the `funkwhale` user and all associated data."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:130
+#: ../../administrator/uninstall/quick-install.md:130
 msgid "This deletes the `funkwhale` user and everything in their home directory (`/srv/funkwhale/`). If your content is hosted in an S3-compatible store, you need to delete this data separately."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:132
+#: ../../administrator/uninstall/quick-install.md:132
 msgid "Uninstall dependencies"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:134
+#: ../../administrator/uninstall/quick-install.md:134
 msgid "The quick install script installs the following dependencies on your server:"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:0
+#: ../../administrator/uninstall/quick-install.md:0
 msgid "Apt"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:0
+#: ../../administrator/uninstall/quick-install.md:0
 msgid "Python"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:170
+#: ../../administrator/uninstall/quick-install.md:170
 msgid "Uninstall any dependencies you don't need."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/upgrade/backup.pot b/docs/locales/gettext/administrator/upgrade/backup.pot
index b8bd40acd..1dfbf8d95 100644
--- a/docs/locales/gettext/administrator/upgrade/backup.pot
+++ b/docs/locales/gettext/administrator/upgrade/backup.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,75 +16,75 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:1
+#: ../../administrator/upgrade/backup.md:1
 msgid "Back up your Funkwhale instance"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:3
+#: ../../administrator/upgrade/backup.md:3
 msgid "Before performing big changes, we recommend you back up your database and media files. Follow the instructions in this guide to back up your instance."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:5
+#: ../../administrator/upgrade/backup.md:5
 msgid "Back up your database."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:0
+#: ../../administrator/upgrade/backup.md:0
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:0
+#: ../../administrator/upgrade/backup.md:0
 msgid "Docker"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:28
+#: ../../administrator/upgrade/backup.md:28
 msgid "Back up your media files. In this example we use [rsync](https://rsync.samba.org) to back up the files."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:54
+#: ../../administrator/upgrade/backup.md:54
 msgid "Back up your configuration files."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:77
+#: ../../administrator/upgrade/backup.md:77
 msgid "If you are performing regular backups, you may need deduplication and compression to keep the size down. In this case, a tool like [`borg`](https://www.borgbackup.org/) is more appropriate."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:79
+#: ../../administrator/upgrade/backup.md:79
 msgid "Restore a backup"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:81
+#: ../../administrator/upgrade/backup.md:81
 msgid "Restore your files"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:83
+#: ../../administrator/upgrade/backup.md:83
 msgid "To restart your files, do the following:"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:85
+#: ../../administrator/upgrade/backup.md:85
 msgid "Rename your current file directories."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:92
+#: ../../administrator/upgrade/backup.md:92
 msgid "Restore your backed-up files to the original directories."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:99
+#: ../../administrator/upgrade/backup.md:99
 msgid "Restore the database"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:101
+#: ../../administrator/upgrade/backup.md:101
 msgid "To restore your database, do the following:"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:109
+#: ../../administrator/upgrade/backup.md:109
 msgid "Restore your database backup:"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:115
-#: ../../administrator_documentation/upgrade_docs/backup.md:133
+#: ../../administrator/upgrade/backup.md:115
+#: ../../administrator/upgrade/backup.md:133
 msgid "Run the `funkwhale-manage migrate` command to set up the database."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/backup.md:127
+#: ../../administrator/upgrade/backup.md:127
 msgid "Restore your database backup."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/upgrade/debian.pot b/docs/locales/gettext/administrator/upgrade/debian.pot
index 8803d6454..47a71f966 100644
--- a/docs/locales/gettext/administrator/upgrade/debian.pot
+++ b/docs/locales/gettext/administrator/upgrade/debian.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,70 +16,70 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:1
+#: ../../administrator/upgrade/debian.md:1
 msgid "Upgrade your Debian Funkwhale installation"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:3
-msgid "If you installed Funkwhale following the [Debian guide](../installation_docs/debian.md), follow these steps to upgrade."
+#: ../../administrator/upgrade/debian.md:3
+msgid "If you installed Funkwhale following the [Debian guide](../installation/debian.md), follow these steps to upgrade."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:5
+#: ../../administrator/upgrade/debian.md:5
 msgid "Cleanup old funkwhale files"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:7
+#: ../../administrator/upgrade/debian.md:7
 msgid "Stop the Funkwhale services."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:13
+#: ../../administrator/upgrade/debian.md:13
 msgid "Navigate to your Funkwhale directory."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:19
+#: ../../administrator/upgrade/debian.md:19
 msgid "Remove the old files."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:25
+#: ../../administrator/upgrade/debian.md:25
 msgid "Download Funkwhale"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:27
+#: ../../administrator/upgrade/debian.md:27
 msgid "Export the Funkwhale version you want to update to. You'll use this in the rest of the commands in this guide."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:33
-msgid "Follow the [Download Funkwhale](../installation_docs/debian.md#3-download-funkwhale) instructions in the installation guide."
+#: ../../administrator/upgrade/debian.md:33
+msgid "Follow the [Download Funkwhale](../installation/debian.md#3-download-funkwhale) instructions in the installation guide."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:35
-msgid "Follow the [Install the Funkwhale API](../installation_docs/debian.md#4-install-the-funkwhale-api) instructions in the installation guide."
+#: ../../administrator/upgrade/debian.md:35
+msgid "Follow the [Install the Funkwhale API](../installation/debian.md#4-install-the-funkwhale-api) instructions in the installation guide."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:37
+#: ../../administrator/upgrade/debian.md:37
 msgid "Update your Funkwhale instance"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:39
+#: ../../administrator/upgrade/debian.md:39
 msgid "Once you have downloaded the new files, you can update your Funkwhale instance. To do this:"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:41
+#: ../../administrator/upgrade/debian.md:41
 msgid "Install or upgrade all OS dependencies using the dependencies script."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:47
+#: ../../administrator/upgrade/debian.md:47
 msgid "Collect the new static files to serve."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:53
+#: ../../administrator/upgrade/debian.md:53
 msgid "Apply new database migrations."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:59
+#: ../../administrator/upgrade/debian.md:59
 msgid "Restart the Funkwhale services."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:65
+#: ../../administrator/upgrade/debian.md:65
 msgid "That's it! You've updated your Funkwhale pod. You should now see the new version running in your web browser."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/upgrade/docker.pot b/docs/locales/gettext/administrator/upgrade/docker.pot
index f45560b7e..decbe08b9 100644
--- a/docs/locales/gettext/administrator/upgrade/docker.pot
+++ b/docs/locales/gettext/administrator/upgrade/docker.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,106 +16,106 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:1
+#: ../../administrator/upgrade/docker.md:1
 msgid "Upgrade your Docker Funkwhale installation"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:3
-msgid "If you installed Funkwhale following the [Docker guide](../installation_docs/docker.md), follow these steps to upgrade."
+#: ../../administrator/upgrade/docker.md:3
+msgid "If you installed Funkwhale following the [Docker guide](../installation/docker.md), follow these steps to upgrade."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:5
+#: ../../administrator/upgrade/docker.md:5
 msgid "Upgrade Funkwhale"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:7
+#: ../../administrator/upgrade/docker.md:7
 msgid "SSH into your server"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:8
+#: ../../administrator/upgrade/docker.md:8
 msgid "Log in as your `funkwhale` user."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:14
+#: ../../administrator/upgrade/docker.md:14
 msgid "Navigate to your Funkwhale directory."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:20
+#: ../../administrator/upgrade/docker.md:20
 msgid "Export the Funkwhale version you want to update to. You'll use this in the rest of the commands in this guide."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:26
+#: ../../administrator/upgrade/docker.md:26
 msgid "Change the version number in your `.env` file. Update this to the same version number you exported in step 4."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:32
+#: ../../administrator/upgrade/docker.md:32
 msgid "Log in as `su` to load the configuration from your `.env` file."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:39
+#: ../../administrator/upgrade/docker.md:39
 msgid "Pull the updated containers."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:45
+#: ../../administrator/upgrade/docker.md:45
 msgid "Apply the database migrations."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:51
+#: ../../administrator/upgrade/docker.md:51
 msgid "Relaunch your containers."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:57
+#: ../../administrator/upgrade/docker.md:57
 msgid "Exit the root shell."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:63
+#: ../../administrator/upgrade/docker.md:63
 msgid "That’s it! You’ve updated your Funkwhale pod. You should now see the new version running in your web browser."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:65
+#: ../../administrator/upgrade/docker.md:65
 msgid "Upgrade the postgres container"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:67
+#: ../../administrator/upgrade/docker.md:67
 msgid "Funkwhale depends on postgres for its database container. To upgrade postgres, you need to export your database and import it into the new container."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:69
+#: ../../administrator/upgrade/docker.md:69
 msgid "To upgrade postgres on Docker we use the [`postgres-upgrade`](https://hub.docker.com/r/tianon/postgres-upgrade/) container. This Docker container automates the process of upgrading between major versions of postgres. Use these commands to upgrade your postgres container:"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:71
+#: ../../administrator/upgrade/docker.md:71
 msgid "Export your current postgres version number. You can find this in your `docker-compose.yml` file."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:77
+#: ../../administrator/upgrade/docker.md:77
 msgid "Export the major version number you want to upgrade to."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:83
+#: ../../administrator/upgrade/docker.md:83
 msgid "Stop the postgres container. This means no data changes while you are upgrading."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:89
+#: ../../administrator/upgrade/docker.md:89
 msgid "Run the migration using the `postgres-upgrade` container. This creates a new version of the database in the `/srv/funkwhale/data/postgres-new` directory."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:98
+#: ../../administrator/upgrade/docker.md:98
 msgid "Re-add the access control rules required by Funkwhale."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:104
+#: ../../administrator/upgrade/docker.md:104
 msgid "Swap your old database out with your new database."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:111
+#: ../../administrator/upgrade/docker.md:111
 msgid "Pull the new postgres version."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:117
+#: ../../administrator/upgrade/docker.md:117
 msgid "Restart your containers."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/docker.md:123
+#: ../../administrator/upgrade/docker.md:123
 msgid "That's it! Your Funkwhale pod is now running the new version of postgres. The old database is available in `/srv/funkwhale/data/postgres-old`. You can back this up and remove it from your server once you've confirmed everything is working."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/upgrade/index.pot b/docs/locales/gettext/administrator/upgrade/index.pot
index fcd28e565..3ad19cb02 100644
--- a/docs/locales/gettext/administrator/upgrade/index.pot
+++ b/docs/locales/gettext/administrator/upgrade/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,38 +16,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/upgrade_docs/index.md:11
+#: ../../administrator/upgrade/index.md:11
 msgid "Prepare for the upgrade"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/index.md:21
+#: ../../administrator/upgrade/index.md:21
 msgid "Quick install script"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/index.md:21
+#: ../../administrator/upgrade/index.md:21
 msgid "Docker"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/index.md:21
+#: ../../administrator/upgrade/index.md:21
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/index.md:21
+#: ../../administrator/upgrade/index.md:21
 msgid "Choose your installation method"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/index.md:1
+#: ../../administrator/upgrade/index.md:1
 msgid "Upgrade your Funkwhale instance"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/index.md:3
+#: ../../administrator/upgrade/index.md:3
 msgid "We release new updates to Funkwhale to add new features and fix bugs. We recommend you install these updates to ensure you have the best experience."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/index.md:6
+#: ../../administrator/upgrade/index.md:6
 msgid "We recommend you back up your database and media files before performing and update."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/index.md:9
+#: ../../administrator/upgrade/index.md:9
 msgid "Be sure to check the changelog for any specific instructions relating to upgrades."
 msgstr ""
diff --git a/docs/locales/gettext/administrator/upgrade/quick-install.pot b/docs/locales/gettext/administrator/upgrade/quick-install.pot
index 5a6e30c5e..615a94fdc 100644
--- a/docs/locales/gettext/administrator/upgrade/quick-install.pot
+++ b/docs/locales/gettext/administrator/upgrade/quick-install.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../administrator_documentation/upgrade_docs/quick_install.md:1
+#: ../../administrator/upgrade/quick-install.md:1
 msgid "Upgrade using the quick install script"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/quick_install.md:3
-msgid "If you installed Funkwhale using the [quick install script](../installation_docs/quick_install.md), upgrading your instance is as simple as running the following command on your server:"
+#: ../../administrator/upgrade/quick-install.md:3
+msgid "If you installed Funkwhale using the [quick install script](../installation/quick-install.md), upgrading your instance is as simple as running the following command on your server:"
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/quick_install.md:9
+#: ../../administrator/upgrade/quick-install.md:9
 msgid "The script runs through the necessary setup instructions."
 msgstr ""
diff --git a/docs/locales/gettext/changelog.pot b/docs/locales/gettext/changelog.pot
index e35ec3eba..4997f4489 100644
--- a/docs/locales/gettext/changelog.pot
+++ b/docs/locales/gettext/changelog.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/docs/locales/gettext/contributor/documentation.pot b/docs/locales/gettext/contributor/documentation.pot
index cbb2d5845..e98b17e1a 100644
--- a/docs/locales/gettext/contributor/documentation.pot
+++ b/docs/locales/gettext/contributor/documentation.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,158 +16,158 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../contributor_documentation/documentation.md:1
+#: ../../contributor/documentation.md:1
 msgid "Document Funkwhale"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:4
+#: ../../contributor/documentation.md:4
 msgid "If you notice something missing in our documentation but don't feel confident contributing, submit a request [in our forum](https://forum.funkwhale.audio/t/documentation)."
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:7
+#: ../../contributor/documentation.md:7
 msgid "We try to document Funkwhale as thoroughly as possible to make it easy for users, admins, developers, and contributors to understand how everything works."
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:13
+#: ../../contributor/documentation.md:13
 msgid "Requirements"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:15
+#: ../../contributor/documentation.md:15
 msgid "To work on Funkwhale's documentation, you need the following:"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:17
+#: ../../contributor/documentation.md:17
 msgid "[Git](https://git-scm.com): our version control system"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:18
+#: ../../contributor/documentation.md:18
 msgid "[Docker](https://docs.docker.com/engine/install/) and [Docker Compose](https://docs.docker.com/compose/install/): used to run our development environment"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:19
+#: ../../contributor/documentation.md:19
 msgid "A text editor of your choice"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:21
+#: ../../contributor/documentation.md:21
 msgid "Tooling"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:23
+#: ../../contributor/documentation.md:23
 msgid "We use [Sphinx](https://www.sphinx-doc.org/) to generate our documentation. Sphinx provides excellent tooling for documenting Python projects. We write documentation in Markdown using the [MyST parser](https://myst-parser.readthedocs.io/en/latest/) to access Sphinx's features."
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:25
+#: ../../contributor/documentation.md:25
 msgid "All documentation in Funkwhale is stored in the [main Funkwhale Git repository](https://dev.funkwhale.audio/funkwhale/funkwhale/-/tree/develop/docs)."
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:27
+#: ../../contributor/documentation.md:27
 msgid "Style guide"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:29
+#: ../../contributor/documentation.md:29
 msgid "We broadly follow the [Microsoft writing style guide](https://learn.microsoft.com/en-us/style-guide/welcome/) for language and tone. You should aim to keep your language simple and clear enough for readers of all levels. You can use a free tool like [Hemingway](https://hemingwayapp.com) to check the complexity of your sentences."
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:31
+#: ../../contributor/documentation.md:31
 msgid "Here are some basic rules to follow:"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:33
+#: ../../contributor/documentation.md:33
 msgid "Write in American English"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:34
+#: ../../contributor/documentation.md:34
 msgid "Always use sentence casing for headers. For example: \"Contribute to Funkwhale documentation\" rather than \"Contribute To Funkwhale Documentation\""
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:35
+#: ../../contributor/documentation.md:35
 msgid "Use contractions such as \"don't\" and \"can't\" to make your writing feel conversational. Only use the full words if you're trying to emphasize something"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:37
+#: ../../contributor/documentation.md:37
 msgid "Local setup"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:39
+#: ../../contributor/documentation.md:39
 msgid "We provide a docker container for our documentation to make it easy to work on docs with a real-time preview. Once you install [Docker](https://docs.docker.com/engine/install/) and [Docker Compose](https://docs.docker.com/compose/install/), do the following to get a live preview:"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:41
+#: ../../contributor/documentation.md:41
 msgid "Create a dummy `.env` file"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:47
+#: ../../contributor/documentation.md:47
 msgid "Create a dummy federation network"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:53
+#: ../../contributor/documentation.md:53
 msgid "Build the container"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:59
+#: ../../contributor/documentation.md:59
 msgid "Run the container"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:65
+#: ../../contributor/documentation.md:65
 msgid "A real-time preview of the documentation is available on `http://0.0.0.1:8001`"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:67
+#: ../../contributor/documentation.md:67
 msgid "Redirects"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:69
+#: ../../contributor/documentation.md:69
 msgid "If you move content to a new location, you need to set up a redirect. This ensures that any bookmarks or links posted before the change still take the user where they expect to go."
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:71
+#: ../../contributor/documentation.md:71
 msgid "All redirects are stored in a {file}`redirects.txt` file. This is a simple text file containing one redirect per line. Each line contains the old URL and new URL as relative URLs."
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:73
+#: ../../contributor/documentation.md:73
 msgid "In this example, the `architecture.html` file redirects to `https://docs.funkwhale.audio/developers/architecture.html`."
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:79
+#: ../../contributor/documentation.md:79
 msgid "Contribution flow"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:81
+#: ../../contributor/documentation.md:81
 msgid "Here's an example of the typical workflow for creating documentation:"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:83
+#: ../../contributor/documentation.md:83
 msgid "[Create a fork](https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html) of the Funkwhale codebase"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:84
+#: ../../contributor/documentation.md:84
 msgid "Create a new branch for your documentation. In this example `my-branch-name` is the name of the branch"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:90
+#: ../../contributor/documentation.md:90
 msgid "Make your changes and verify them by running the [Docker container](#local-setup)"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:91
+#: ../../contributor/documentation.md:91
 msgid "Add [redirects](#redirects) if required"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:92
-msgid "Add a [changelog fragment](../developer_documentation/workflows/changelog.md)"
+#: ../../contributor/documentation.md:92
+msgid "Add a [changelog fragment](../developer/workflows/changelog.md)"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:93
+#: ../../contributor/documentation.md:93
 msgid "Add your changed files to a commit"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:100
+#: ../../contributor/documentation.md:100
 msgid "Create a commit with a meaningful commit message"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:106
+#: ../../contributor/documentation.md:106
 msgid "Push your changes to your fork"
 msgstr ""
 
-#: ../../contributor_documentation/documentation.md:112
+#: ../../contributor/documentation.md:112
 msgid "Create a merge request in the [main Funkwhale repository](https://dev.funkwhale.audio/funkwhale/funkwhale)"
 msgstr ""
diff --git a/docs/locales/gettext/contributor/index.pot b/docs/locales/gettext/contributor/index.pot
index 407337a88..ac15ae9b1 100644
--- a/docs/locales/gettext/contributor/index.pot
+++ b/docs/locales/gettext/contributor/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,30 +16,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../contributor_documentation/index.md:1
+#: ../../contributor/index.md:1
 msgid "Get started"
 msgstr ""
 
-#: ../../contributor_documentation/index.md:4
-msgid "Are you a software developer? Check out our [developer documentation](../developer_documentation/index.md) to contribute to our codebase."
+#: ../../contributor/index.md:4
+msgid "Are you a software developer? Check out our [developer documentation](../developer/index.md) to contribute to our codebase."
 msgstr ""
 
-#: ../../contributor_documentation/index.md:7
+#: ../../contributor/index.md:7
 msgid "Funkwhale is a community-led software project, so we depend on our community donating their time and skills. Whether you're experienced in a specific field or just starting out, we welcome any contributions and will support you with any task you take on."
 msgstr ""
 
-#: ../../contributor_documentation/index.md:9
+#: ../../contributor/index.md:9
 msgid "Contribute to Funkwhale's documentation"
 msgstr ""
 
-#: ../../contributor_documentation/index.md:11
+#: ../../contributor/index.md:11
 msgid "Got a knack for writing? Want to teach people how things work? Our [documentation guide](documentation.md) takes you through everything you need to know to contribute to the Funkwhale documentation hub."
 msgstr ""
 
-#: ../../contributor_documentation/index.md:13
+#: ../../contributor/index.md:13
 msgid "Translate Funkwhale"
 msgstr ""
 
-#: ../../contributor_documentation/index.md:15
+#: ../../contributor/index.md:15
 msgid "Are you a confident linguist? We're always looking to expand the number of languages we offer in our apps, websites, and documentation. Check out the [translation guide](translation.md) to start contributing translations in your language."
 msgstr ""
diff --git a/docs/locales/gettext/contributor/translation.pot b/docs/locales/gettext/contributor/translation.pot
index 6cdd0d07f..db6a10c85 100644
--- a/docs/locales/gettext/contributor/translation.pot
+++ b/docs/locales/gettext/contributor/translation.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,74 +16,74 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../contributor_documentation/translation.md:1
+#: ../../contributor/translation.md:1
 msgid "Translate Funkwhale"
 msgstr ""
 
-#: ../../contributor_documentation/translation.md:3
+#: ../../contributor/translation.md:3
 msgid "Funkwhale depends on community translations to provide a localized experience to all users. All of our UX copy and documentation is written in American English. This isn't accessible to all users."
 msgstr ""
 
-#: ../../contributor_documentation/translation.md:5
+#: ../../contributor/translation.md:5
 msgid "If you are interested in helping us reach more users, we welcome contributions in all languages!"
 msgstr ""
 
-#: ../../contributor_documentation/translation.md:7
+#: ../../contributor/translation.md:7
 msgid "Language coordination"
 msgstr ""
 
-#: ../../contributor_documentation/translation.md:9
+#: ../../contributor/translation.md:9
 msgid "Each language team requires a lead who can verify translations. You can see a list of languages and team leads [on our forum](https://forum.funkwhale.audio/d/107-coordinate-translations). If your language isn't available in our platform yet, reach out on the forum and we'll set it up."
 msgstr ""
 
-#: ../../contributor_documentation/translation.md:11
+#: ../../contributor/translation.md:11
 msgid "We can also create language-specific sections of the forum to enable users to discuss things in languages other than English. Language-specific sections require moderators who can enforce the code of conduct. If you're interested in moderating a language-specific section, let us know [on the forum](https://forum.funkwhale.audio/d/18-language-specific-communities)."
 msgstr ""
 
-#: ../../contributor_documentation/translation.md:13
+#: ../../contributor/translation.md:13
 msgid "Weblate"
 msgstr ""
 
-#: ../../contributor_documentation/translation.md:15
+#: ../../contributor/translation.md:15
 msgid "Funkwhale uses [Weblate](https://weblate.org) as its translation platform. Weblate provides an easy-to-use web frontend for submitting localized strings."
 msgstr ""
 
-#: ../../contributor_documentation/translation.md:17
+#: ../../contributor/translation.md:17
 msgid "To get started, sign up to our [Weblate instance](https://translate.funkwhale.audio) and follow the instructions to set up your language preferences. The following projects are available for translation:"
 msgstr ""
 
-#: ../../contributor_documentation/translation.md:19
+#: ../../contributor/translation.md:19
 msgid "Funkwhale: The Funkwhale web app"
 msgstr ""
 
-#: ../../contributor_documentation/translation.md:20
+#: ../../contributor/translation.md:20
 msgid "Funkwhale for Android: Our official Android app"
 msgstr ""
 
-#: ../../contributor_documentation/translation.md:21
+#: ../../contributor/translation.md:21
 msgid "Funkwhale.audio: Our website"
 msgstr ""
 
-#: ../../contributor_documentation/translation.md:22
+#: ../../contributor/translation.md:22
 msgid "Documentation: This documentation hub"
 msgstr ""
 
-#: ../../contributor_documentation/translation.md:24
+#: ../../contributor/translation.md:24
 msgid "Guidelines"
 msgstr ""
 
-#: ../../contributor_documentation/translation.md:26
+#: ../../contributor/translation.md:26
 msgid "We trust each language team to deliver translations that are tonally consistent with the source language. Where applicable, follow these guidelines:"
 msgstr ""
 
-#: ../../contributor_documentation/translation.md:28
+#: ../../contributor/translation.md:28
 msgid "Use gender-neutral language"
 msgstr ""
 
-#: ../../contributor_documentation/translation.md:29
+#: ../../contributor/translation.md:29
 msgid "Use informal speech patterns, including contractions"
 msgstr ""
 
-#: ../../contributor_documentation/translation.md:30
+#: ../../contributor/translation.md:30
 msgid "Use sentence case for all content, including titles. For example: \"Language coordination\" rather than \"Language Coordination\""
 msgstr ""
diff --git a/docs/locales/gettext/developer/api/authentication.pot b/docs/locales/gettext/developer/api/authentication.pot
index 855148c77..3348612bc 100644
--- a/docs/locales/gettext/developer/api/authentication.pot
+++ b/docs/locales/gettext/developer/api/authentication.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,272 +16,272 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/api/authentication.md:1
+#: ../../developer/api/authentication.md:1
 msgid "API authentication"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:3
+#: ../../developer/api/authentication.md:3
 msgid "Funkwhale uses the OAuth [authorization grant flow](https://tools.ietf.org/html/rfc6749#section-4.1) for external apps. This flow is a secure way to authenticate apps that requires a user's explicit consent to perform actions."
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:27
+#: ../../developer/api/authentication.md:27
 msgid "Steps"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:32
+#: ../../developer/api/authentication.md:32
 msgid "1. Create an application"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:34
+#: ../../developer/api/authentication.md:34
 msgid "To connect to the Funkwhale API using OAuth, you need to create an **application**. This represents the entity credentials are related to."
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:36
+#: ../../developer/api/authentication.md:36
 msgid "When creating an application you need to define the [**scopes**](https://www.rfc-editor.org/rfc/rfc6749#section-3.3) the application has access to. Scopes define what information your application can access. Each scope can be granted with the following rights:"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:38
+#: ../../developer/api/authentication.md:38
 msgid "`read:<scope>`: grants read-only access to the resource"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:39
+#: ../../developer/api/authentication.md:39
 msgid "`write:<scope>`: grants write-only access to the resource"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:41
+#: ../../developer/api/authentication.md:41
 msgid "`read` rights are required to fetch information using a `GET` request. All other actions (`POST`, `PATCH`, `PUT`, and `DELETE`) require `write` privileges. You may give an application **both** `read` and `write` access to any scope."
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:47
+#: ../../developer/api/authentication.md:47
 msgid "Scope"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:48
+#: ../../developer/api/authentication.md:48
 msgid "Description"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:49
+#: ../../developer/api/authentication.md:49
 msgid "`read`"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:50
-#: ../../developer_documentation/api/authentication.md:52
+#: ../../developer/api/authentication.md:50
+#: ../../developer/api/authentication.md:52
 msgid "Read-only access to all data"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:51
+#: ../../developer/api/authentication.md:51
 msgid "`write`"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:53
+#: ../../developer/api/authentication.md:53
 msgid "`<read/write>:profile`"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:54
+#: ../../developer/api/authentication.md:54
 msgid "Access to profile data (email address, username, etc.)"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:55
+#: ../../developer/api/authentication.md:55
 msgid "`<read/write>:libraries`"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:56
+#: ../../developer/api/authentication.md:56
 msgid "Access to library data (uploads, libraries, tracks, albums, artists, etc.)"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:57
+#: ../../developer/api/authentication.md:57
 msgid "`<read/write>:favorites`"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:58
+#: ../../developer/api/authentication.md:58
 msgid "Access to favorites"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:59
+#: ../../developer/api/authentication.md:59
 msgid "`<read/write>:listenings`"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:60
+#: ../../developer/api/authentication.md:60
 msgid "Access to history"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:61
+#: ../../developer/api/authentication.md:61
 msgid "`<read/write>:follows`"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:62
+#: ../../developer/api/authentication.md:62
 msgid "Access to followers"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:63
+#: ../../developer/api/authentication.md:63
 msgid "`<read/write>:playlists`"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:64
+#: ../../developer/api/authentication.md:64
 msgid "Access to playlists"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:65
+#: ../../developer/api/authentication.md:65
 msgid "`<read/write>:radios`"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:66
+#: ../../developer/api/authentication.md:66
 msgid "Access to radios"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:67
+#: ../../developer/api/authentication.md:67
 msgid "`<read/write>:filters`"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:68
+#: ../../developer/api/authentication.md:68
 msgid "Access to content filters"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:69
+#: ../../developer/api/authentication.md:69
 msgid "`<read/write>:notifications`"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:70
+#: ../../developer/api/authentication.md:70
 msgid "Access to notifications"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:71
+#: ../../developer/api/authentication.md:71
 msgid "`<read/write>:edits`"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:72
+#: ../../developer/api/authentication.md:72
 msgid "Access to metadata edits"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:75
+#: ../../developer/api/authentication.md:75
 msgid "Next, you need to define a [**Redirect URI**](https://www.rfc-editor.org/rfc/rfc6749#section-3.1.2). This is the location the user is redirected to once they authenticate your app. This can be any URI you want."
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:78
+#: ../../developer/api/authentication.md:78
 msgid "Funkwhale supports the `urn:ietf:wg:oauth:2.0:oob` redirect URI for non-web applications. If you use this URI, the user is shown a token to copy and paste."
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:81
+#: ../../developer/api/authentication.md:81
 msgid "Once you've decided on your scopes and your redirect URI, you can create your app using one of the following methods:"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:83
+#: ../../developer/api/authentication.md:83
 msgid "Visit `/settings/applications/new` on your Funkwhale pod while logged in"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:84
+#: ../../developer/api/authentication.md:84
 msgid "Send a `POST` request to `/api/v1/oauth/apps`. See our [API documentation](https://docs.funkwhale.audio/swagger/) for more information"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:86
+#: ../../developer/api/authentication.md:86
 msgid "Both methods return a [**client ID**](https://www.rfc-editor.org/rfc/rfc6749#section-2.2) and a [**secret**](https://www.rfc-editor.org/rfc/rfc6749#section-2.3.1)."
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:88
+#: ../../developer/api/authentication.md:88
 msgid "2. Get an authorization code"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:91
+#: ../../developer/api/authentication.md:91
 msgid "Authorization codes are only valid for 5 minutes after the user approves the request."
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:94
+#: ../../developer/api/authentication.md:94
 msgid "You need an [**authorization code**](https://www.rfc-editor.org/rfc/rfc6749#section-1.3.1) to request an access token for your user. This code confirms to the server that a user has authorized access to their account."
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:96
+#: ../../developer/api/authentication.md:96
 msgid "To fetch an authorization code, you need to send the user to their Funkwhale pod to authenticate. This sends an [authorization request](https://www.rfc-editor.org/rfc/rfc6749#section-4.1.2) to the server."
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:98
+#: ../../developer/api/authentication.md:98
 msgid "To do this, call the `/authorize` endpoint with the following URL encoded query parameters:"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:100
+#: ../../developer/api/authentication.md:100
 msgid "`client_id`\\* - Your application's client ID"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:101
+#: ../../developer/api/authentication.md:101
 msgid "`response_type`\\* - Must be set to `code`."
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:102
+#: ../../developer/api/authentication.md:102
 msgid "`redirect_uri` - Your redirect URI"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:103
-#: ../../developer_documentation/api/authentication.md:135
+#: ../../developer/api/authentication.md:103
+#: ../../developer/api/authentication.md:135
 msgid "`scope` - A list of scopes"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:104
+#: ../../developer/api/authentication.md:104
 msgid "`state` - Used to maintain state between the request and the callback to prevent cross-site request forgery. Typically corresponds with a location in the app (e.g. `/library`)"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:106
+#: ../../developer/api/authentication.md:106
 msgid "Here is an example URL: `https://demo.funkwhale.audio/authorize?response_type=code&scope=read%20write&redirect_uri=http%3A%2F%2Flocalhost%3A8080%2Fauth%2Fcallback&state=/library&client_id=jDOUfhqLlrbuOkToDCanZmBKEiyorMb9ZUgD2tFQ`."
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:108
+#: ../../developer/api/authentication.md:108
 msgid "When the user authorizes your app, the server responds with an authorization code. See [the OAuth spec](https://www.rfc-editor.org/rfc/rfc6749#section-4.1.2) for more information about this response."
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:110
+#: ../../developer/api/authentication.md:110
 msgid "3. Get an access token"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:112
+#: ../../developer/api/authentication.md:112
 msgid "Once you receive your authorization code, you need to [request an access token](https://www.rfc-editor.org/rfc/rfc6749#section-4.1.3). To request an access token, call the `/api/v1/oauth/token` endpoint with the following information:"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:114
+#: ../../developer/api/authentication.md:114
 msgid "`grant_type`\\* - Must be set to `authorization_code`"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:115
+#: ../../developer/api/authentication.md:115
 msgid "`code`\\* - Your application's authorization code"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:116
+#: ../../developer/api/authentication.md:116
 msgid "`redirect_uri`\\* - Your redirect URI"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:117
+#: ../../developer/api/authentication.md:117
 msgid "`client_id`\\* Your application's client ID"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:119
+#: ../../developer/api/authentication.md:119
 msgid "The server responds with an [`access_token`](https://www.rfc-editor.org/rfc/rfc6749#section-1.4) and a [`refresh_token`](https://www.rfc-editor.org/rfc/rfc6749#section-1.5). See [the OAuth spec](https://www.rfc-editor.org/rfc/rfc6749#section-4.1.4) for more information about this response."
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:121
+#: ../../developer/api/authentication.md:121
 msgid "You can use this token to authenticate calls from your application to the Funkwhale API by passing it as a request header with the following format: `Authorization: Bearer <token>`."
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:123
+#: ../../developer/api/authentication.md:123
 msgid "4. Refresh your access token"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:126
+#: ../../developer/api/authentication.md:126
 msgid "When you refresh your token the endpoint returns a new `refresh_token`. You must update your refresh token each time you request a new access token."
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:129
+#: ../../developer/api/authentication.md:129
 msgid "By default, Funkwhale access tokens are valid for **10 hours**. Pod admins can configure this by setting the `ACCESS_TOKEN_EXPIRE_SECONDS` variable in their `.env` file."
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:131
+#: ../../developer/api/authentication.md:131
 msgid "After the access token expires, you must request a new access token by calling the `/api/v1/oauth/token` endpoint with the following information:"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:133
+#: ../../developer/api/authentication.md:133
 msgid "`grant_type`\\* - Must be set to `refresh_token`"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:134
+#: ../../developer/api/authentication.md:134
 msgid "`refresh_token`\\* - Your current refresh token"
 msgstr ""
 
-#: ../../developer_documentation/api/authentication.md:137
+#: ../../developer/api/authentication.md:137
 msgid "See [the OAuth spec](https://www.rfc-editor.org/rfc/rfc6749#section-6) for more information about this response."
 msgstr ""
diff --git a/docs/locales/gettext/developer/api/index.pot b/docs/locales/gettext/developer/api/index.pot
index fe1504c04..69af2f2de 100644
--- a/docs/locales/gettext/developer/api/index.pot
+++ b/docs/locales/gettext/developer/api/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/api/index.md:7
+#: ../../developer/api/index.md:7
 msgid "API explorer"
 msgstr ""
 
-#: ../../developer_documentation/api/index.md:7
+#: ../../developer/api/index.md:7
 msgid "Resources"
 msgstr ""
 
-#: ../../developer_documentation/api/index.md:1
+#: ../../developer/api/index.md:1
 msgid "Funkwhale API"
 msgstr ""
 
-#: ../../developer_documentation/api/index.md:3
+#: ../../developer/api/index.md:3
 msgid "The Funkwhale API is a [REST API](https://developer.mozilla.org/en-US/docs/Glossary/REST) written in [Python](https://www.python.org/) using the [Django REST framework](https://www.django-rest-framework.org/). It is the central component of the project and houses the application's logic."
 msgstr ""
 
-#: ../../developer_documentation/api/index.md:5
+#: ../../developer/api/index.md:5
 msgid "The current API (v1) is **stable**, meaning we are committed to not introducing breaking changes and to maintaining compatibility. We are currently working on Funkwhale API v2, but this is a work in progress and not yet ready for production use."
 msgstr ""
diff --git a/docs/locales/gettext/developer/api/rate-limit.pot b/docs/locales/gettext/developer/api/rate-limit.pot
index b070a3f92..f84da3782 100644
--- a/docs/locales/gettext/developer/api/rate-limit.pot
+++ b/docs/locales/gettext/developer/api/rate-limit.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,150 +16,150 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/api/rate_limit.md:1
+#: ../../developer/api/rate-limit.md:1
 msgid "Rate limiting"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:3
+#: ../../developer/api/rate-limit.md:3
 msgid "Funkwhale supports rate-limiting as of version 0.2.0. Pod admins can choose to rate limit specific endpoints to prevent abuse and improve the stability of the service. If the server drops a request due to rate-limiting, it returns a `429` status code."
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:5
+#: ../../developer/api/rate-limit.md:5
 msgid "By default, rate limits follow these rules:"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:7
+#: ../../developer/api/rate-limit.md:7
 msgid "Anonymous (unauthenticated) requests are subject to lower limits than authenticated requests"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:8
+#: ../../developer/api/rate-limit.md:8
 msgid "`PUT`, `DELETE`, `PUT`, `POST`, and `PATCH` requests are subject to lower limits than `GET` requests"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:10
+#: ../../developer/api/rate-limit.md:10
 msgid "You can return a full list of scope with their corresponding rate-limits by making a `GET` request to `/api/v1/rate-limit`."
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:12
+#: ../../developer/api/rate-limit.md:12
 msgid "HTTP headers"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:14
+#: ../../developer/api/rate-limit.md:14
 msgid "Each API call returns HTTP headers to pass the following information:"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:16
+#: ../../developer/api/rate-limit.md:16
 msgid "What was the scope of the request"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:17
+#: ../../developer/api/rate-limit.md:17
 msgid "What is the rate-limit associated with the request scope"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:18
+#: ../../developer/api/rate-limit.md:18
 msgid "How many more requests in the scope can be made within the rate-limit timeframe"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:19
+#: ../../developer/api/rate-limit.md:19
 msgid "How much time does the client need to wait to send another request"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:21
+#: ../../developer/api/rate-limit.md:21
 msgid "Here is a full list of supported headers"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:27
+#: ../../developer/api/rate-limit.md:27
 msgid "Header"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:28
+#: ../../developer/api/rate-limit.md:28
 msgid "Example value"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:29
+#: ../../developer/api/rate-limit.md:29
 msgid "Description"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:30
+#: ../../developer/api/rate-limit.md:30
 msgid "`X-RateLimit-Limit`"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:31
+#: ../../developer/api/rate-limit.md:31
 msgid "50"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:32
+#: ../../developer/api/rate-limit.md:32
 msgid "The number of requests allowed within a given period"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:33
+#: ../../developer/api/rate-limit.md:33
 msgid "`X-RateLimit-Duration`"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:34
+#: ../../developer/api/rate-limit.md:34
 msgid "3600"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:35
+#: ../../developer/api/rate-limit.md:35
 msgid "The time window, in seconds, during which the number of requests are measured"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:36
+#: ../../developer/api/rate-limit.md:36
 msgid "`X-RateLimit-Scope`"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:37
+#: ../../developer/api/rate-limit.md:37
 msgid "`login`"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:38
+#: ../../developer/api/rate-limit.md:38
 msgid "The name of the scope computed for the request"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:39
+#: ../../developer/api/rate-limit.md:39
 msgid "`X-RateLimit-Remaining`"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:40
+#: ../../developer/api/rate-limit.md:40
 msgid "42"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:41
+#: ../../developer/api/rate-limit.md:41
 msgid "How many requests can be sent with the same scope before the rate-limit applies"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:42
+#: ../../developer/api/rate-limit.md:42
 msgid "`Retry-After`"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:43
+#: ../../developer/api/rate-limit.md:43
 msgid "3543"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:44
+#: ../../developer/api/rate-limit.md:44
 msgid "How many seconds the client must wait before it can retry. Only applies if `X-RateLimit-Remaining` is `0`"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:45
+#: ../../developer/api/rate-limit.md:45
 msgid "`X-RateLimit-Reset`"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:46
+#: ../../developer/api/rate-limit.md:46
 msgid "1568126089"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:47
+#: ../../developer/api/rate-limit.md:47
 msgid "A timestamp indicating when the `X-RateLimit-Remaining` value will reset"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:48
+#: ../../developer/api/rate-limit.md:48
 msgid "`X-RateLimit-ResetSeconds`"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:49
+#: ../../developer/api/rate-limit.md:49
 msgid "3599"
 msgstr ""
 
-#: ../../developer_documentation/api/rate_limit.md:50
+#: ../../developer/api/rate-limit.md:50
 msgid "The number of seconds until the `X-RateLimit-Remaining` value resets"
 msgstr ""
diff --git a/docs/locales/gettext/developer/api/subsonic.pot b/docs/locales/gettext/developer/api/subsonic.pot
index d05e5d8f2..ecfb0be01 100644
--- a/docs/locales/gettext/developer/api/subsonic.pot
+++ b/docs/locales/gettext/developer/api/subsonic.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,183 +16,183 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/api/subsonic.md:1
+#: ../../developer/api/subsonic.md:1
 msgid "Subsonic API"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:3
+#: ../../developer/api/subsonic.md:3
 msgid "Funkwhale supports a subset of the [Subsonic API's](http://www.subsonic.org/pages/api.jsp) endpoints. This enables users to listen to music stored on their Funkwhale pod through a Subsonic-compatible app."
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:5
+#: ../../developer/api/subsonic.md:5
 msgid "We aim to support as many endpoints as we can to give Subsonic users the best possible experience. However, some endpoints require a folder-based endpoint. This doesn't match Funkwhale's internal structure, which means emulating them is difficult."
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:7
+#: ../../developer/api/subsonic.md:7
 msgid "Supported endpoints"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:10
+#: ../../developer/api/subsonic.md:10
 msgid "We aim to keep this list up-to-date. If you think something is missing, you can see all supported endpoints in the [API views](https://dev.funkwhale.audio/funkwhale/funkwhale/blob/develop/api/funkwhale_api/subsonic/views.py)."
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:13
+#: ../../developer/api/subsonic.md:13
 msgid "Funkwhale supports both XML and JSON formats for the following Subsonic endpoints:"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:15
+#: ../../developer/api/subsonic.md:15
 msgid "[`createPlaylist`](http://www.subsonic.org/pages/api.jsp#createPlaylist)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:16
+#: ../../developer/api/subsonic.md:16
 msgid "[`deletePlaylist`](http://www.subsonic.org/pages/api.jsp#deletePlaylist)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:17
+#: ../../developer/api/subsonic.md:17
 msgid "[`getAlbum`](http://www.subsonic.org/pages/api.jsp#getAlbum)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:18
+#: ../../developer/api/subsonic.md:18
 msgid "[`getAlbumList2`](http://www.subsonic.org/pages/api.jsp#getAlbumList2)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:19
+#: ../../developer/api/subsonic.md:19
 msgid "[`getArtist`](http://www.subsonic.org/pages/api.jsp#getArtist)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:20
+#: ../../developer/api/subsonic.md:20
 msgid "[`getArtistInfo2`](http://www.subsonic.org/pages/api.jsp#getArtistInfo2)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:21
+#: ../../developer/api/subsonic.md:21
 msgid "[`getArtists`](http://www.subsonic.org/pages/api.jsp#getArtists)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:22
+#: ../../developer/api/subsonic.md:22
 msgid "[`getAvatar`](http://www.subsonic.org/pages/api.jsp#getAvatar)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:23
+#: ../../developer/api/subsonic.md:23
 msgid "[`getCoverArt`](http://www.subsonic.org/pages/api.jsp#getCoverArt)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:24
+#: ../../developer/api/subsonic.md:24
 msgid "[`getIndexes`](http://www.subsonic.org/pages/api.jsp#getIndexes)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:25
+#: ../../developer/api/subsonic.md:25
 msgid "[`getLicense`](http://www.subsonic.org/pages/api.jsp#getLicense)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:26
+#: ../../developer/api/subsonic.md:26
 msgid "[`getMusicFolders`](http://www.subsonic.org/pages/api.jsp#getMusicFolders)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:27
+#: ../../developer/api/subsonic.md:27
 msgid "[`getPlaylist`](http://www.subsonic.org/pages/api.jsp#getPlaylist)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:28
+#: ../../developer/api/subsonic.md:28
 msgid "[`getPlaylists`](http://www.subsonic.org/pages/api.jsp#getPlaylists)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:29
+#: ../../developer/api/subsonic.md:29
 msgid "[`getRandomSongs`](http://www.subsonic.org/pages/api.jsp#getRandomSongs)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:30
+#: ../../developer/api/subsonic.md:30
 msgid "[`getSong`](http://www.subsonic.org/pages/api.jsp#getSong)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:31
+#: ../../developer/api/subsonic.md:31
 msgid "[`getStarred`](http://www.subsonic.org/pages/api.jsp#getStarred)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:32
+#: ../../developer/api/subsonic.md:32
 msgid "[`getStarred2`](http://www.subsonic.org/pages/api.jsp#getStarred2)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:33
+#: ../../developer/api/subsonic.md:33
 msgid "[`getUser`](http://www.subsonic.org/pages/api.jsp#getUser)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:34
+#: ../../developer/api/subsonic.md:34
 msgid "[`ping`](http://www.subsonic.org/pages/api.jsp#ping)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:35
+#: ../../developer/api/subsonic.md:35
 msgid "[`scrobble`](http://www.subsonic.org/pages/api.jsp#scrobble)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:36
+#: ../../developer/api/subsonic.md:36
 msgid "[`search3`](http://www.subsonic.org/pages/api.jsp#search3)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:37
+#: ../../developer/api/subsonic.md:37
 msgid "[`star`](http://www.subsonic.org/pages/api.jsp#star)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:38
+#: ../../developer/api/subsonic.md:38
 msgid "[`stream`](http://www.subsonic.org/pages/api.jsp#stream)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:39
+#: ../../developer/api/subsonic.md:39
 msgid "[`unstar`](http://www.subsonic.org/pages/api.jsp#unstar)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:40
+#: ../../developer/api/subsonic.md:40
 msgid "[`updatePlaylist`](http://www.subsonic.org/pages/api.jsp#updatePlaylist)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:42
+#: ../../developer/api/subsonic.md:42
 msgid "Additional properties"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:44
+#: ../../developer/api/subsonic.md:44
 msgid "Funkwhale returns some additional properties to Subsonic payloads. You can use these properties to adapt your client behavior if needed:"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:47
+#: ../../developer/api/subsonic.md:47
 msgid "Property"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:48
+#: ../../developer/api/subsonic.md:48
 msgid "Data type"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:49
+#: ../../developer/api/subsonic.md:49
 msgid "Description"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:50
+#: ../../developer/api/subsonic.md:50
 msgid "`type`"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:51
-#: ../../developer_documentation/api/subsonic.md:54
+#: ../../developer/api/subsonic.md:51
+#: ../../developer/api/subsonic.md:54
 msgid "String"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:52
+#: ../../developer/api/subsonic.md:52
 msgid "The name of the app (`funkwhale`)"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:53
+#: ../../developer/api/subsonic.md:53
 msgid "`funkwhaleVersion`"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:55
+#: ../../developer/api/subsonic.md:55
 msgid "The Funkwhale version the pod is running"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:67
+#: ../../developer/api/subsonic.md:67
 msgid "Test a Subsonic app"
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:69
+#: ../../developer/api/subsonic.md:69
 msgid "We host a demo server at <https://demo.funkwhale.audio> which you can use to test your Subsonic app."
 msgstr ""
 
-#: ../../developer_documentation/api/subsonic.md:71
+#: ../../developer/api/subsonic.md:71
 msgid "You can test the Subsonic API by logging in with a Subsonic client or by directly by calling an endpoint. For example, call this URL to test the `ping` endpoint: <https://demo.funkwhale.audio/rest/ping.view?f=json>"
 msgstr ""
diff --git a/docs/locales/gettext/developer/architecture.pot b/docs/locales/gettext/developer/architecture.pot
index ac53de8c7..0c24f469d 100644
--- a/docs/locales/gettext/developer/architecture.pot
+++ b/docs/locales/gettext/developer/architecture.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,182 +16,182 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/architecture.md:1
+#: ../../developer/architecture.md:1
 msgid "Project architecture"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:3
+#: ../../developer/architecture.md:3
 msgid "Funkwhale is made up of several components. Understanding these components and what they do is important when contributing to Funkwhale's codebase. In this article, we'll break down each part of Funkwhale's architecture to help you understand what each component does."
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:5
+#: ../../developer/architecture.md:5
 msgid "Below is a diagram of Funkwhale's project setup."
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:29
+#: ../../developer/architecture.md:29
 msgid "Select a link below to see information about each component."
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:35
+#: ../../developer/architecture.md:35
 msgid "Entrypoints"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:37
+#: ../../developer/architecture.md:37
 msgid "Users can access Funkwhale using a variety of entrypoints. They can make use of a Funkwhale application, a Subsonic-compatible application, or by calling the API directly. Each entrypoint interacts with the Funkwhale backend in the same way."
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:39
+#: ../../developer/architecture.md:39
 msgid "Funkwhale web app"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:41
+#: ../../developer/architecture.md:41
 msgid "The Funkwhale web app is a {abbr}`SPA (Single Page Application)` written in [Vue.js](https://vuejs.org) and [Typescript](https://typescriptlang.org). This is the application most people associate with Funkwhale. Server admins usually run an instance of the web app alongside their Funkwhale {term}`pod`, but you can also connect a standalone web app to another pod."
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:43
+#: ../../developer/architecture.md:43
 msgid "The Funkwhale web app interacts with the Funkwhale API to fetch and update data. Using a service worker, the web app caches important information for offline use."
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:45
+#: ../../developer/architecture.md:45
 msgid "Funkwhale for Android"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:47
+#: ../../developer/architecture.md:47
 msgid "Funkwhale for Android is the Funkwhale collective's official Android app written in [Kotlin](https://kotlinlang.org/). It interacts with the Funkwhale API to fetch and update data and stores information for offline playback."
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:49
+#: ../../developer/architecture.md:49
 msgid "Subsonic app"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:51
+#: ../../developer/architecture.md:51
 msgid "Funkwhale supports a limited subset of the [Subsonic API](http://www.subsonic.org/pages/api.jsp) to support existing Subsonic apps. These apps can request data stored on a Funkwhale server by calling these endpoints."
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:53
+#: ../../developer/architecture.md:53
 msgid "Nginx/Apache reverse proxy"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:55
+#: ../../developer/architecture.md:55
 msgid "The reverse proxy acts as a layer between a Funkwhale pod and the open internet. It enhances the pod's security and provides additional options to help increase performance."
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:57
+#: ../../developer/architecture.md:57
 msgid "When a user tries to communicate with a Funkwhale pod, the reverse proxy:"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:59
+#: ../../developer/architecture.md:59
 msgid "Handles the HTTP/HTTPS requests and proxies them to the Funkwhale API server"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:60
+#: ../../developer/architecture.md:60
 msgid "Serves requested static files, such as audio files and stylesheets"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:62
+#: ../../developer/architecture.md:62
 msgid "Backend"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:64
+#: ../../developer/architecture.md:64
 msgid "The Funkwhale backend is made up of a few components which are responsible for:"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:66
+#: ../../developer/architecture.md:66
 msgid "Communicating with the user's entrypoint and actioning requests"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:67
+#: ../../developer/architecture.md:67
 msgid "Maintaining data consistency"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:68
+#: ../../developer/architecture.md:68
 msgid "Communicating with other Funkwhale pods (if federation is enabled)"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:70
+#: ../../developer/architecture.md:70
 msgid "Django API server"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:72
+#: ../../developer/architecture.md:72
 msgid "The Funkwhale API is a [REST API](https://developer.mozilla.org/en-US/docs/Glossary/REST) written in [Python](https://www.python.org/) using the [Django REST framework](https://www.django-rest-framework.org/). It is the central piece of the project and houses the application's logic."
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:74
+#: ../../developer/architecture.md:74
 msgid "The Funkwhale API is responsible for:"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:76
+#: ../../developer/architecture.md:76
 msgid "Fetching requested data from the cache/database and returning it to the requester in a meaningful way"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:77
+#: ../../developer/architecture.md:77
 msgid "Processing incoming data and writing it to the database in a meaningful way"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:78
+#: ../../developer/architecture.md:78
 msgid "Delegating long-running tasks to workers to reduce load"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:80
+#: ../../developer/architecture.md:80
 msgid "PostgreSQL database"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:82
+#: ../../developer/architecture.md:82
 msgid "Funkwhale uses a [PostgreSQL database](https://www.postgresql.org/) to store data. All information that is served by and sent to the Funkwhale API is stored in this database."
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:84
+#: ../../developer/architecture.md:84
 msgid "The Funkwhale database makes heavy use of [indexes](https://www.postgresql.org/docs/current/indexes.html) for enhanced performance."
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:86
+#: ../../developer/architecture.md:86
 msgid "Redis cache and message queue"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:88
+#: ../../developer/architecture.md:88
 msgid "Funkwhale uses [Redis](https://redis.io/) to cache information from the database and to store a queue of messages to send. We use this cache to avoid locking database resources and to speed up requests."
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:90
+#: ../../developer/architecture.md:90
 msgid "Celery worker"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:92
+#: ../../developer/architecture.md:92
 msgid "Funkwhale has to handle a lot of tasks that take longer than the average HTTP request/response cycle. To ensure these tasks complete and don't impact the API's performance, they are offloaded to a [Celery](https://docs.celeryq.dev/en/stable/userguide/workers.html) task worker. The worker then works through all the tasks in its queue while the API handles real-time responses."
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:94
+#: ../../developer/architecture.md:94
 msgid "Some common tasks the Celery worker handles are:"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:96
+#: ../../developer/architecture.md:96
 msgid "Importing uploaded music to the database"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:97
+#: ../../developer/architecture.md:97
 msgid "Handling [ActivityPub](https://www.w3.org/TR/activitypub/) messages from other {term}`Fediverse` servers"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:98
+#: ../../developer/architecture.md:98
 msgid "Scanning new content on remote pods"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:100
+#: ../../developer/architecture.md:100
 msgid "Celery beat task scheduler"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:102
+#: ../../developer/architecture.md:102
 msgid "In addition to handling tasks from the API, the Celery worker also needs to handle some recurring tasks. To manage these, we implement a [Celery beat](https://docs.celeryq.dev/en/stable/reference/celery.apps.beat.html#celery.apps.beat.Beat) scheduler. The scheduler is responsible for triggering tasks on a schedule and adding messages to the [queue](#redis-cache-and-message-queue) so the worker can work through them."
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:104
+#: ../../developer/architecture.md:104
 msgid "Some common recurring tasks are:"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:106
+#: ../../developer/architecture.md:106
 msgid "Clearing the cache"
 msgstr ""
 
-#: ../../developer_documentation/architecture.md:107
+#: ../../developer/architecture.md:107
 msgid "Refreshing content metadata"
 msgstr ""
diff --git a/docs/locales/gettext/developer/contribute/api.pot b/docs/locales/gettext/developer/contribute/api.pot
index 11f70aca4..34385dd80 100644
--- a/docs/locales/gettext/developer/contribute/api.pot
+++ b/docs/locales/gettext/developer/contribute/api.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,130 +16,130 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/contribute/api.md:1
+#: ../../developer/contribute/api.md:1
 msgid "Contribute to the API"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:3
+#: ../../developer/contribute/api.md:3
 msgid "The Funkwhale API is the core of the Funkwhale ecosystem. It powers all actions in the Funkwhale app as well as other apps such as the CLI and mopidy plugin. The API is written in [Django rest framework](https://www.django-rest-framework.org/)."
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:5
+#: ../../developer/contribute/api.md:5
 msgid "Before you start work on the API, you should open up a conversation in [the forum](https://forum.funkwhale.audio) to discuss the changes you want to make. All API changes need to be defined and scoped before code changes are made. If you are fixing a bug, you don't need to discuss this in the forum first."
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:7
+#: ../../developer/contribute/api.md:7
 msgid "Each API endpoint is made up of the following:"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:9
+#: ../../developer/contribute/api.md:9
 msgid "Model – defines the shape of data and how it is stored in the database"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:10
+#: ../../developer/contribute/api.md:10
 msgid "View – defines what data is reflected by an endpoint"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:11
+#: ../../developer/contribute/api.md:11
 msgid "Serializer – defines how data is serialized and deserialized by the endpoint"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:13
+#: ../../developer/contribute/api.md:13
 msgid "The API directory is structured as follows:"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:15
+#: ../../developer/contribute/api.md:15
 msgid "`config` – contains the project settings, URL structure, and web server gateway information setup"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:16
+#: ../../developer/contribute/api.md:16
 msgid "`settings` – contains all Django settings files"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:17
+#: ../../developer/contribute/api.md:17
 msgid "`funkwhale_api` – contains the Funkwhale API logic"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:18
+#: ../../developer/contribute/api.md:18
 msgid "`pyproject.toml` – contains the Python requirements"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:19
+#: ../../developer/contribute/api.md:19
 msgid "`tests` – contains all tests. This directory matches the structure of the `funkwhale_api` directory"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:21
+#: ../../developer/contribute/api.md:21
 msgid "Write tests"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:23
+#: ../../developer/contribute/api.md:23
 msgid "You should write tests to ensure that your code does what you expect it to. We use [pytest](https://pytest.org) and [factory-boy](https://factoryboy.readthedocs.io) to power our API testing suite."
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:25
+#: ../../developer/contribute/api.md:25
 msgid "Writing tests is outside the scope of this documentation, but here are some useful links to help you get started:"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:27
+#: ../../developer/contribute/api.md:27
 msgid "[A quick introduction to writing unit tests with pytest](https://semaphoreci.com/community/tutorials/testing-python-applications-with-pytest)"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:28
+#: ../../developer/contribute/api.md:28
 msgid "[A complete guide to Test-Driven Development](https://www.obeythetestinggoat.com/)"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:29
+#: ../../developer/contribute/api.md:29
 msgid "[pytest documentation](https://docs.pytest.org/en/latest)"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:30
+#: ../../developer/contribute/api.md:30
 msgid "[pytest-mock documentation](https://pypi.org/project/pytest-mock)"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:31
+#: ../../developer/contribute/api.md:31
 msgid "[factory-boy documentation](http://factoryboy.readthedocs.io)"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:33
+#: ../../developer/contribute/api.md:33
 msgid "Try to keep your tests small and focused. Each test should test a single function, so if you need to test multiple things you should write multiple tests."
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:36
+#: ../../developer/contribute/api.md:36
 msgid "Test files must target a module and follow the `funkwhale_api` directory structure. If you write tests for `funkwhale_api/myapp/views.py`, you should put them in `tests/myapp/test_views.py`."
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:39
+#: ../../developer/contribute/api.md:39
 msgid "We provide utilities and fixtures to make writing tests as easy as possible. You can see the list of available fixtures by running `sudo docker compose -f dev.yml run --rm api pytest --fixtures`."
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:41
+#: ../../developer/contribute/api.md:41
 msgid "Factories"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:43
+#: ../../developer/contribute/api.md:43
 msgid "Each directory includes a `factories.py` file which contains factories for the models in the directory. You can use these to create arbitrary objects"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:76
+#: ../../developer/contribute/api.md:76
 msgid "Mocking"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:78
+#: ../../developer/contribute/api.md:78
 msgid "Use mocks to fake logic in your tests. This is useful when testing components that depend on one another."
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:132
+#: ../../developer/contribute/api.md:132
 msgid "Run tests"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:134
+#: ../../developer/contribute/api.md:134
 msgid "You can run all tests in the pytest suite with the following command:"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:140
+#: ../../developer/contribute/api.md:140
 msgid "Run a specific test file by calling pytest against it:"
 msgstr ""
 
-#: ../../developer_documentation/contribute/api.md:146
+#: ../../developer/contribute/api.md:146
 msgid "You can check the full list of options by passing the `-h` flag:"
 msgstr ""
diff --git a/docs/locales/gettext/developer/contribute/copy.pot b/docs/locales/gettext/developer/contribute/copy.pot
index a6f0ae2aa..1d9c09ffc 100644
--- a/docs/locales/gettext/developer/contribute/copy.pot
+++ b/docs/locales/gettext/developer/contribute/copy.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,34 +16,34 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/contribute/copy.md:1
+#: ../../developer/contribute/copy.md:1
 msgid "Update UI copy"
 msgstr ""
 
-#: ../../developer_documentation/contribute/copy.md:4
+#: ../../developer/contribute/copy.md:4
 msgid "Funkwhale is localized into several languages using [Weblate](https://translate.funkwhale.audio). You must make sure that any frontend strings are properly marked for localization. We use the [vue-i18n package](https://kazupon.github.io/vue-i18n/) to handle translation of frontend files."
 msgstr ""
 
-#: ../../developer_documentation/contribute/copy.md:7
+#: ../../developer/contribute/copy.md:7
 msgid "All UI strings are stored in `front/locales/en.json` file. The file is structured to mimic the format of the repository. Each string should be labeled following the semantic naming for the item it applies to."
 msgstr ""
 
-#: ../../developer_documentation/contribute/copy.md:9
+#: ../../developer/contribute/copy.md:9
 msgid "UI strings can be added to both the `<script>` and `<template>` part of a Vue file using following syntax:"
 msgstr ""
 
-#: ../../developer_documentation/contribute/copy.md:0
+#: ../../developer/contribute/copy.md:0
 msgid "Locale file"
 msgstr ""
 
-#: ../../developer_documentation/contribute/copy.md:0
+#: ../../developer/contribute/copy.md:0
 msgid "Script"
 msgstr ""
 
-#: ../../developer_documentation/contribute/copy.md:0
+#: ../../developer/contribute/copy.md:0
 msgid "Template"
 msgstr ""
 
-#: ../../developer_documentation/contribute/copy.md:58
+#: ../../developer/contribute/copy.md:58
 msgid "Some strings change depending on whether they are plural or not. You can create plural strings using the [vue-i18n pluralization syntax](https://kazupon.github.io/vue-i18n/guide/pluralization.html)"
 msgstr ""
diff --git a/docs/locales/gettext/developer/contribute/frontend.pot b/docs/locales/gettext/developer/contribute/frontend.pot
index 9add40724..7ecc30287 100644
--- a/docs/locales/gettext/developer/contribute/frontend.pot
+++ b/docs/locales/gettext/developer/contribute/frontend.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,62 +16,62 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/contribute/frontend.md:1
+#: ../../developer/contribute/frontend.md:1
 msgid "Contribute to the frontend"
 msgstr ""
 
-#: ../../developer_documentation/contribute/frontend.md:3
+#: ../../developer/contribute/frontend.md:3
 msgid "The Funkwhale frontend is a {abbr}`SPA (Single Page Application)` written in [Typescript](https://typescriptlang.org) and [Vue.js](https://vuejs.org)."
 msgstr ""
 
-#: ../../developer_documentation/contribute/frontend.md:5
+#: ../../developer/contribute/frontend.md:5
 msgid "Styles"
 msgstr ""
 
-#: ../../developer_documentation/contribute/frontend.md:7
+#: ../../developer/contribute/frontend.md:7
 msgid "We currently use [Fomantic UI](https://fomantic-ui.com) as our UI framework. We customize this with our own SCSS files located in `front/src/styles/_main.scss`."
 msgstr ""
 
-#: ../../developer_documentation/contribute/frontend.md:9
+#: ../../developer/contribute/frontend.md:9
 msgid "We apply changes to the Fomantic CSS files before we import them:"
 msgstr ""
 
-#: ../../developer_documentation/contribute/frontend.md:11
+#: ../../developer/contribute/frontend.md:11
 msgid "We replace hardcoded color values with CSS variables to make themin easier. For example: `color: orange` is replaced by `color: var(--vibrant-color)`"
 msgstr ""
 
-#: ../../developer_documentation/contribute/frontend.md:12
+#: ../../developer/contribute/frontend.md:12
 msgid "We remove unused values from the CSS files to keep the size down"
 msgstr ""
 
-#: ../../developer_documentation/contribute/frontend.md:14
+#: ../../developer/contribute/frontend.md:14
 msgid "These changes are applied when you run `yarn install` through a `postinstall` hook. If you want to modify these changes, check the `front/scripts/fix-fomantic-css.py` script."
 msgstr ""
 
-#: ../../developer_documentation/contribute/frontend.md:16
+#: ../../developer/contribute/frontend.md:16
 msgid "We plan to replace Fomantic with our own UI framework in the near future. Check our [Penpot](https://design.funkwhale.audio) to see what we've got planned."
 msgstr ""
 
-#: ../../developer_documentation/contribute/frontend.md:18
+#: ../../developer/contribute/frontend.md:18
 msgid "Components"
 msgstr ""
 
-#: ../../developer_documentation/contribute/frontend.md:20
+#: ../../developer/contribute/frontend.md:20
 msgid "Our [component library](https://ui.funkwhale.audio) contains reusable Vue components that you can add to the Funkwhale frontend. If you want to add a new component, check out [the repository](https://dev.funkwhale.audio/funkwhale/vui)."
 msgstr ""
 
-#: ../../developer_documentation/contribute/frontend.md:22
+#: ../../developer/contribute/frontend.md:22
 msgid "Testing"
 msgstr ""
 
-#: ../../developer_documentation/contribute/frontend.md:24
+#: ../../developer/contribute/frontend.md:24
 msgid "The Funkwhale frontend contains some tests to catch errors before changes go live. The coverage is still fairly low, so we welcome any contributions."
 msgstr ""
 
-#: ../../developer_documentation/contribute/frontend.md:26
+#: ../../developer/contribute/frontend.md:26
 msgid "To run the test suite, run the following command:"
 msgstr ""
 
-#: ../../developer_documentation/contribute/frontend.md:32
+#: ../../developer/contribute/frontend.md:32
 msgid "To run tests as you make changes, launch the test suite with the `-w` flag:"
 msgstr ""
diff --git a/docs/locales/gettext/developer/contribute/index.pot b/docs/locales/gettext/developer/contribute/index.pot
index 6b9c6b3ff..c9d6fd832 100644
--- a/docs/locales/gettext/developer/contribute/index.pot
+++ b/docs/locales/gettext/developer/contribute/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,10 +16,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/contribute/index.md:1
+#: ../../developer/contribute/index.md:1
 msgid "Contribute to the Funkwhale codebase"
 msgstr ""
 
-#: ../../developer_documentation/contribute/index.md:3
+#: ../../developer/contribute/index.md:3
 msgid "Funkwhale is an open source project, which means we welcome contributions from anyone! If you want to get involved with Funkwhale development, check the guides in this section."
 msgstr ""
diff --git a/docs/locales/gettext/developer/federation/index.pot b/docs/locales/gettext/developer/federation/index.pot
index 2ba965138..83f589949 100644
--- a/docs/locales/gettext/developer/federation/index.pot
+++ b/docs/locales/gettext/developer/federation/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,808 +16,808 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/federation/index.md:1
+#: ../../developer/federation/index.md:1
 msgid "Funkwhale federation"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:4
+#: ../../developer/federation/index.md:4
 msgid "We aim to keep this document up-to-date to reflect the current state of federation. If you notice an issue, please open a thread on [our forum](https://forum.funkwhale.audio/t/documentation)."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:7
+#: ../../developer/federation/index.md:7
 msgid "Funkwhale is a federated platform. Funkwhale pods can share information between one another, and can also communicate with other {term}`Fediverse` software. This article outlines which tools we use, our approach to federation, and how we implement standards."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:14
+#: ../../developer/federation/index.md:14
 msgid "Technologies and standards"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:16
+#: ../../developer/federation/index.md:16
 msgid "Funkwhale's federation is built on top of the following technologies:"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:18
+#: ../../developer/federation/index.md:18
 msgid "[`ActivityPub`](https://www.w3.org/TR/activitypub/): Our federation protocol"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:19
+#: ../../developer/federation/index.md:19
 msgid "[`HTTP Signatures`](https://www.ietf.org/archive/id/draft-ietf-httpbis-message-signatures-01.html): A library for authenticating messages sent over the federation"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:20
+#: ../../developer/federation/index.md:20
 msgid "[`Webfinger`](https://tools.ietf.org/html/rfc7033): A protocol for discovering resources using readable names"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:21
+#: ../../developer/federation/index.md:21
 msgid "[`ActivityStreams`](https://www.w3.org/TR/activitystreams-core/) and [`ActivityStreams vocabulary`](https://www.w3.org/TR/activitystreams-vocabulary/): Our approach to structuring messages"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:23
+#: ../../developer/federation/index.md:23
 msgid "We plan for support [`JSON-LD signatures`](https://w3c-dvcg.github.io/ld-signatures/) in the future as an alternative to `HTTP Signatures`."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:25
+#: ../../developer/federation/index.md:25
 msgid "Our philosophy"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:27
+#: ../../developer/federation/index.md:27
 msgid "Funkwhale aims to align with the above specifications where possible to maintain compatibility with other ActivityPub-aware platforms. This documentation covers where we have departed from the specifications."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:29
+#: ../../developer/federation/index.md:29
 msgid "While we will always aim for compatibility with other services where it makes sense, Funkwhale to Funkwhale interaction is our focus. We use these standards to support activities and objects that fit in with our use cases, such as **follows** and **likes**."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:31
-#: ../../developer_documentation/federation/index.md:84
-#: ../../developer_documentation/federation/index.md:126
-#: ../../developer_documentation/federation/index.md:166
-#: ../../developer_documentation/federation/index.md:206
-#: ../../developer_documentation/federation/index.md:247
-#: ../../developer_documentation/federation/index.md:293
+#: ../../developer/federation/index.md:31
+#: ../../developer/federation/index.md:84
+#: ../../developer/federation/index.md:126
+#: ../../developer/federation/index.md:166
+#: ../../developer/federation/index.md:206
+#: ../../developer/federation/index.md:247
+#: ../../developer/federation/index.md:293
 msgid "Internal logic"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:33
+#: ../../developer/federation/index.md:33
 msgid "This section covers how we handle federation within the Funkwhale ecosystem."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:35
+#: ../../developer/federation/index.md:35
 msgid "Database schema"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:37
+#: ../../developer/federation/index.md:37
 msgid "We use ActivityPub entities as a guide when creating [our models](https://dev.funkwhale.audio/funkwhale/funkwhale/blob/develop/api/funkwhale_api/federation/models.py) and database schemas. This ensures compatibility with other ActivityPub projects."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:39
+#: ../../developer/federation/index.md:39
 msgid "Funkwhale pods store received activities payloads in the database before attempting to process or deliver them. This enables us to debug federation issues, resend messages, or process historical activities that weren't previously supported."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:41
+#: ../../developer/federation/index.md:41
 msgid "Funkwhale users are associated to an `Actor`. Remote and local actors are stord in the same database table. Any federated entities, such as uploads, are linked to the `Actor` rather than the user. We don't distinguish between local and remote users on the database level."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:43
+#: ../../developer/federation/index.md:43
 msgid "Activity creation and delivery"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:45
+#: ../../developer/federation/index.md:45
 msgid "Any action carried out by a local actor should trigger an `Activity`. This is the equivalent to posting an activity to an object. Funkwhale creates an object with the activity payload and stores it in the `Activity` table. Funkwhale triggers 2 types of deliveries:"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:47
+#: ../../developer/federation/index.md:47
 msgid "Local recipients: Funkwhale creates an `InboxItem` linked to the activity for each local recipient. Funkwhale then creates a feed of available inbox items for each local actor. Items in this feed have both a `Read` and `Unread` status to allow users to mark items as handled."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:48
+#: ../../developer/federation/index.md:48
 msgid "Remote recipients: Funkwhale collects the inboxes and shared inbox URLs of all remote recipients. Funkwhale then creates a `Delivery` object and linked to the initial activity and the inbox or shared inbox URL. The worker uses this `Delivery` object to post the activity to the correct inbox."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:50
+#: ../../developer/federation/index.md:50
 msgid "When a local inbox receives an activity from a remote actor, it ends up in their inbox for them to handle."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:52
+#: ../../developer/federation/index.md:52
 msgid "Funkwhale doesn't support all activities. Our routing logic enables the software to handle supported activities and discard unsupported ones. When Funkwhale receives an activity it checks if there is a route to handle it. If there is, Funkwhale calls a dedicated handler."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:54
+#: ../../developer/federation/index.md:54
 msgid "For example: if Funkwhale receives an [`activity-create`](#create) activity for an `object-audio` object, Funkwhale calls a handler to:"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:56
+#: ../../developer/federation/index.md:56
 msgid "Persist the data in the local `Upload` table"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:57
+#: ../../developer/federation/index.md:57
 msgid "Retrieve data associated with the audio"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:59
+#: ../../developer/federation/index.md:59
 msgid "You can find the code for our routing logic here:"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:61
+#: ../../developer/federation/index.md:61
 msgid "[Routing logic for activities](https://dev.funkwhale.audio/funkwhale/funkwhale/blob/develop/api/funkwhale_api/federation/routes.py)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:62
+#: ../../developer/federation/index.md:62
 msgid "[Delivery logic for activities](https://dev.funkwhale.audio/funkwhale/funkwhale/blob/develop/api/funkwhale_api/federation/tasks.py)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:64
+#: ../../developer/federation/index.md:64
 msgid "Service actor"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:66
+#: ../../developer/federation/index.md:66
 msgid "Funkwhale uses a dedicated service actor to send messages or authenticate fetches. This actor isn't associated to a user."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:68
+#: ../../developer/federation/index.md:68
 msgid "You can query a pod's nodeinfo endpoint to return the ID of the service actor in the `metadata > actorId` field. See the [API explorer](https://docs.funkwhale.audio/swagger/) for more information about this endpoint."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:70
+#: ../../developer/federation/index.md:70
 msgid "Funkwhale considers a pod's service actor to be an authoritative source for activities associated with **all** objects on its pod's domain. If the service actor sends an activity linked to an object on its domain, remote pods will recognize its authority."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:72
+#: ../../developer/federation/index.md:72
 msgid "Supported activities"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:74
+#: ../../developer/federation/index.md:74
 msgid "Follow"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:76
+#: ../../developer/federation/index.md:76
 msgid "A **follow** enables actors to access and retrieve content from other actors as soon as it updates."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:0
+#: ../../developer/federation/index.md:0
 msgid "Supported on"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:80
+#: ../../developer/federation/index.md:80
 msgid "[Library objects](#library)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:86
+#: ../../developer/federation/index.md:86
 msgid "When Funkwhale receives a follow on a [library object](#library), it performs one of the following actions depending on the library's visibility:"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:88
+#: ../../developer/federation/index.md:88
 msgid "Automatically accept: If the library is public, Funkwhale automatically accepts the follow activity. Funkwhale sends a notification to the owner of the library and an [`Accept`](#accept) activity to the actor who sent the follow"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:89
+#: ../../developer/federation/index.md:89
 msgid "Accept request: If the library isn't public, Funkwhale sends a notification to the library owner. If the owner approves the request, Funkwhale sends an [`Accept`](#accept) activity to the actor who sent the follow"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:91
+#: ../../developer/federation/index.md:91
 msgid "Funkwhale uses the library follow status to grant access to the actor who sent the follow request. If the library isn't public and the owner doesn't send an approval, the requesting actor can't access the library's content."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:93
-#: ../../developer_documentation/federation/index.md:130
-#: ../../developer_documentation/federation/index.md:170
-#: ../../developer_documentation/federation/index.md:214
-#: ../../developer_documentation/federation/index.md:255
-#: ../../developer_documentation/federation/index.md:297
+#: ../../developer/federation/index.md:93
+#: ../../developer/federation/index.md:130
+#: ../../developer/federation/index.md:170
+#: ../../developer/federation/index.md:214
+#: ../../developer/federation/index.md:255
+#: ../../developer/federation/index.md:297
 msgid "Checks"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:95
+#: ../../developer/federation/index.md:95
 msgid "Funkwhale ensures the activity is being sent to the library's owner before handling it."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:97
-#: ../../developer_documentation/federation/index.md:134
-#: ../../developer_documentation/federation/index.md:174
-#: ../../developer_documentation/federation/index.md:218
-#: ../../developer_documentation/federation/index.md:264
-#: ../../developer_documentation/federation/index.md:301
-#: ../../developer_documentation/federation/index.md:392
-#: ../../developer_documentation/federation/index.md:442
-#: ../../developer_documentation/federation/index.md:501
-#: ../../developer_documentation/federation/index.md:560
-#: ../../developer_documentation/federation/index.md:627
+#: ../../developer/federation/index.md:97
+#: ../../developer/federation/index.md:134
+#: ../../developer/federation/index.md:174
+#: ../../developer/federation/index.md:218
+#: ../../developer/federation/index.md:264
+#: ../../developer/federation/index.md:301
+#: ../../developer/federation/index.md:392
+#: ../../developer/federation/index.md:442
+#: ../../developer/federation/index.md:501
+#: ../../developer/federation/index.md:560
+#: ../../developer/federation/index.md:627
 msgid "Example"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:99
+#: ../../developer/federation/index.md:99
 msgid "In this example, **Alice** sends a follow activity for a [library object](#library) owned by **Bob**."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:116
+#: ../../developer/federation/index.md:116
 msgid "Accept"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:118
+#: ../../developer/federation/index.md:118
 msgid "The `Accept` activity sends a positive response, such as confirming a [`Follow` activity](#follow)."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:122
+#: ../../developer/federation/index.md:122
 msgid "`Activity` objects"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:128
+#: ../../developer/federation/index.md:128
 msgid "When Funkwhale receives an `Accept` activity related to a [`Follow`](#follow) activity, it marks the `Follow` as accepted in the database. If the `Follow` activity relates to a [`Library` object](#library), the requester receives future activities associated with the library. This includes [`Create`](#create), [`Audio`](#audio), and [`Delete`](#delete) activities. They can also browse and download the library's audio files. See the section on [Audio fetching on restricted libraries](#audio-fetching-on-restricted-libraries) for more details."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:132
+#: ../../developer/federation/index.md:132
 msgid "Funkwhale ensures the activity is sent by the library's owner before handling it."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:136
+#: ../../developer/federation/index.md:136
 msgid "In this example, **Bob** accepts a follow request from **Alice**."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:158
+#: ../../developer/federation/index.md:158
 msgid "Undo"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:162
+#: ../../developer/federation/index.md:162
 msgid "[`Follow` objects](#follow)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:168
+#: ../../developer/federation/index.md:168
 msgid "When Funkwhale receives an `Undo` activity, it deletes the corresponding `Follow` from the database."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:172
+#: ../../developer/federation/index.md:172
 msgid "Funkwhale ensures the request actor is the same actor who sent the `Follow` activity before handling it."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:176
+#: ../../developer/federation/index.md:176
 msgid "In this example, **Alice** notifies **Bob** that she's undoing her follow."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:198
+#: ../../developer/federation/index.md:198
 msgid "Create"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:202
-#: ../../developer_documentation/federation/index.md:288
+#: ../../developer/federation/index.md:202
+#: ../../developer/federation/index.md:288
 msgid "[`Audio` objects](#audio)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:209
+#: ../../developer/federation/index.md:209
 msgid "See [the `Audio` object reference](#audio) for details on the object's structure."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:212
+#: ../../developer/federation/index.md:212
 msgid "When Funkwhale receives a `Create` activity with an [`Audio` object](#audio), it persists a local upload in the database. It then associates the upload to related library and track information. If no track matches the audio metadata, Funkwhale creates on using the `metadata` attribute in the object."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:216
+#: ../../developer/federation/index.md:216
 msgid "Funkwhale ensures the activity actor and library owner are the same before handling the activity. If the associated library has no local followers, Funkwhale discards the activity."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:220
+#: ../../developer/federation/index.md:220
 msgid "In this example, **Bob** creates new content in his library and sends a message to its followers."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:238
+#: ../../developer/federation/index.md:238
 msgid "Update"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:242
-#: ../../developer_documentation/federation/index.md:289
+#: ../../developer/federation/index.md:242
+#: ../../developer/federation/index.md:289
 msgid "[`Library` objects](#library)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:243
+#: ../../developer/federation/index.md:243
 msgid "[`Track` objects](#track)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:250
+#: ../../developer/federation/index.md:250
 msgid "See [the `Track` object reference](#track) and [`Library` object reference](#library) for details on the object's structure."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:253
+#: ../../developer/federation/index.md:253
 msgid "When Funkwhale receives an update associated with a [`Library`](#library) or [`Track`](#track) object, it attempts to update the corresponding object in its database."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:257
+#: ../../developer/federation/index.md:257
 msgid "Funkwhale performs different checks depending on the target of the update:"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:259
+#: ../../developer/federation/index.md:259
 msgid "For [`Library`](#library) objects, Funkwhale ensures the actor sending the message is the library owner"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:260
+#: ../../developer/federation/index.md:260
 msgid "For [`Track`](#track) objects, Funkwhale ensures the actor sending the message **either**:"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:261
+#: ../../developer/federation/index.md:261
 msgid "Matches the [`attributedTo`](#attributedto) property on the local copy of the object"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:262
+#: ../../developer/federation/index.md:262
 msgid "Is the [service actor](#service-actor)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:266
+#: ../../developer/federation/index.md:266
 msgid "In this example, **Bob** updates his library and sends a message to its followers."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:284
+#: ../../developer/federation/index.md:284
 msgid "Delete"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:295
+#: ../../developer/federation/index.md:295
 msgid "When Funkwhale receives a `Delete` activity, it deletes the associated object from the database."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:299
+#: ../../developer/federation/index.md:299
 msgid "Funkwhale ensures the actor initiating the activity is the owner of the associated object before handling it."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:0
-#: ../../developer_documentation/federation/index.md:518
+#: ../../developer/federation/index.md:0
+#: ../../developer/federation/index.md:518
 msgid "Library"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:308
+#: ../../developer/federation/index.md:308
 msgid "In this example, **Bob** deletes a library and notifies its followers."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:0
-#: ../../developer_documentation/federation/index.md:576
+#: ../../developer/federation/index.md:0
+#: ../../developer/federation/index.md:576
 msgid "Audio"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:333
+#: ../../developer/federation/index.md:333
 msgid "In this example, **Bob** deletes three audio objects in a library and notifies the library's followers."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:361
+#: ../../developer/federation/index.md:361
 msgid "Supported objects"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:363
+#: ../../developer/federation/index.md:363
 msgid "Artist"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:365
+#: ../../developer/federation/index.md:365
 msgid "An `Artist` is a custom object used to store musical artist and podcast creator information."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:367
-#: ../../developer_documentation/federation/index.md:408
-#: ../../developer_documentation/federation/index.md:467
-#: ../../developer_documentation/federation/index.md:526
-#: ../../developer_documentation/federation/index.md:584
+#: ../../developer/federation/index.md:367
+#: ../../developer/federation/index.md:408
+#: ../../developer/federation/index.md:467
+#: ../../developer/federation/index.md:526
+#: ../../developer/federation/index.md:584
 msgid "Properties"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:372
-#: ../../developer_documentation/federation/index.md:413
-#: ../../developer_documentation/federation/index.md:472
-#: ../../developer_documentation/federation/index.md:531
-#: ../../developer_documentation/federation/index.md:589
+#: ../../developer/federation/index.md:372
+#: ../../developer/federation/index.md:413
+#: ../../developer/federation/index.md:472
+#: ../../developer/federation/index.md:531
+#: ../../developer/federation/index.md:589
 msgid "Property"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:373
-#: ../../developer_documentation/federation/index.md:414
-#: ../../developer_documentation/federation/index.md:473
-#: ../../developer_documentation/federation/index.md:532
-#: ../../developer_documentation/federation/index.md:590
+#: ../../developer/federation/index.md:373
+#: ../../developer/federation/index.md:414
+#: ../../developer/federation/index.md:473
+#: ../../developer/federation/index.md:532
+#: ../../developer/federation/index.md:590
 msgid "Data type"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:374
-#: ../../developer_documentation/federation/index.md:415
-#: ../../developer_documentation/federation/index.md:474
-#: ../../developer_documentation/federation/index.md:533
-#: ../../developer_documentation/federation/index.md:591
+#: ../../developer/federation/index.md:374
+#: ../../developer/federation/index.md:415
+#: ../../developer/federation/index.md:474
+#: ../../developer/federation/index.md:533
+#: ../../developer/federation/index.md:591
 msgid "Description"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:375
-#: ../../developer_documentation/federation/index.md:416
-#: ../../developer_documentation/federation/index.md:475
-#: ../../developer_documentation/federation/index.md:534
-#: ../../developer_documentation/federation/index.md:592
+#: ../../developer/federation/index.md:375
+#: ../../developer/federation/index.md:416
+#: ../../developer/federation/index.md:475
+#: ../../developer/federation/index.md:534
+#: ../../developer/federation/index.md:592
 msgid "`type`*"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:376
-#: ../../developer_documentation/federation/index.md:382
-#: ../../developer_documentation/federation/index.md:417
-#: ../../developer_documentation/federation/index.md:423
-#: ../../developer_documentation/federation/index.md:476
-#: ../../developer_documentation/federation/index.md:482
-#: ../../developer_documentation/federation/index.md:535
-#: ../../developer_documentation/federation/index.md:541
-#: ../../developer_documentation/federation/index.md:556
-#: ../../developer_documentation/federation/index.md:593
-#: ../../developer_documentation/federation/index.md:599
+#: ../../developer/federation/index.md:376
+#: ../../developer/federation/index.md:382
+#: ../../developer/federation/index.md:417
+#: ../../developer/federation/index.md:423
+#: ../../developer/federation/index.md:476
+#: ../../developer/federation/index.md:482
+#: ../../developer/federation/index.md:535
+#: ../../developer/federation/index.md:541
+#: ../../developer/federation/index.md:556
+#: ../../developer/federation/index.md:593
+#: ../../developer/federation/index.md:599
 msgid "String"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:377
+#: ../../developer/federation/index.md:377
 msgid "The object type (`Artist`)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:378
-#: ../../developer_documentation/federation/index.md:419
-#: ../../developer_documentation/federation/index.md:478
-#: ../../developer_documentation/federation/index.md:537
-#: ../../developer_documentation/federation/index.md:595
+#: ../../developer/federation/index.md:378
+#: ../../developer/federation/index.md:419
+#: ../../developer/federation/index.md:478
+#: ../../developer/federation/index.md:537
+#: ../../developer/federation/index.md:595
 msgid "`id`*"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:379
-#: ../../developer_documentation/federation/index.md:420
-#: ../../developer_documentation/federation/index.md:479
-#: ../../developer_documentation/federation/index.md:538
-#: ../../developer_documentation/federation/index.md:544
-#: ../../developer_documentation/federation/index.md:550
-#: ../../developer_documentation/federation/index.md:553
-#: ../../developer_documentation/federation/index.md:596
-#: ../../developer_documentation/federation/index.md:611
+#: ../../developer/federation/index.md:379
+#: ../../developer/federation/index.md:420
+#: ../../developer/federation/index.md:479
+#: ../../developer/federation/index.md:538
+#: ../../developer/federation/index.md:544
+#: ../../developer/federation/index.md:550
+#: ../../developer/federation/index.md:553
+#: ../../developer/federation/index.md:596
+#: ../../developer/federation/index.md:611
 msgid "String (URI)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:380
+#: ../../developer/federation/index.md:380
 msgid "A URI that identifies the artist over federation"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:381
-#: ../../developer_documentation/federation/index.md:422
-#: ../../developer_documentation/federation/index.md:481
-#: ../../developer_documentation/federation/index.md:540
-#: ../../developer_documentation/federation/index.md:598
+#: ../../developer/federation/index.md:381
+#: ../../developer/federation/index.md:422
+#: ../../developer/federation/index.md:481
+#: ../../developer/federation/index.md:540
+#: ../../developer/federation/index.md:598
 msgid "`name`*"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:383
+#: ../../developer/federation/index.md:383
 msgid "The artist's name"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:384
-#: ../../developer_documentation/federation/index.md:428
-#: ../../developer_documentation/federation/index.md:487
-#: ../../developer_documentation/federation/index.md:613
+#: ../../developer/federation/index.md:384
+#: ../../developer/federation/index.md:428
+#: ../../developer/federation/index.md:487
+#: ../../developer/federation/index.md:613
 msgid "`published`*"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:385
-#: ../../developer_documentation/federation/index.md:429
-#: ../../developer_documentation/federation/index.md:432
-#: ../../developer_documentation/federation/index.md:488
-#: ../../developer_documentation/federation/index.md:614
-#: ../../developer_documentation/federation/index.md:617
+#: ../../developer/federation/index.md:385
+#: ../../developer/federation/index.md:429
+#: ../../developer/federation/index.md:432
+#: ../../developer/federation/index.md:488
+#: ../../developer/federation/index.md:614
+#: ../../developer/federation/index.md:617
 msgid "Datetime"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:386
-#: ../../developer_documentation/federation/index.md:430
+#: ../../developer/federation/index.md:386
+#: ../../developer/federation/index.md:430
 msgid "The date on which the artist was published over the federation"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:387
-#: ../../developer_documentation/federation/index.md:434
-#: ../../developer_documentation/federation/index.md:490
+#: ../../developer/federation/index.md:387
+#: ../../developer/federation/index.md:434
+#: ../../developer/federation/index.md:490
 msgid "`musicbrainzId`"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:388
-#: ../../developer_documentation/federation/index.md:435
-#: ../../developer_documentation/federation/index.md:491
+#: ../../developer/federation/index.md:388
+#: ../../developer/federation/index.md:435
+#: ../../developer/federation/index.md:491
 msgid "String (UUID)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:389
+#: ../../developer/federation/index.md:389
 msgid "The Musicbrainz artist ID"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:404
+#: ../../developer/federation/index.md:404
 msgid "Album"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:406
+#: ../../developer/federation/index.md:406
 msgid "An `Album` is a custom object used to store album and podcast series information."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:418
+#: ../../developer/federation/index.md:418
 msgid "The object type (`Album`)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:421
+#: ../../developer/federation/index.md:421
 msgid "A URI that identifies the album over federation"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:424
+#: ../../developer/federation/index.md:424
 msgid "The album's title"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:425
-#: ../../developer_documentation/federation/index.md:496
+#: ../../developer/federation/index.md:425
+#: ../../developer/federation/index.md:496
 msgid "`artists`"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:426
+#: ../../developer/federation/index.md:426
 msgid "Array of strings"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:427
+#: ../../developer/federation/index.md:427
 msgid "A list of [`Artist` objects](#artist) associated with the albums"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:431
+#: ../../developer/federation/index.md:431
 msgid "`released`"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:433
+#: ../../developer/federation/index.md:433
 msgid "The date on which the album was released"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:436
+#: ../../developer/federation/index.md:436
 msgid "The Musicbrainz release ID"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:437
+#: ../../developer/federation/index.md:437
 msgid "`cover`"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:438
-#: ../../developer_documentation/federation/index.md:620
+#: ../../developer/federation/index.md:438
+#: ../../developer/federation/index.md:620
 msgid "[`Link` object](https://www.w3.org/TR/activitystreams-vocabulary/#dfn-link)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:439
+#: ../../developer/federation/index.md:439
 msgid "A `Link` object representing the album cover"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:463
+#: ../../developer/federation/index.md:463
 msgid "Track"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:465
+#: ../../developer/federation/index.md:465
 msgid "A `Track` is a custom object used to store track information."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:477
+#: ../../developer/federation/index.md:477
 msgid "The object type (`Track`)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:480
+#: ../../developer/federation/index.md:480
 msgid "A URI that identifies the track over federation"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:483
+#: ../../developer/federation/index.md:483
 msgid "The track title"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:484
+#: ../../developer/federation/index.md:484
 msgid "`position`*"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:485
-#: ../../developer_documentation/federation/index.md:547
-#: ../../developer_documentation/federation/index.md:602
-#: ../../developer_documentation/federation/index.md:605
-#: ../../developer_documentation/federation/index.md:608
+#: ../../developer/federation/index.md:485
+#: ../../developer/federation/index.md:547
+#: ../../developer/federation/index.md:602
+#: ../../developer/federation/index.md:605
+#: ../../developer/federation/index.md:608
 msgid "Integer"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:486
+#: ../../developer/federation/index.md:486
 msgid "The position of the track in the album"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:489
+#: ../../developer/federation/index.md:489
 msgid "The date on which the track was published over the federation"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:492
+#: ../../developer/federation/index.md:492
 msgid "The Musicbrainz recording ID"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:493
+#: ../../developer/federation/index.md:493
 msgid "`album`"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:494
+#: ../../developer/federation/index.md:494
 msgid "[`Album` object](#album)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:495
+#: ../../developer/federation/index.md:495
 msgid "The album that contains the track"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:497
+#: ../../developer/federation/index.md:497
 msgid "Array of [`Artist` objects](#artist)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:498
+#: ../../developer/federation/index.md:498
 msgid "A list of artists associated to the track. This can differ from the album artists"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:521
+#: ../../developer/federation/index.md:521
 msgid "Crawling library pages requires authentication and an approved follow unless the library is public."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:524
+#: ../../developer/federation/index.md:524
 msgid "A `Library` is a custom object used to store music collection information. It inherits its behavior and properties from ActivityPub's [`Actor`](https://www.w3.org/TR/activitypub/#actors) and [`Collection`](https://www.w3.org/TR/activitypub/#collections) objects."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:536
+#: ../../developer/federation/index.md:536
 msgid "The object type (`Library`)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:539
+#: ../../developer/federation/index.md:539
 msgid "A URI that identifies the library over federation"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:542
+#: ../../developer/federation/index.md:542
 msgid "The library's name"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:543
+#: ../../developer/federation/index.md:543
 msgid "`followers`*"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:545
+#: ../../developer/federation/index.md:545
 msgid "The ID of the library's followers collection"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:546
+#: ../../developer/federation/index.md:546
 msgid "`totalItems`*"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:548
+#: ../../developer/federation/index.md:548
 msgid "The number of [`Audio` objects](#audio) in the library"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:549
+#: ../../developer/federation/index.md:549
 msgid "`first`*"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:551
+#: ../../developer/federation/index.md:551
 msgid "The URL of the library's first page"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:552
+#: ../../developer/federation/index.md:552
 msgid "`last`*"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:554
+#: ../../developer/federation/index.md:554
 msgid "The URL of the library's last page"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:555
+#: ../../developer/federation/index.md:555
 msgid "`summary`"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:557
+#: ../../developer/federation/index.md:557
 msgid "The library's description"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:579
+#: ../../developer/federation/index.md:579
 msgid "Accessing audio files requires authentication and an approved follow for the containing library unless the library is public."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:582
+#: ../../developer/federation/index.md:582
 msgid "An `Audio` object is a custom object used to store upload information. It extends the [ActivityStreams Audio object](https://www.w3.org/TR/activitystreams-vocabulary/#dfn-audio) with custom attributes."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:594
+#: ../../developer/federation/index.md:594
 msgid "The object type (`Audio`)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:597
+#: ../../developer/federation/index.md:597
 msgid "A URI that identifies the audio over federation"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:600
+#: ../../developer/federation/index.md:600
 msgid "A readable title for the order. Funkwhale concatenates the track name, album title, and artist name"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:601
+#: ../../developer/federation/index.md:601
 msgid "`size`*"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:603
+#: ../../developer/federation/index.md:603
 msgid "The size of the audio in bytes"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:604
+#: ../../developer/federation/index.md:604
 msgid "`bitrate`*"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:606
+#: ../../developer/federation/index.md:606
 msgid "The bitrate of the audio in bytes/s"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:607
+#: ../../developer/federation/index.md:607
 msgid "`duration`*"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:609
+#: ../../developer/federation/index.md:609
 msgid "The duration of the audio in seconds"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:610
+#: ../../developer/federation/index.md:610
 msgid "`library`*"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:612
+#: ../../developer/federation/index.md:612
 msgid "The ID of the audio's containing [`Library` object](#library)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:615
+#: ../../developer/federation/index.md:615
 msgid "The date on which the audio was published over the federation"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:616
+#: ../../developer/federation/index.md:616
 msgid "`updated`*"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:618
+#: ../../developer/federation/index.md:618
 msgid "The date on which the audio was last updated over the federation"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:619
+#: ../../developer/federation/index.md:619
 msgid "`url`*"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:621
+#: ../../developer/federation/index.md:621
 msgid "A `Link` object object containing the download location of the audio file"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:622
+#: ../../developer/federation/index.md:622
 msgid "`track`"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:623
+#: ../../developer/federation/index.md:623
 msgid "[`Track` object](#track)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:624
+#: ../../developer/federation/index.md:624
 msgid "The track associated with the audio file"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:649
+#: ../../developer/federation/index.md:649
 msgid "Audio fetching on restricted libraries"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:651
+#: ../../developer/federation/index.md:651
 msgid "[`Library` objects](#library) and [`Audio` objects] are subject to the following access rules:"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:658
+#: ../../developer/federation/index.md:658
 msgid "Public libraries can be accessed by actors without restriction"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:659
+#: ../../developer/federation/index.md:659
 msgid "Restricted libraries can only be accessed if the HTTP request is signed by an actor who has an associated **approved** [`Follow` activity](#follow)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:665
+#: ../../developer/federation/index.md:665
 msgid "Audio items in public libraries can be accessed by actors without restriction"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:666
+#: ../../developer/federation/index.md:666
 msgid "Audio items in restricted libraries can only be accessed if the HTTP request is signed by an actor who has an associated **approved** [`Follow` activity](#follow)"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:671
+#: ../../developer/federation/index.md:671
 msgid "Custom properties"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:673
+#: ../../developer/federation/index.md:673
 msgid "attributedTo"
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:675
+#: ../../developer/federation/index.md:675
 msgid "Funkwhale uses the `attributedTo` property to denote the actor responsible for an object. If an object has an `attributedTo` attributed, the associated actor can perform activities to it, including [`Update`](#update) and [`Delete`](#delete)."
 msgstr ""
 
-#: ../../developer_documentation/federation/index.md:677
+#: ../../developer/federation/index.md:677
 msgid "Funkwhale also attributes all objects on a domain with the domain's [Service actor](#service-actor)"
 msgstr ""
diff --git a/docs/locales/gettext/developer/index.pot b/docs/locales/gettext/developer/index.pot
index 70acc18a7..4578be91b 100644
--- a/docs/locales/gettext/developer/index.pot
+++ b/docs/locales/gettext/developer/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,34 +16,34 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/index.md:1
+#: ../../developer/index.md:1
 msgid "Get started"
 msgstr ""
 
-#: ../../developer_documentation/index.md:3
+#: ../../developer/index.md:3
 msgid "Funkwhale welcomes contributions from all developers. If this is your first time contributing to an open source project, don't be afraid to get stuck in! The Funkwhale community will guide you through the process and help you grow your confidence."
 msgstr ""
 
-#: ../../developer_documentation/index.md:5
+#: ../../developer/index.md:5
 msgid "Set up your development environment"
 msgstr ""
 
-#: ../../developer_documentation/index.md:7
+#: ../../developer/index.md:7
 msgid "Before you begin, you need to set up a development environment. Follow the [guides in the setup section](setup/index.md) to set up an environment that's right for you."
 msgstr ""
 
-#: ../../developer_documentation/index.md:9
+#: ../../developer/index.md:9
 msgid "Read up on our processes"
 msgstr ""
 
-#: ../../developer_documentation/index.md:11
+#: ../../developer/index.md:11
 msgid "The Funkwhale project follows a few processes to make managing contributions easier. If you're not sure how to get started, check out the [guides in the workflows section](workflows/index.md) to get a better understanding of what you need to do."
 msgstr ""
 
-#: ../../developer_documentation/index.md:13
+#: ../../developer/index.md:13
 msgid "Contribute to the codebase"
 msgstr ""
 
-#: ../../developer_documentation/index.md:15
+#: ../../developer/index.md:15
 msgid "Ready to get stuck in? Take a look at the [contribution guides](contribute/index.md) and start making your changes!"
 msgstr ""
diff --git a/docs/locales/gettext/developer/plugins/create.pot b/docs/locales/gettext/developer/plugins/create.pot
index 12304a7c4..d4247796d 100644
--- a/docs/locales/gettext/developer/plugins/create.pot
+++ b/docs/locales/gettext/developer/plugins/create.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,59 +16,59 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/plugins/create.md:1
+#: ../../developer/plugins/create.md:1
 msgid "Write a plugin"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:3
+#: ../../developer/plugins/create.md:3
 msgid "You can write plugins to extend the features of your Funkwhale pod. Follow the instructions in this guide to get started with your first plugin."
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:10
+#: ../../developer/plugins/create.md:10
 msgid "Before you begin"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:12
+#: ../../developer/plugins/create.md:12
 msgid "Before you start writing your plugin, you need to understand the following core concepts:"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:19
+#: ../../developer/plugins/create.md:19
 msgid "We'll explain each of these concepts in the next few sections"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:21
+#: ../../developer/plugins/create.md:21
 msgid "Scopes"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:23
+#: ../../developer/plugins/create.md:23
 msgid "Plugins fall into two different **scopes**:"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:25
+#: ../../developer/plugins/create.md:25
 msgid "User-level plugins that are configured by end-users for their own use"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:26
+#: ../../developer/plugins/create.md:26
 msgid "Pod-level plugins that are configured by pod admins and are not connected to a particular user"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:28
+#: ../../developer/plugins/create.md:28
 msgid "User-level plugins can also be used to import files from a third-party service, such as cloud storage or FTP."
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:30
+#: ../../developer/plugins/create.md:30
 msgid "Hooks"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:32
+#: ../../developer/plugins/create.md:32
 msgid "**Hooks** are entrypoints that allow your plugin to listen to changes. You can create hooks to react to different events that occur in the Funkwhale application."
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:34
+#: ../../developer/plugins/create.md:34
 msgid "An example of this can be seen in our Scrobbler plugin. We register a `LISTENING_CREATED` hook to notify any registered callback function when a listening is recorded. When a user listens to a track, the `notfy_lastfm` function fires."
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:45
+#: ../../developer/plugins/create.md:45
 msgid "Available hooks"
 msgstr ""
 
@@ -76,19 +76,19 @@ msgstr ""
 msgid "Called when a track is being listened"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:51
+#: ../../developer/plugins/create.md:51
 msgid "Filters"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:53
+#: ../../developer/plugins/create.md:53
 msgid "**Filters** are entrypoints that allow you to modify or add information. When you use the `register_filter` decorator, your function should return a value to be used by the server."
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:55
+#: ../../developer/plugins/create.md:55
 msgid "In this example, the `PLUGINS_DEPENDENCIES` filter is used to install additional dependencies required by your plugin. The `dependencies` function returns the additional dependency `django_prometheus` to request the dependency be installed by the server."
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:68
+#: ../../developer/plugins/create.md:68
 msgid "Available filters"
 msgstr ""
 
@@ -112,173 +112,173 @@ msgstr ""
 msgid "Called with an empty list, use this filter to register new urls and views"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:78
+#: ../../developer/plugins/create.md:78
 msgid "Write your plugin"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:80
+#: ../../developer/plugins/create.md:80
 msgid "Once you know what type of plugin you want to write and what entrypoint you want to use, you can start writing your plugin."
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:82
+#: ../../developer/plugins/create.md:82
 msgid "Plugins are made up of the following 3 files:"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:84
+#: ../../developer/plugins/create.md:84
 msgid "`__init__.py` - indicates that the directory is a Python package"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:85
+#: ../../developer/plugins/create.md:85
 msgid "`funkwhale_startup.py` - the file that loads during Funkwhale initialization"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:86
+#: ../../developer/plugins/create.md:86
 msgid "`funkwhale_ready.py` - the file that loads when Funkwhale is configured and ready"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:88
+#: ../../developer/plugins/create.md:88
 msgid "Declare your plugin"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:90
+#: ../../developer/plugins/create.md:90
 msgid "You need to declare your plugin and its configuration options so that Funkwhale knows how to load the plugin. To do this, you must declare a new `plugins` instance in your `funkwhale_startup.py` file."
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:92
+#: ../../developer/plugins/create.md:92
 msgid "Your `plugins` should include the following information:"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:98
+#: ../../developer/plugins/create.md:98
 msgid "Parameter"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:99
+#: ../../developer/plugins/create.md:99
 msgid "Data type"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:100
+#: ../../developer/plugins/create.md:100
 msgid "Description"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:101
+#: ../../developer/plugins/create.md:101
 msgid "`name`"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:102
-#: ../../developer_documentation/plugins/create.md:105
-#: ../../developer_documentation/plugins/create.md:108
-#: ../../developer_documentation/plugins/create.md:111
+#: ../../developer/plugins/create.md:102
+#: ../../developer/plugins/create.md:105
+#: ../../developer/plugins/create.md:108
+#: ../../developer/plugins/create.md:111
 msgid "String"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:103
+#: ../../developer/plugins/create.md:103
 msgid "The name of your plugin, used in the `.env` file"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:104
+#: ../../developer/plugins/create.md:104
 msgid "`label`"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:106
+#: ../../developer/plugins/create.md:106
 msgid "The readable label that appears in the Funkwhale frontend"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:107
+#: ../../developer/plugins/create.md:107
 msgid "`description`"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:109
+#: ../../developer/plugins/create.md:109
 msgid "A meaningful description of your plugin and what it does"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:110
+#: ../../developer/plugins/create.md:110
 msgid "`version`"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:112
+#: ../../developer/plugins/create.md:112
 msgid "The version number of your plugin"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:113
+#: ../../developer/plugins/create.md:113
 msgid "`user`"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:114
+#: ../../developer/plugins/create.md:114
 msgid "Boolean"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:115
+#: ../../developer/plugins/create.md:115
 msgid "Whether the plugin is a **user-level** plugin or a **pod-level** plugin. See [scopes](#scopes) for more information"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:116
+#: ../../developer/plugins/create.md:116
 msgid "`conf`"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:117
+#: ../../developer/plugins/create.md:117
 msgid "Array of Objects"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:118
+#: ../../developer/plugins/create.md:118
 msgid "A list of configuration options"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:121
+#: ../../developer/plugins/create.md:121
 msgid "In this example, we declare a new **user-level** plugin called \"My Plugin\". The user can configure a `greeting` in the plugin configuration."
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:140
+#: ../../developer/plugins/create.md:140
 msgid "Write your plugin logic"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:142
+#: ../../developer/plugins/create.md:142
 msgid "Once you've declared your plugin, you can write the plugin code in your `funkwhale_ready.py` file."
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:145
+#: ../../developer/plugins/create.md:145
 msgid "You must import your plugin declaration from your `funkwhale_startup.py` file."
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:148
+#: ../../developer/plugins/create.md:148
 msgid "In this example, we create a simple API endpoint that returns a greeting to the user. To do this:"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:150
+#: ../../developer/plugins/create.md:150
 msgid "We create a new APIView class that accepts a `GET` request"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:151
+#: ../../developer/plugins/create.md:151
 msgid "We read the greeting value from the plugin `conf`"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:152
+#: ../../developer/plugins/create.md:152
 msgid "We return the greeting value with the user's username"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:153
+#: ../../developer/plugins/create.md:153
 msgid "We register this view at the endpoint `/greeting`"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:193
+#: ../../developer/plugins/create.md:193
 msgid "Result"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:195
+#: ../../developer/plugins/create.md:195
 msgid "Here is an example of how the above plugin works:"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:197
+#: ../../developer/plugins/create.md:197
 msgid "User \"Harry\" enables the plugin"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:198
+#: ../../developer/plugins/create.md:198
 msgid "\"Harry\" changes the greeting to \"You're a wizard\""
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:199
+#: ../../developer/plugins/create.md:199
 msgid "\"Harry\" visits the `/greeting` endpoint in their browser"
 msgstr ""
 
-#: ../../developer_documentation/plugins/create.md:200
+#: ../../developer/plugins/create.md:200
 msgid "The browser returns the message \"You're a wizard Harry\""
 msgstr ""
diff --git a/docs/locales/gettext/developer/plugins/index.pot b/docs/locales/gettext/developer/plugins/index.pot
index e38084649..02e7ddb1d 100644
--- a/docs/locales/gettext/developer/plugins/index.pot
+++ b/docs/locales/gettext/developer/plugins/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,18 +16,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/plugins/index.md:7
+#: ../../developer/plugins/index.md:7
 msgid "Resources"
 msgstr ""
 
-#: ../../developer_documentation/plugins/index.md:1
+#: ../../developer/plugins/index.md:1
 msgid "Funkwhale plugins"
 msgstr ""
 
-#: ../../developer_documentation/plugins/index.md:3
+#: ../../developer/plugins/index.md:3
 msgid "Plugins can be used to extend Funkwhale's featureset without needing to touch the underlying code. Plugins can extend existing features, add support for third-party services, or introduce cosmetic changes to the Funkwhale webapp."
 msgstr ""
 
-#: ../../developer_documentation/plugins/index.md:5
+#: ../../developer/plugins/index.md:5
 msgid "Plugins have been supported since Funkwhale 1.0. Some core plugins, such as the standard Scrobbler plugin, are maintained by the Funkwhale team."
 msgstr ""
diff --git a/docs/locales/gettext/developer/plugins/install.pot b/docs/locales/gettext/developer/plugins/install.pot
index 469f303db..fff5f2ce6 100644
--- a/docs/locales/gettext/developer/plugins/install.pot
+++ b/docs/locales/gettext/developer/plugins/install.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,52 +16,52 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/plugins/install.md:1
+#: ../../developer/plugins/install.md:1
 msgid "Install a plugin"
 msgstr ""
 
-#: ../../developer_documentation/plugins/install.md:3
+#: ../../developer/plugins/install.md:3
 msgid "Once you have [created your plugin](create.md), you can install it on your Funkwhale pod."
 msgstr ""
 
-#: ../../developer_documentation/plugins/install.md:5
+#: ../../developer/plugins/install.md:5
 msgid "Install a local plugin"
 msgstr ""
 
-#: ../../developer_documentation/plugins/install.md:7
+#: ../../developer/plugins/install.md:7
 msgid "To install a plugin located on your server:"
 msgstr ""
 
-#: ../../developer_documentation/plugins/install.md:9
+#: ../../developer/plugins/install.md:9
 msgid "Add the plugin directory to the `FUNKWHALE_PLUGINS_PATH` variable in your `.env` file"
 msgstr ""
 
-#: ../../developer_documentation/plugins/install.md:10
-#: ../../developer_documentation/plugins/install.md:22
+#: ../../developer/plugins/install.md:10
+#: ../../developer/plugins/install.md:22
 msgid "Add the plugin name to the `FUNKWHALE_PLUGINS` variable in your `.env` file"
 msgstr ""
 
-#: ../../developer_documentation/plugins/install.md:16
-#: ../../developer_documentation/plugins/install.md:50
+#: ../../developer/plugins/install.md:16
+#: ../../developer/plugins/install.md:50
 msgid "Restart Funkwhale to pick up the changes"
 msgstr ""
 
-#: ../../developer_documentation/plugins/install.md:18
+#: ../../developer/plugins/install.md:18
 msgid "Install a third-party plugin"
 msgstr ""
 
-#: ../../developer_documentation/plugins/install.md:20
+#: ../../developer/plugins/install.md:20
 msgid "You can install third-party plugins using the `funkwhale-manage` command line interface. To do this:"
 msgstr ""
 
-#: ../../developer_documentation/plugins/install.md:28
+#: ../../developer/plugins/install.md:28
 msgid "Call the `funkwhale-manage` command line interface with the location of the plugin archive"
 msgstr ""
 
-#: ../../developer_documentation/plugins/install.md:0
+#: ../../developer/plugins/install.md:0
 msgid "Debian"
 msgstr ""
 
-#: ../../developer_documentation/plugins/install.md:0
+#: ../../developer/plugins/install.md:0
 msgid "Docker"
 msgstr ""
diff --git a/docs/locales/gettext/developer/setup/docker.pot b/docs/locales/gettext/developer/setup/docker.pot
index 05c029994..0a7998885 100644
--- a/docs/locales/gettext/developer/setup/docker.pot
+++ b/docs/locales/gettext/developer/setup/docker.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,182 +16,182 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/setup/docker.md:1
+#: ../../developer/setup/docker.md:1
 msgid "Develop using Docker"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:3
+#: ../../developer/setup/docker.md:3
 msgid "Funkwhale can be run in Docker containers for local development. You can work on any part of the Funkwhale codebase and run the container setup to test your changes. To work with Docker:"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:5
+#: ../../developer/setup/docker.md:5
 msgid "[Install Docker](https://docs.docker.com/install)"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:6
+#: ../../developer/setup/docker.md:6
 msgid "[Install docker compose](https://docs.docker.com/compose/install)"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:7
+#: ../../developer/setup/docker.md:7
 msgid "Clone the Funkwhale repository to your system. The `develop` branch is checked out by default"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:0
+#: ../../developer/setup/docker.md:0
 msgid "SSH"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:0
+#: ../../developer/setup/docker.md:0
 msgid "HTTPS"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:31
+#: ../../developer/setup/docker.md:31
 msgid "Set up your Docker environment"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:35
+#: ../../developer/setup/docker.md:35
 msgid "Funkwhale provides a `dev.yml` file that contains the required docker compose setup. You need to pass the `-f dev.yml` flag you run docker compose commands to ensure it uses this file. If you don't want to add this each time, you can export it as a `COMPOSE_FILE` variable:"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:43
+#: ../../developer/setup/docker.md:43
 msgid "To set up your Docker environment:"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:45
+#: ../../developer/setup/docker.md:45
 msgid "Create a `.env` file to enable customization of your setup."
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:51
+#: ../../developer/setup/docker.md:51
 msgid "Add the following variables to load images and enable access to Django admin pages:"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:58
+#: ../../developer/setup/docker.md:58
 msgid "Create a network for federation support"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:64
+#: ../../developer/setup/docker.md:64
 msgid "Once you've set everything up, you need to build the containers. Run this command any time there are upstream changes or dependency changes to ensure you're up-to-date."
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:70
+#: ../../developer/setup/docker.md:70
 msgid "Set up the database"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:72
+#: ../../developer/setup/docker.md:72
 msgid "Funkwhale relies on a postgresql database to store information. To set this up, you need to run the `funkwhale-manage migrate` command:"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:78
+#: ../../developer/setup/docker.md:78
 msgid "This command creates all the required tables. You need to run this whenever there are changes to the API schema. You can run this at any time without causing issues."
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:80
+#: ../../developer/setup/docker.md:80
 msgid "Set up local data"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:82
+#: ../../developer/setup/docker.md:82
 msgid "You need to create some local data to mimic a production environment."
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:84
+#: ../../developer/setup/docker.md:84
 msgid "Create a superuser so you can log in to your local app:"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:90
+#: ../../developer/setup/docker.md:90
 msgid "Add some fake data to populate the database. The following command creates 25 artists with random albums, tracks, and metadata."
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:98
+#: ../../developer/setup/docker.md:98
 msgid "Manage services"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:100
+#: ../../developer/setup/docker.md:100
 msgid "Once you have set up your containers, bring them up to start working on them."
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:102
+#: ../../developer/setup/docker.md:102
 msgid "Compile the translations:"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:108
+#: ../../developer/setup/docker.md:108
 msgid "Launch all services:"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:114
+#: ../../developer/setup/docker.md:114
 msgid "This gives you access to the following:"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:116
+#: ../../developer/setup/docker.md:116
 msgid "The Funkwhale webapp on `http://localhost:8000`"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:117
+#: ../../developer/setup/docker.md:117
 msgid "The Funkwhale API on `http://localhost:8000/api/v1`"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:118
+#: ../../developer/setup/docker.md:118
 msgid "The Django admin interface on `http://localhost:8000/api/admin`"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:120
+#: ../../developer/setup/docker.md:120
 msgid "Once you're done with the containers, you can stop them all:"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:126
+#: ../../developer/setup/docker.md:126
 msgid "If you want to destroy your containers, run the following:"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:132
+#: ../../developer/setup/docker.md:132
 msgid "Set up federation support"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:134
+#: ../../developer/setup/docker.md:134
 msgid "Working on federation features requires some additional setup. You need to do the following:"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:136
+#: ../../developer/setup/docker.md:136
 msgid "Update your DNS resolver to resolve all your .dev hostnames locally"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:137
+#: ../../developer/setup/docker.md:137
 msgid "Set up a reverse proxy (such as traefik) to catch .dev requests with a TLS certificate"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:138
+#: ../../developer/setup/docker.md:138
 msgid "Set up two or more local instances"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:140
+#: ../../developer/setup/docker.md:140
 msgid "To resolve hostnames locally, run the following:"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:0
+#: ../../developer/setup/docker.md:0
 msgid "dnsmasq"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:0
+#: ../../developer/setup/docker.md:0
 msgid "NetworkManager"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:164
+#: ../../developer/setup/docker.md:164
 msgid "To add a wildcard certificate, copy the test certificate from the `docker/ssl` folder. This certificate is a wildcard for `*.funkwhale.test`"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:171
+#: ../../developer/setup/docker.md:171
 msgid "To run a reverse proxy for your app:"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:173
+#: ../../developer/setup/docker.md:173
 msgid "Add the following configuration to your `.env` file:"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:186
+#: ../../developer/setup/docker.md:186
 msgid "Launch traefik using the bundled configuration:"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:192
+#: ../../developer/setup/docker.md:192
 msgid "Set up as many different projects as you need. Make sure the `COMPOSE_PROJECT_NAME` and `VUE_PORT` variables are unique per instance"
 msgstr ""
 
-#: ../../developer_documentation/setup/docker.md:202
+#: ../../developer/setup/docker.md:202
 msgid "You can access your project at `https://{COMPOSE_PROJECT_NAME}.funkwhale.test`."
 msgstr ""
diff --git a/docs/locales/gettext/developer/setup/gitpod.pot b/docs/locales/gettext/developer/setup/gitpod.pot
index 8f960a784..73f0889ab 100644
--- a/docs/locales/gettext/developer/setup/gitpod.pot
+++ b/docs/locales/gettext/developer/setup/gitpod.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,167 +16,167 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/setup/gitpod.md:1
+#: ../../developer/setup/gitpod.md:1
 msgid "Develop using Gitpod"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:4
+#: ../../developer/setup/gitpod.md:4
 msgid "You need a GitHub or GitLab.com account to log in to Gitpod."
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:7
+#: ../../developer/setup/gitpod.md:7
 msgid "Funkwhale has a Gitpod instance that gives you all the tools you need to work on Funkwhale's code. You can work on the code in-browser using a hosted VS Code install or open VS Code on your desktop over SSH."
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:9
+#: ../../developer/setup/gitpod.md:9
 msgid "You can open Gitpod directly by clicking the link below. This checks out the `develop` branch for you to work on directly."
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:11
+#: ../../developer/setup/gitpod.md:11
 msgid "[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://dev.funkwhale.audio/funkwhale/funkwhale)"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:11
+#: ../../developer/setup/gitpod.md:11
 msgid "Open in Gitpod"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:13
+#: ../../developer/setup/gitpod.md:13
 msgid "If you want to work on a particular branch, commit, or merge request, you can do this straight from the GitLab interface. Select the arrow icon on the {guilabel}`Web IDE` button and select {guilabel}`Gitpod` to open Gitpod with the currently selected branch checked out."
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:15
+#: ../../developer/setup/gitpod.md:15
 msgid "![Select Gitpod as the default web IDE](./gitpod-select-gitpod-in-gitlab.png)"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:15
+#: ../../developer/setup/gitpod.md:15
 msgid "Select Gitpod as the default web IDE"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:17
+#: ../../developer/setup/gitpod.md:17
 msgid "When you start Gitpod, it creates the following using the selected branch:"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:19
+#: ../../developer/setup/gitpod.md:19
 msgid "A Funkwhale API instance"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:20
+#: ../../developer/setup/gitpod.md:20
 msgid "A Funkwhale frontend instance"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:22
+#: ../../developer/setup/gitpod.md:22
 msgid "You can access the web app at `http://localhost:8000`. Log in with the following credentials:"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:24
+#: ../../developer/setup/gitpod.md:24
 msgid "Username – `gitpod`"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:25
+#: ../../developer/setup/gitpod.md:25
 msgid "Password – `gitpod`"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:27
+#: ../../developer/setup/gitpod.md:27
 msgid "Work on the frontend"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:29
+#: ../../developer/setup/gitpod.md:29
 msgid "By default, Gitpod spins up an entire Funkwhale stack. If you want to work only on the frontend:"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:31
+#: ../../developer/setup/gitpod.md:31
 msgid "Select `File` > `Open Folder`"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:32
+#: ../../developer/setup/gitpod.md:32
 msgid "Select `/workspace/funkwhale/front`"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:34
+#: ../../developer/setup/gitpod.md:34
 msgid "Gitpod starts a new Vite server on port 4000. This creates a frontend that isn't connected to any instance."
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:36
+#: ../../developer/setup/gitpod.md:36
 msgid "GitLab Workflow extension"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:38
+#: ../../developer/setup/gitpod.md:38
 msgid "Gitpod offers a GitLab workflow extension to help manage GitLab issues, merge requests, and pipelines. If you want to use it:"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:40
+#: ../../developer/setup/gitpod.md:40
 msgid "Navigate to the personal access token section of your [GitLab profile settings](https://dev.funkwhale.audio/-/profile/personal_access_tokens)"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:41
+#: ../../developer/setup/gitpod.md:41
 msgid "Create a personal access token with `api` and `read_user` scopes"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:42
+#: ../../developer/setup/gitpod.md:42
 msgid "Paste your token into your [Gitpod variables](https://gitpod.io/variables)"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:44
+#: ../../developer/setup/gitpod.md:44
 msgid "Use the following settings to automatically sign in to the extension with Gitpod. The `funkwhale/*` scope ensures you can use the settings for all Funkwhale-hosted projects."
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:46
-#: ../../developer_documentation/setup/gitpod.md:64
+#: ../../developer/setup/gitpod.md:46
+#: ../../developer/setup/gitpod.md:64
 msgid "Environment variables"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:49
-#: ../../developer_documentation/setup/gitpod.md:67
+#: ../../developer/setup/gitpod.md:49
+#: ../../developer/setup/gitpod.md:67
 msgid "Name"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:50
-#: ../../developer_documentation/setup/gitpod.md:68
+#: ../../developer/setup/gitpod.md:50
+#: ../../developer/setup/gitpod.md:68
 msgid "Value"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:51
-#: ../../developer_documentation/setup/gitpod.md:69
+#: ../../developer/setup/gitpod.md:51
+#: ../../developer/setup/gitpod.md:69
 msgid "Scope"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:52
+#: ../../developer/setup/gitpod.md:52
 msgid "`GITLAB_WORKFLOW_INSTANCE_URL`"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:53
+#: ../../developer/setup/gitpod.md:53
 msgid "`https://dev.funkwhale.audio`"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:54
-#: ../../developer_documentation/setup/gitpod.md:57
+#: ../../developer/setup/gitpod.md:54
+#: ../../developer/setup/gitpod.md:57
 msgid "`funkwhale/*`"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:55
+#: ../../developer/setup/gitpod.md:55
 msgid "`GITLAB_WORKFLOW_TOKEN`"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:56
+#: ../../developer/setup/gitpod.md:56
 msgid "Your token"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:60
+#: ../../developer/setup/gitpod.md:60
 msgid "Configure custom instance URL"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:62
+#: ../../developer/setup/gitpod.md:62
 msgid "You can configure Gitpod to use your Funkwhale pod as the default server. This means you can test frontend changes on your pod without selecting it each time. To do this, add the following to your [Gitpod variables](https://gitpod.io/variables):"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:70
+#: ../../developer/setup/gitpod.md:70
 msgid "`VUE_APP_INSTANCE_URL`"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:71
+#: ../../developer/setup/gitpod.md:71
 msgid "`https://funkwhale.example.com`"
 msgstr ""
 
-#: ../../developer_documentation/setup/gitpod.md:72
+#: ../../developer/setup/gitpod.md:72
 msgid "`funkwhale/funkwhale`"
 msgstr ""
diff --git a/docs/locales/gettext/developer/setup/index.pot b/docs/locales/gettext/developer/setup/index.pot
index e1a9c2064..9706c7259 100644
--- a/docs/locales/gettext/developer/setup/index.pot
+++ b/docs/locales/gettext/developer/setup/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/setup/index.md:5
+#: ../../developer/setup/index.md:5
 msgid "Choose your setup"
 msgstr ""
 
-#: ../../developer_documentation/setup/index.md:1
+#: ../../developer/setup/index.md:1
 msgid "Set up your development environment"
 msgstr ""
 
-#: ../../developer_documentation/setup/index.md:3
+#: ../../developer/setup/index.md:3
 msgid "Follow the instructions in these guides to set up your development environment."
 msgstr ""
diff --git a/docs/locales/gettext/developer/setup/vite.pot b/docs/locales/gettext/developer/setup/vite.pot
index 43154d6c6..ac69c54da 100644
--- a/docs/locales/gettext/developer/setup/vite.pot
+++ b/docs/locales/gettext/developer/setup/vite.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,42 +16,42 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/setup/vite.md:1
+#: ../../developer/setup/vite.md:1
 msgid "Develop using Vite"
 msgstr ""
 
-#: ../../developer_documentation/setup/vite.md:3
+#: ../../developer/setup/vite.md:3
 msgid "If you want to make changes to the frontend, you can use Vite to run a development server. This allows you to run a Funkwhale web app and see changes in real time"
 msgstr ""
 
-#: ../../developer_documentation/setup/vite.md:5
+#: ../../developer/setup/vite.md:5
 msgid "Clone the repository:"
 msgstr ""
 
-#: ../../developer_documentation/setup/vite.md:0
+#: ../../developer/setup/vite.md:0
 msgid "SSH"
 msgstr ""
 
-#: ../../developer_documentation/setup/vite.md:0
+#: ../../developer/setup/vite.md:0
 msgid "HTTPS"
 msgstr ""
 
-#: ../../developer_documentation/setup/vite.md:29
+#: ../../developer/setup/vite.md:29
 msgid "Install [Node.js](https://nodejs.org/en/download/package-manager/) and [Yarn](https://classic.yarnpkg.com/lang/en/docs/install/)"
 msgstr ""
 
-#: ../../developer_documentation/setup/vite.md:30
+#: ../../developer/setup/vite.md:30
 msgid "Install all dependencies:"
 msgstr ""
 
-#: ../../developer_documentation/setup/vite.md:36
+#: ../../developer/setup/vite.md:36
 msgid "Compile the translations:"
 msgstr ""
 
-#: ../../developer_documentation/setup/vite.md:42
+#: ../../developer/setup/vite.md:42
 msgid "Launch the development server:"
 msgstr ""
 
-#: ../../developer_documentation/setup/vite.md:48
+#: ../../developer/setup/vite.md:48
 msgid "You can access the Funkwhale web app at `http://localhost:8000/front`. Connect this app to your pod by selecting {guilabel}`Switch instance` in the sidebar."
 msgstr ""
diff --git a/docs/locales/gettext/developer/workflows/changelog.pot b/docs/locales/gettext/developer/workflows/changelog.pot
index d60d56f70..29c4b82e5 100644
--- a/docs/locales/gettext/developer/workflows/changelog.pot
+++ b/docs/locales/gettext/developer/workflows/changelog.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,58 +16,58 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/workflows/changelog.md:1
+#: ../../developer/workflows/changelog.md:1
 msgid "Changelog fragments"
 msgstr ""
 
-#: ../../developer_documentation/workflows/changelog.md:3
+#: ../../developer/workflows/changelog.md:3
 msgid "We try to add changelog fragments when we make changes so that we can show users what we've done. These fragments are small text files that contain a summary of changes. When we make a release, we compile these into a full changelog using [towncrier](https://pypi.org/project/towncrier/)."
 msgstr ""
 
-#: ../../developer_documentation/workflows/changelog.md:5
+#: ../../developer/workflows/changelog.md:5
 msgid "Each changelog fragment should contain a short and meaningful summary of changes and include the issue number (where applicable). For example:"
 msgstr ""
 
-#: ../../developer_documentation/workflows/changelog.md:11
+#: ../../developer/workflows/changelog.md:11
 msgid "If there's no issue, insert the merge request identifier instead:"
 msgstr ""
 
-#: ../../developer_documentation/workflows/changelog.md:17
+#: ../../developer/workflows/changelog.md:17
 msgid "Naming"
 msgstr ""
 
-#: ../../developer_documentation/workflows/changelog.md:19
+#: ../../developer/workflows/changelog.md:19
 msgid "Changelog fragments use the following naming convention: `changes/changelog.d/<name>.category>`. The `<name>` can be anything that describes your work, or the issue ID. The category can be one of the following:"
 msgstr ""
 
-#: ../../developer_documentation/workflows/changelog.md:21
+#: ../../developer/workflows/changelog.md:21
 msgid "`feature` – a new feature"
 msgstr ""
 
-#: ../../developer_documentation/workflows/changelog.md:22
+#: ../../developer/workflows/changelog.md:22
 msgid "`enhancement` – an extension of an existing feature"
 msgstr ""
 
-#: ../../developer_documentation/workflows/changelog.md:23
+#: ../../developer/workflows/changelog.md:23
 msgid "`bugfix` – a bugfix or patch"
 msgstr ""
 
-#: ../../developer_documentation/workflows/changelog.md:24
+#: ../../developer/workflows/changelog.md:24
 msgid "`refactoring` – refactored code"
 msgstr ""
 
-#: ../../developer_documentation/workflows/changelog.md:25
+#: ../../developer/workflows/changelog.md:25
 msgid "`doc` – new documentation"
 msgstr ""
 
-#: ../../developer_documentation/workflows/changelog.md:26
+#: ../../developer/workflows/changelog.md:26
 msgid "`i18n` – internationalization-related work"
 msgstr ""
 
-#: ../../developer_documentation/workflows/changelog.md:27
+#: ../../developer/workflows/changelog.md:27
 msgid "`misc` – any work that doesn't fit into the above categories"
 msgstr ""
 
-#: ../../developer_documentation/workflows/changelog.md:29
+#: ../../developer/workflows/changelog.md:29
 msgid "You can create these files manually or use the following command to create a fragment:"
 msgstr ""
diff --git a/docs/locales/gettext/developer/workflows/git.pot b/docs/locales/gettext/developer/workflows/git.pot
index 80f0b2040..d45a52cde 100644
--- a/docs/locales/gettext/developer/workflows/git.pot
+++ b/docs/locales/gettext/developer/workflows/git.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,58 +16,58 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/workflows/git.md:1
+#: ../../developer/workflows/git.md:1
 msgid "Git workflow"
 msgstr ""
 
-#: ../../developer_documentation/workflows/git.md:3
+#: ../../developer/workflows/git.md:3
 msgid "Funkwhale uses GitLab's merge requests to manage changes. The workflow looks like this:"
 msgstr ""
 
-#: ../../developer_documentation/workflows/git.md:5
+#: ../../developer/workflows/git.md:5
 msgid "Assign the issue you are working on to yourself, or create one if it doesn't exist"
 msgstr ""
 
-#: ../../developer_documentation/workflows/git.md:6
+#: ../../developer/workflows/git.md:6
 msgid "Create a fork of the project"
 msgstr ""
 
-#: ../../developer_documentation/workflows/git.md:7
+#: ../../developer/workflows/git.md:7
 msgid "Check out the `develop` branch. If you're making a minor change (such as fixing a typo) you can check out the `stable` branch"
 msgstr ""
 
-#: ../../developer_documentation/workflows/git.md:8
+#: ../../developer/workflows/git.md:8
 msgid "Create a new branch based on the checked out branch. Make sure to give your branch a meaningful name and include the issue number if required"
 msgstr ""
 
-#: ../../developer_documentation/workflows/git.md:9
+#: ../../developer/workflows/git.md:9
 msgid "Work on your changes locally. Try to keep each commit small to make reviews easier"
 msgstr ""
 
-#: ../../developer_documentation/workflows/git.md:10
+#: ../../developer/workflows/git.md:10
 msgid "Add a changelog fragment summarizing your changes"
 msgstr ""
 
-#: ../../developer_documentation/workflows/git.md:11
+#: ../../developer/workflows/git.md:11
 msgid "Lint the codebase using the following command:"
 msgstr ""
 
-#: ../../developer_documentation/workflows/git.md:0
+#: ../../developer/workflows/git.md:0
 msgid "API code"
 msgstr ""
 
-#: ../../developer_documentation/workflows/git.md:0
+#: ../../developer/workflows/git.md:0
 msgid "Frontend code"
 msgstr ""
 
-#: ../../developer_documentation/workflows/git.md:34
+#: ../../developer/workflows/git.md:34
 msgid "Push your branch"
 msgstr ""
 
-#: ../../developer_documentation/workflows/git.md:35
+#: ../../developer/workflows/git.md:35
 msgid "Create a merge request in the GitLab frontend"
 msgstr ""
 
-#: ../../developer_documentation/workflows/git.md:36
+#: ../../developer/workflows/git.md:36
 msgid "We'll review your request and feed back"
 msgstr ""
diff --git a/docs/locales/gettext/developer/workflows/index.pot b/docs/locales/gettext/developer/workflows/index.pot
index 1cac74426..48e05df81 100644
--- a/docs/locales/gettext/developer/workflows/index.pot
+++ b/docs/locales/gettext/developer/workflows/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/workflows/index.md:5
+#: ../../developer/workflows/index.md:5
 msgid "Workflows"
 msgstr ""
 
-#: ../../developer_documentation/workflows/index.md:1
+#: ../../developer/workflows/index.md:1
 msgid "Development workflows"
 msgstr ""
 
-#: ../../developer_documentation/workflows/index.md:3
+#: ../../developer/workflows/index.md:3
 msgid "Funkwhale follows workflows for each area of development and release management. You can find a breakdown of these in this section."
 msgstr ""
diff --git a/docs/locales/gettext/developer/workflows/pre-commit.pot b/docs/locales/gettext/developer/workflows/pre-commit.pot
index ab81fa014..9d92269ef 100644
--- a/docs/locales/gettext/developer/workflows/pre-commit.pot
+++ b/docs/locales/gettext/developer/workflows/pre-commit.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,34 +16,34 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/workflows/pre-commit.md:1
+#: ../../developer/workflows/pre-commit.md:1
 msgid "Pre-commit"
 msgstr ""
 
-#: ../../developer_documentation/workflows/pre-commit.md:3
+#: ../../developer/workflows/pre-commit.md:3
 msgid "Funkwhale uses [pre-commit](https://pre-commit.com/) to ensure that the files you commit are properly formatted, follow best practice, and don't contain syntax or spelling errors."
 msgstr ""
 
-#: ../../developer_documentation/workflows/pre-commit.md:5
+#: ../../developer/workflows/pre-commit.md:5
 msgid "You can install and setup pre-commit using the [quick-start guide on the pre-commit documentation](https://pre-commit.com/#quick-start). Make sure to install pre-commit and setup the git pre-commit hook so pre-commit runs before you commit any changes to the repository."
 msgstr ""
 
-#: ../../developer_documentation/workflows/pre-commit.md:7
+#: ../../developer/workflows/pre-commit.md:7
 msgid "The workflow looks like this:"
 msgstr ""
 
-#: ../../developer_documentation/workflows/pre-commit.md:9
+#: ../../developer/workflows/pre-commit.md:9
 msgid "Install `pre-commit`."
 msgstr ""
 
-#: ../../developer_documentation/workflows/pre-commit.md:10
+#: ../../developer/workflows/pre-commit.md:10
 msgid "After cloning the repository, setup the pre-commit git hooks:"
 msgstr ""
 
-#: ../../developer_documentation/workflows/pre-commit.md:19
+#: ../../developer/workflows/pre-commit.md:19
 msgid "Make your changes and commit them."
 msgstr ""
 
-#: ../../developer_documentation/workflows/pre-commit.md:20
+#: ../../developer/workflows/pre-commit.md:20
 msgid "If `pre-commit` fails to validate your changes, the commit process stops. Fix any reported errors and try again."
 msgstr ""
diff --git a/docs/locales/gettext/developer/workflows/release.pot b/docs/locales/gettext/developer/workflows/release.pot
index 01a11cffb..f2254ef52 100644
--- a/docs/locales/gettext/developer/workflows/release.pot
+++ b/docs/locales/gettext/developer/workflows/release.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,66 +16,66 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../developer_documentation/workflows/release.md:1
+#: ../../developer/workflows/release.md:1
 msgid "Make a release"
 msgstr ""
 
-#: ../../developer_documentation/workflows/release.md:3
+#: ../../developer/workflows/release.md:3
 msgid "Once we're ready to release a new version of the software, we can use the following process:"
 msgstr ""
 
-#: ../../developer_documentation/workflows/release.md:5
+#: ../../developer/workflows/release.md:5
 msgid "Export the new release version"
 msgstr ""
 
-#: ../../developer_documentation/workflows/release.md:11
+#: ../../developer/workflows/release.md:11
 msgid "Export the previous release version"
 msgstr ""
 
-#: ../../developer_documentation/workflows/release.md:17
+#: ../../developer/workflows/release.md:17
 msgid "Pull the latest version of the `develop` branch. Use `stable` if you're releasing a bugfix."
 msgstr ""
 
-#: ../../developer_documentation/workflows/release.md:0
+#: ../../developer/workflows/release.md:0
 msgid "Bugfix release"
 msgstr ""
 
-#: ../../developer_documentation/workflows/release.md:0
+#: ../../developer/workflows/release.md:0
 msgid "Feature release"
 msgstr ""
 
-#: ../../developer_documentation/workflows/release.md:43
+#: ../../developer/workflows/release.md:43
 msgid "Compile the changelog"
 msgstr ""
 
-#: ../../developer_documentation/workflows/release.md:49
+#: ../../developer/workflows/release.md:49
 msgid "Check the output and fix typos and mistakes"
 msgstr ""
 
-#: ../../developer_documentation/workflows/release.md:50
+#: ../../developer/workflows/release.md:50
 msgid "Add a list of contributors"
 msgstr ""
 
-#: ../../developer_documentation/workflows/release.md:58
+#: ../../developer/workflows/release.md:58
 msgid "Update the `__version__` variable to the next release version"
 msgstr ""
 
-#: ../../developer_documentation/workflows/release.md:64
+#: ../../developer/workflows/release.md:64
 msgid "Commit all changes"
 msgstr ""
 
-#: ../../developer_documentation/workflows/release.md:71
+#: ../../developer/workflows/release.md:71
 msgid "Create a tag"
 msgstr ""
 
-#: ../../developer_documentation/workflows/release.md:77
+#: ../../developer/workflows/release.md:77
 msgid "Publish the new tag to GitLab"
 msgstr ""
 
-#: ../../developer_documentation/workflows/release.md:83
+#: ../../developer/workflows/release.md:83
 msgid "Merge your changes into the alternate branch"
 msgstr ""
 
-#: ../../developer_documentation/workflows/release.md:107
+#: ../../developer/workflows/release.md:107
 msgid "Don't forget to create a blog post to announce the new release!"
 msgstr ""
diff --git a/docs/locales/gettext/glossary.pot b/docs/locales/gettext/glossary.pot
index 0af92385a..f593822dc 100644
--- a/docs/locales/gettext/glossary.pot
+++ b/docs/locales/gettext/glossary.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/docs/locales/gettext/index.pot b/docs/locales/gettext/index.pot
index 4c7e1421b..ca124e306 100644
--- a/docs/locales/gettext/index.pot
+++ b/docs/locales/gettext/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/docs/locales/gettext/moderator/allow-listing/add.pot b/docs/locales/gettext/moderator/allow-listing/add.pot
index 83e412cfe..a73cc3249 100644
--- a/docs/locales/gettext/moderator/allow-listing/add.pot
+++ b/docs/locales/gettext/moderator/allow-listing/add.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,111 +16,111 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:1
+#: ../../moderator/allow-listing/add.md:1
 msgid "Add a domain to your allow-list"
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:3
+#: ../../moderator/allow-listing/add.md:3
 msgid "If you have allow-listing enabled, you need to add a domain to your allow-list to interact with it. You can add new domains in two ways:"
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:0
+#: ../../moderator/allow-listing/add.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:13
+#: ../../moderator/allow-listing/add.md:13
 msgid "{guilabel}`Moderation` – provides access to the administration and moderation menus."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:16
+#: ../../moderator/allow-listing/add.md:16
 msgid "Add a new domain"
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:18
+#: ../../moderator/allow-listing/add.md:18
 msgid "To add a domain that is not currently in your domains list:"
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:0
+#: ../../moderator/allow-listing/add.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:26
-#: ../../moderator_documentation/allow_listing/add_domain.md:39
-#: ../../moderator_documentation/allow_listing/add_domain.md:61
-#: ../../moderator_documentation/allow_listing/add_domain.md:74
+#: ../../moderator/allow-listing/add.md:26
+#: ../../moderator/allow-listing/add.md:39
+#: ../../moderator/allow-listing/add.md:61
+#: ../../moderator/allow-listing/add.md:74
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:27
-#: ../../moderator_documentation/allow_listing/add_domain.md:62
+#: ../../moderator/allow-listing/add.md:27
+#: ../../moderator/allow-listing/add.md:62
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:28
-#: ../../moderator_documentation/allow_listing/add_domain.md:41
-#: ../../moderator_documentation/allow_listing/add_domain.md:63
-#: ../../moderator_documentation/allow_listing/add_domain.md:76
+#: ../../moderator/allow-listing/add.md:28
+#: ../../moderator/allow-listing/add.md:41
+#: ../../moderator/allow-listing/add.md:63
+#: ../../moderator/allow-listing/add.md:76
 msgid "Select {guilabel}`Moderation`. The {guilabel}`Reports` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:29
-#: ../../moderator_documentation/allow_listing/add_domain.md:42
-#: ../../moderator_documentation/allow_listing/add_domain.md:64
-#: ../../moderator_documentation/allow_listing/add_domain.md:77
+#: ../../moderator/allow-listing/add.md:29
+#: ../../moderator/allow-listing/add.md:42
+#: ../../moderator/allow-listing/add.md:64
+#: ../../moderator/allow-listing/add.md:77
 msgid "Select {guilabel}`Domains` at the top of the page. The {guilabel}`Domains` page opens. You can see a list of known domains on this page."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:30
-#: ../../moderator_documentation/allow_listing/add_domain.md:43
+#: ../../moderator/allow-listing/add.md:30
+#: ../../moderator/allow-listing/add.md:43
 msgid "Enter the URL of the Fediverse server you want to add in the {guilabel}`Add a domain` field."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:31
-#: ../../moderator_documentation/allow_listing/add_domain.md:44
+#: ../../moderator/allow-listing/add.md:31
+#: ../../moderator/allow-listing/add.md:44
 msgid "Check ({fa}`check-square`) the checkbox labeled {guilabel}`Add to allow-list`."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:32
-#: ../../moderator_documentation/allow_listing/add_domain.md:45
+#: ../../moderator/allow-listing/add.md:32
+#: ../../moderator/allow-listing/add.md:45
 msgid "Select {guilabel}`Add`."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:0
+#: ../../moderator/allow-listing/add.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:40
-#: ../../moderator_documentation/allow_listing/add_domain.md:75
+#: ../../moderator/allow-listing/add.md:40
+#: ../../moderator/allow-listing/add.md:75
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:49
+#: ../../moderator/allow-listing/add.md:49
 msgid "That's it! You've added the domain to your pod's allow-list."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:51
+#: ../../moderator/allow-listing/add.md:51
 msgid "Add a known domain"
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:53
+#: ../../moderator/allow-listing/add.md:53
 msgid "To add a domain that is already in your pod's domain list:"
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:65
-#: ../../moderator_documentation/allow_listing/add_domain.md:78
+#: ../../moderator/allow-listing/add.md:65
+#: ../../moderator/allow-listing/add.md:78
 msgid "Check ({fa}`check-square`) the checkbox next to the domain(s) you want to add to the allow-list."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:66
-#: ../../moderator_documentation/allow_listing/add_domain.md:79
+#: ../../moderator/allow-listing/add.md:66
+#: ../../moderator/allow-listing/add.md:79
 msgid "Select {guilabel}`Add to allow-list` in the {guilabel}`Actions` dropdown."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:67
-#: ../../moderator_documentation/allow_listing/add_domain.md:80
+#: ../../moderator/allow-listing/add.md:67
+#: ../../moderator/allow-listing/add.md:80
 msgid "Select {guilabel}`Go`. A green tick ({fa}`check`) appears next to the domain(s)"
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/add_domain.md:84
+#: ../../moderator/allow-listing/add.md:84
 msgid "You're done! You've added the domain to your pod's allow-list."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/allow-listing/index.pot b/docs/locales/gettext/moderator/allow-listing/index.pot
index 614175ce6..2821fc296 100644
--- a/docs/locales/gettext/moderator/allow-listing/index.pot
+++ b/docs/locales/gettext/moderator/allow-listing/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,18 +16,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/allow_listing/index.md:7
+#: ../../moderator/allow-listing/index.md:7
 msgid "Manage your pod's allow-list"
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/index.md:1
+#: ../../moderator/allow-listing/index.md:1
 msgid "Allow-listing"
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/index.md:3
+#: ../../moderator/allow-listing/index.md:3
 msgid "By default, Funkwhale communicates with all reachable pods on the {term}`Fediverse`. If you want to lock down which pods you interact with, your pod admin can enable **allow-listing**. With this enabled, only pods on your allow-list can interact with your pod."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/index.md:5
-msgid "If you didn't use allow-listing before, you can remove all content from pods not on your list. Check out our guide on [purging content](../domains/purge_domain.md) to remove this content."
+#: ../../moderator/allow-listing/index.md:5
+msgid "If you didn't use allow-listing before, you can remove all content from pods not on your list. Check out our guide on [purging content](../domains/purge.md) to remove this content."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/allow-listing/remove.pot b/docs/locales/gettext/moderator/allow-listing/remove.pot
index 40856dfd4..5f07f5eaa 100644
--- a/docs/locales/gettext/moderator/allow-listing/remove.pot
+++ b/docs/locales/gettext/moderator/allow-listing/remove.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,72 +16,72 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/allow_listing/remove_domain.md:1
+#: ../../moderator/allow-listing/remove.md:1
 msgid "Remove a domain from your allow-list"
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/remove_domain.md:3
+#: ../../moderator/allow-listing/remove.md:3
 msgid "You can remove a domain from your {term}`pod's <Pod>` allow-list to stop communicating with it."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/remove_domain.md:0
+#: ../../moderator/allow-listing/remove.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/remove_domain.md:9
+#: ../../moderator/allow-listing/remove.md:9
 msgid "{guilabel}`Moderation` – provides access to the administration and moderation menus."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/remove_domain.md:12
+#: ../../moderator/allow-listing/remove.md:12
 msgid "To remove a domain from your allow-list:"
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/remove_domain.md:0
+#: ../../moderator/allow-listing/remove.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/remove_domain.md:20
-#: ../../moderator_documentation/allow_listing/remove_domain.md:33
+#: ../../moderator/allow-listing/remove.md:20
+#: ../../moderator/allow-listing/remove.md:33
 msgid "Log in to your pod."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/remove_domain.md:21
+#: ../../moderator/allow-listing/remove.md:21
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/remove_domain.md:22
-#: ../../moderator_documentation/allow_listing/remove_domain.md:35
+#: ../../moderator/allow-listing/remove.md:22
+#: ../../moderator/allow-listing/remove.md:35
 msgid "Select {guilabel}`Moderation`. The {guilabel}`Reports` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/remove_domain.md:23
-#: ../../moderator_documentation/allow_listing/remove_domain.md:36
+#: ../../moderator/allow-listing/remove.md:23
+#: ../../moderator/allow-listing/remove.md:36
 msgid "Select {guilabel}`Domains` at the top of the page. The {guilabel}`Domains` page opens. You can see a list of known domains on this page."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/remove_domain.md:24
-#: ../../moderator_documentation/allow_listing/remove_domain.md:37
+#: ../../moderator/allow-listing/remove.md:24
+#: ../../moderator/allow-listing/remove.md:37
 msgid "Check ({fa}`check-square`) the checkbox next to the domain(s) you want to add to the allow-list."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/remove_domain.md:25
-#: ../../moderator_documentation/allow_listing/remove_domain.md:38
+#: ../../moderator/allow-listing/remove.md:25
+#: ../../moderator/allow-listing/remove.md:38
 msgid "Select {guilabel}`Remove from allow-list` in the {guilabel}`Actions` dropdown."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/remove_domain.md:26
-#: ../../moderator_documentation/allow_listing/remove_domain.md:39
+#: ../../moderator/allow-listing/remove.md:26
+#: ../../moderator/allow-listing/remove.md:39
 msgid "Select {guilabel}`Go`."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/remove_domain.md:0
+#: ../../moderator/allow-listing/remove.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/remove_domain.md:34
+#: ../../moderator/allow-listing/remove.md:34
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/remove_domain.md:43
+#: ../../moderator/allow-listing/remove.md:43
 msgid "You're done! You've removed the domain from your pod's allow-list."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/content/delete.pot b/docs/locales/gettext/moderator/content/delete.pot
index 40bda33df..f67bb9cce 100644
--- a/docs/locales/gettext/moderator/content/delete.pot
+++ b/docs/locales/gettext/moderator/content/delete.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,184 +16,184 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/content/delete_content.md:1
+#: ../../moderator/content/delete.md:1
 msgid "Delete content from your pod"
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:4
+#: ../../moderator/content/delete.md:4
 msgid "Deleting content from your pod deletes the files from the server. Deleting objects like channels and libraries deletes all associated content. This action is irreversible."
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:7
+#: ../../moderator/content/delete.md:7
 msgid "Moderators can delete content from their {term}`pod` if required. Use this feature to handle content that violates your pod's rules."
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:0
+#: ../../moderator/content/delete.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:13
+#: ../../moderator/content/delete.md:13
 msgid "{guilabel}`Moderation` – provides access to the administration menu."
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:14
+#: ../../moderator/content/delete.md:14
 msgid "{guilabel}`Library` – provides access to the library menu."
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:17
+#: ../../moderator/content/delete.md:17
 msgid "There are two ways to delete content:"
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:23
+#: ../../moderator/content/delete.md:23
 msgid "Delete individual objects"
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:25
+#: ../../moderator/content/delete.md:25
 msgid "If you want to delete a specific object:"
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:0
+#: ../../moderator/content/delete.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:33
-#: ../../moderator_documentation/content/delete_content.md:54
-#: ../../moderator_documentation/content/delete_content.md:84
-#: ../../moderator_documentation/content/delete_content.md:106
+#: ../../moderator/content/delete.md:33
+#: ../../moderator/content/delete.md:54
+#: ../../moderator/content/delete.md:84
+#: ../../moderator/content/delete.md:106
 msgid "Log in to your pod."
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:34
-#: ../../moderator_documentation/content/delete_content.md:85
+#: ../../moderator/content/delete.md:34
+#: ../../moderator/content/delete.md:85
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:35
-#: ../../moderator_documentation/content/delete_content.md:56
-#: ../../moderator_documentation/content/delete_content.md:86
-#: ../../moderator_documentation/content/delete_content.md:108
+#: ../../moderator/content/delete.md:35
+#: ../../moderator/content/delete.md:56
+#: ../../moderator/content/delete.md:86
+#: ../../moderator/content/delete.md:108
 msgid "Select {guilabel}`Library`. The {guilabel}`Edits` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:36
-#: ../../moderator_documentation/content/delete_content.md:57
-#: ../../moderator_documentation/content/delete_content.md:87
-#: ../../moderator_documentation/content/delete_content.md:109
+#: ../../moderator/content/delete.md:36
+#: ../../moderator/content/delete.md:57
+#: ../../moderator/content/delete.md:87
+#: ../../moderator/content/delete.md:109
 msgid "Select the type of content you want to delete from the top of the page:"
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:37
-#: ../../moderator_documentation/content/delete_content.md:58
-#: ../../moderator_documentation/content/delete_content.md:88
-#: ../../moderator_documentation/content/delete_content.md:110
+#: ../../moderator/content/delete.md:37
+#: ../../moderator/content/delete.md:58
+#: ../../moderator/content/delete.md:88
+#: ../../moderator/content/delete.md:110
 msgid "{guilabel}`Channels`"
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:38
-#: ../../moderator_documentation/content/delete_content.md:59
-#: ../../moderator_documentation/content/delete_content.md:89
-#: ../../moderator_documentation/content/delete_content.md:111
+#: ../../moderator/content/delete.md:38
+#: ../../moderator/content/delete.md:59
+#: ../../moderator/content/delete.md:89
+#: ../../moderator/content/delete.md:111
 msgid "{guilabel}`Artists`"
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:39
-#: ../../moderator_documentation/content/delete_content.md:60
-#: ../../moderator_documentation/content/delete_content.md:90
-#: ../../moderator_documentation/content/delete_content.md:112
+#: ../../moderator/content/delete.md:39
+#: ../../moderator/content/delete.md:60
+#: ../../moderator/content/delete.md:90
+#: ../../moderator/content/delete.md:112
 msgid "{guilabel}`Albums`"
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:40
-#: ../../moderator_documentation/content/delete_content.md:61
-#: ../../moderator_documentation/content/delete_content.md:91
-#: ../../moderator_documentation/content/delete_content.md:113
+#: ../../moderator/content/delete.md:40
+#: ../../moderator/content/delete.md:61
+#: ../../moderator/content/delete.md:91
+#: ../../moderator/content/delete.md:113
 msgid "{guilabel}`Tracks`"
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:41
-#: ../../moderator_documentation/content/delete_content.md:62
-#: ../../moderator_documentation/content/delete_content.md:92
-#: ../../moderator_documentation/content/delete_content.md:114
+#: ../../moderator/content/delete.md:41
+#: ../../moderator/content/delete.md:62
+#: ../../moderator/content/delete.md:92
+#: ../../moderator/content/delete.md:114
 msgid "{guilabel}`Libraries`"
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:42
-#: ../../moderator_documentation/content/delete_content.md:63
-#: ../../moderator_documentation/content/delete_content.md:93
-#: ../../moderator_documentation/content/delete_content.md:115
+#: ../../moderator/content/delete.md:42
+#: ../../moderator/content/delete.md:63
+#: ../../moderator/content/delete.md:93
+#: ../../moderator/content/delete.md:115
 msgid "{guilabel}`Uploads`"
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:43
-#: ../../moderator_documentation/content/delete_content.md:64
-#: ../../moderator_documentation/content/delete_content.md:94
-#: ../../moderator_documentation/content/delete_content.md:116
+#: ../../moderator/content/delete.md:43
+#: ../../moderator/content/delete.md:64
+#: ../../moderator/content/delete.md:94
+#: ../../moderator/content/delete.md:116
 msgid "{guilabel}`Tags`"
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:44
-#: ../../moderator_documentation/content/delete_content.md:65
-#: ../../moderator_documentation/content/delete_content.md:95
-#: ../../moderator_documentation/content/delete_content.md:117
+#: ../../moderator/content/delete.md:44
+#: ../../moderator/content/delete.md:65
+#: ../../moderator/content/delete.md:95
+#: ../../moderator/content/delete.md:117
 msgid "Use the filters on the content page to find the object you want to delete."
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:45
-#: ../../moderator_documentation/content/delete_content.md:66
+#: ../../moderator/content/delete.md:45
+#: ../../moderator/content/delete.md:66
 msgid "Select the object to go to its moderation page."
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:46
-#: ../../moderator_documentation/content/delete_content.md:67
+#: ../../moderator/content/delete.md:46
+#: ../../moderator/content/delete.md:67
 msgid "Select {guilabel}`Delete`. A {guilabel}`Delete this {object}` warning appears."
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:47
-#: ../../moderator_documentation/content/delete_content.md:68
+#: ../../moderator/content/delete.md:47
+#: ../../moderator/content/delete.md:68
 msgid "Select {guilabel}`Delete`."
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:0
+#: ../../moderator/content/delete.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:55
-#: ../../moderator_documentation/content/delete_content.md:107
+#: ../../moderator/content/delete.md:55
+#: ../../moderator/content/delete.md:107
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:72
+#: ../../moderator/content/delete.md:72
 msgid "That's it! You've deleted the object."
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:74
+#: ../../moderator/content/delete.md:74
 msgid "Delete objects in bulk"
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:76
+#: ../../moderator/content/delete.md:76
 msgid "To delete several items at once:"
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:96
-#: ../../moderator_documentation/content/delete_content.md:118
+#: ../../moderator/content/delete.md:96
+#: ../../moderator/content/delete.md:118
 msgid "Select the checkbox ({fa}`square`) next to the objects you want to delete. Selected objects show a tick ({fa}`check-square`)."
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:97
-#: ../../moderator_documentation/content/delete_content.md:119
+#: ../../moderator/content/delete.md:97
+#: ../../moderator/content/delete.md:119
 msgid "Select {guilabel}`Delete` in the {guilabel}`Actions` dropdown."
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:98
-#: ../../moderator_documentation/content/delete_content.md:120
+#: ../../moderator/content/delete.md:98
+#: ../../moderator/content/delete.md:120
 msgid "Select {guilabel}`Go`. A {guilabel}`Do you want to launch delete on {count} items` warning appears."
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:99
-#: ../../moderator_documentation/content/delete_content.md:121
+#: ../../moderator/content/delete.md:99
+#: ../../moderator/content/delete.md:121
 msgid "Select {guilabel}`Launch`."
 msgstr ""
 
-#: ../../moderator_documentation/content/delete_content.md:125
+#: ../../moderator/content/delete.md:125
 msgid "You're done! You've deleted the selected objects from your pod."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/content/edits.pot b/docs/locales/gettext/moderator/content/edits.pot
index 2c24a4a7e..e8870c8b7 100644
--- a/docs/locales/gettext/moderator/content/edits.pot
+++ b/docs/locales/gettext/moderator/content/edits.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,112 +16,112 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/content/handle_edits.md:1
+#: ../../moderator/content/edits.md:1
 msgid "Handle edits"
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:4
+#: ../../moderator/content/edits.md:4
 msgid "Users can edit content in their own libraries. Moderators don't need to approve these edits. The edits appear in the __Edits__ queue to give admins and moderators a full timeline of changes."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:7
+#: ../../moderator/content/edits.md:7
 msgid "Users can suggest metadata edits on objects they can access. When a user suggests an edit, it's sent to the **Edits** queue for review. Moderators and pod admins can accept or reject these edits."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:0
+#: ../../moderator/content/edits.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:13
+#: ../../moderator/content/edits.md:13
 msgid "{guilabel}`Moderation` – provides access to the administration menu."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:14
+#: ../../moderator/content/edits.md:14
 msgid "{guilabel}`Library` – provides access to the library menu."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:17
+#: ../../moderator/content/edits.md:17
 msgid "Each edit object contains the following information:"
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:19
+#: ../../moderator/content/edits.md:19
 msgid "A {guilabel}`Modification` ID – the unique ID of the modification. Select this to show the modification in context with the edited object."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:20
+#: ../../moderator/content/edits.md:20
 msgid "A timestamp of when the user suggested the edit."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:21
+#: ../../moderator/content/edits.md:21
 msgid "The status of the edit."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:22
+#: ../../moderator/content/edits.md:22
 msgid "The {guilabel}`Field` that the user edited."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:23
+#: ../../moderator/content/edits.md:23
 msgid "The {guilabel}`Old value` that the user edited."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:24
+#: ../../moderator/content/edits.md:24
 msgid "The {guilabel}`New value` that the user entered."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:25
+#: ../../moderator/content/edits.md:25
 msgid "The user who suggested the edit."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:27
+#: ../../moderator/content/edits.md:27
 msgid "To review suggested edits:"
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:0
+#: ../../moderator/content/edits.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:35
-#: ../../moderator_documentation/content/handle_edits.md:48
+#: ../../moderator/content/edits.md:35
+#: ../../moderator/content/edits.md:48
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:36
+#: ../../moderator/content/edits.md:36
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:37
-#: ../../moderator_documentation/content/handle_edits.md:50
+#: ../../moderator/content/edits.md:37
+#: ../../moderator/content/edits.md:50
 msgid "Select {guilabel}`Library`. The {guilabel}`Edits` page opens. The {guilabel}`Library edits` section displays a list of unresolved edits."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:38
-#: ../../moderator_documentation/content/handle_edits.md:51
+#: ../../moderator/content/edits.md:38
+#: ../../moderator/content/edits.md:51
 msgid "Review the edit and select on of the following options:"
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:39
-#: ../../moderator_documentation/content/handle_edits.md:52
+#: ../../moderator/content/edits.md:39
+#: ../../moderator/content/edits.md:52
 msgid "{guilabel}`Approve` – approve the edit and apply it to the object."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:40
-#: ../../moderator_documentation/content/handle_edits.md:53
+#: ../../moderator/content/edits.md:40
+#: ../../moderator/content/edits.md:53
 msgid "{guilabel}`Reject` – reject the edit and leave the object in its current state."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:41
-#: ../../moderator_documentation/content/handle_edits.md:54
+#: ../../moderator/content/edits.md:41
+#: ../../moderator/content/edits.md:54
 msgid "{guilabel}`Delete` – delete the edit suggestion without taking further action. The object remains in its current state."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:0
+#: ../../moderator/content/edits.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:49
+#: ../../moderator/content/edits.md:49
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/content/handle_edits.md:58
+#: ../../moderator/content/edits.md:58
 msgid "That's it! You've handled the edit request. You can use the filters on this page to search for historical requests."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/content/index.pot b/docs/locales/gettext/moderator/content/index.pot
index a6fb3b3e0..8c31f178a 100644
--- a/docs/locales/gettext/moderator/content/index.pot
+++ b/docs/locales/gettext/moderator/content/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/content/index.md:5
+#: ../../moderator/content/index.md:5
 msgid "Manage your pod's content"
 msgstr ""
 
-#: ../../moderator_documentation/content/index.md:1
+#: ../../moderator/content/index.md:1
 msgid "Moderate content on your pod"
 msgstr ""
 
-#: ../../moderator_documentation/content/index.md:3
+#: ../../moderator/content/index.md:3
 msgid "If you have the **Library** permission, you can change content on your pod. Use this permission to hide copyrighted content and remove offensive material."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/content/library.pot b/docs/locales/gettext/moderator/content/library.pot
index cede03032..6c22fdd40 100644
--- a/docs/locales/gettext/moderator/content/library.pot
+++ b/docs/locales/gettext/moderator/content/library.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,90 +16,90 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/content/library_visibility.md:1
+#: ../../moderator/content/library.md:1
 msgid "Change the visibility of a library"
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:4
+#: ../../moderator/content/library.md:4
 msgid "You can only change the visibility of libraries stored on your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:7
+#: ../../moderator/content/library.md:7
 msgid "If a user has put copyrighted material in a public library, you can change the visibility of the library. This lets the user keep the content and protects your pod from legal issues."
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:0
+#: ../../moderator/content/library.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:13
+#: ../../moderator/content/library.md:13
 msgid "{guilabel}`Moderation` – provides access to the administration menu."
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:14
+#: ../../moderator/content/library.md:14
 msgid "{guilabel}`Library` – provides access to the library menu."
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:17
+#: ../../moderator/content/library.md:17
 msgid "To change the visibility of a library:"
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:0
+#: ../../moderator/content/library.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:25
-#: ../../moderator_documentation/content/library_visibility.md:40
+#: ../../moderator/content/library.md:25
+#: ../../moderator/content/library.md:40
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:26
+#: ../../moderator/content/library.md:26
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:27
-#: ../../moderator_documentation/content/library_visibility.md:42
+#: ../../moderator/content/library.md:27
+#: ../../moderator/content/library.md:42
 msgid "Select {guilabel}`Library`. The {guilabel}`Edits` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:28
-#: ../../moderator_documentation/content/library_visibility.md:43
+#: ../../moderator/content/library.md:28
+#: ../../moderator/content/library.md:43
 msgid "Select {guilabel}`Libraries` at the top of the page. The {guilabel}`Libraries` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:29
-#: ../../moderator_documentation/content/library_visibility.md:44
+#: ../../moderator/content/library.md:29
+#: ../../moderator/content/library.md:44
 msgid "Select the library you want to update. The library's moderation page opens."
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:30
-#: ../../moderator_documentation/content/library_visibility.md:45
+#: ../../moderator/content/library.md:30
+#: ../../moderator/content/library.md:45
 msgid "Select one of the following options from the {guilabel}`Visibility` dropdown menu:"
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:31
-#: ../../moderator_documentation/content/library_visibility.md:46
+#: ../../moderator/content/library.md:31
+#: ../../moderator/content/library.md:46
 msgid "{guilabel}`Private` – makes the library visible only to the owner and anyone they have shared it with."
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:32
-#: ../../moderator_documentation/content/library_visibility.md:47
+#: ../../moderator/content/library.md:32
+#: ../../moderator/content/library.md:47
 msgid "{guilabel}`Instance` – makes the library visible only to users who have an account on your pod."
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:33
-#: ../../moderator_documentation/content/library_visibility.md:48
+#: ../../moderator/content/library.md:33
+#: ../../moderator/content/library.md:48
 msgid "{guilabel}`Everyone` – makes the library visible to users across all pods."
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:0
+#: ../../moderator/content/library.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:41
+#: ../../moderator/content/library.md:41
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/content/library_visibility.md:52
+#: ../../moderator/content/library.md:52
 msgid "That's it! You've updated the library's visibility. You should contact the user informing them of the action."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/domains/add.pot b/docs/locales/gettext/moderator/domains/add.pot
index 3af2c048e..5830e92a2 100644
--- a/docs/locales/gettext/moderator/domains/add.pot
+++ b/docs/locales/gettext/moderator/domains/add.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,67 +16,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/domains/add_domain.md:1
+#: ../../moderator/domains/add.md:1
 msgid "Add a domain to your pod's domain list"
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_domain.md:3
-msgid "Funkwhale records the domains of other {term}`Fediverse` servers when users interact with them. Once a domain is in your domains list, you can [add moderation rules](add_rule.md) to it."
+#: ../../moderator/domains/add.md:3
+msgid "Funkwhale records the domains of other {term}`Fediverse` servers when users interact with them. Once a domain is in your domains list, you can [add moderation rules](rules/add.md) to it."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_domain.md:0
+#: ../../moderator/domains/add.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_domain.md:9
+#: ../../moderator/domains/add.md:9
 msgid "{guilabel}`Moderation` – provides access to the administration and moderation menus."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_domain.md:12
+#: ../../moderator/domains/add.md:12
 msgid "You can also add domains to this list at any time to create rules before users interact with them. To do this:"
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_domain.md:0
+#: ../../moderator/domains/add.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_domain.md:20
-#: ../../moderator_documentation/domains/add_domain.md:32
+#: ../../moderator/domains/add.md:20
+#: ../../moderator/domains/add.md:32
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_domain.md:21
+#: ../../moderator/domains/add.md:21
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_domain.md:22
-#: ../../moderator_documentation/domains/add_domain.md:34
+#: ../../moderator/domains/add.md:22
+#: ../../moderator/domains/add.md:34
 msgid "Select {guilabel}`Moderation`. The {guilabel}`Reports` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_domain.md:23
-#: ../../moderator_documentation/domains/add_domain.md:35
+#: ../../moderator/domains/add.md:23
+#: ../../moderator/domains/add.md:35
 msgid "Select {guilabel}`Domains` at the top of the page. The {guilabel}`Domains` page opens. You can see a list of known domains on this page."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_domain.md:24
-#: ../../moderator_documentation/domains/add_domain.md:36
+#: ../../moderator/domains/add.md:24
+#: ../../moderator/domains/add.md:36
 msgid "Enter the URL of the Fediverse server you want to add in the {guilabel}`Add a domain` field."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_domain.md:25
-#: ../../moderator_documentation/domains/add_domain.md:37
+#: ../../moderator/domains/add.md:25
+#: ../../moderator/domains/add.md:37
 msgid "Select {guilabel}`Add` to add the domain. The domain moderation page opens."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_domain.md:0
+#: ../../moderator/domains/add.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_domain.md:33
+#: ../../moderator/domains/add.md:33
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the page to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_domain.md:41
+#: ../../moderator/domains/add.md:41
 msgid "That's it! The domain is now in your domains list. You can now add moderation rules to this domain."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/domains/index.pot b/docs/locales/gettext/moderator/domains/index.pot
index 069eb0fe2..0fb3204f4 100644
--- a/docs/locales/gettext/moderator/domains/index.pot
+++ b/docs/locales/gettext/moderator/domains/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,18 +16,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/domains/index.md:5
+#: ../../moderator/domains/index.md:5
 msgid "Manage external domains"
 msgstr ""
 
-#: ../../moderator_documentation/domains/index.md:16
+#: ../../moderator/domains/index.md:16
 msgid "Manage moderation rules"
 msgstr ""
 
-#: ../../moderator_documentation/domains/index.md:1
+#: ../../moderator/domains/index.md:1
 msgid "Moderate external domains"
 msgstr ""
 
-#: ../../moderator_documentation/domains/index.md:3
+#: ../../moderator/domains/index.md:3
 msgid "You can add moderation rules to control how your {term}`pod` interacts with other domains. Use these rules to control access to content and interaction with users on other pods."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/domains/purge.pot b/docs/locales/gettext/moderator/domains/purge.pot
index 54f8b453c..32ee4e8a1 100644
--- a/docs/locales/gettext/moderator/domains/purge.pot
+++ b/docs/locales/gettext/moderator/domains/purge.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,81 +16,81 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/domains/purge_domain.md:1
+#: ../../moderator/domains/purge.md:1
 msgid "Purge domain data"
 msgstr ""
 
-#: ../../moderator_documentation/domains/purge_domain.md:4
+#: ../../moderator/domains/purge.md:4
 msgid "Purging a domain's data removes all objects and caches associated to that domain. This impacts users who have objects from these domains in their libraries."
 msgstr ""
 
-#: ../../moderator_documentation/domains/purge_domain.md:7
+#: ../../moderator/domains/purge.md:7
 msgid "When users follow content from another domain that content is visible on your {term}`pod`. If a domain hosts illegal or offensive content you can purge the content associated with it."
 msgstr ""
 
-#: ../../moderator_documentation/domains/purge_domain.md:0
+#: ../../moderator/domains/purge.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/domains/purge_domain.md:13
+#: ../../moderator/domains/purge.md:13
 msgid "{guilabel}`Moderation` – provides access to the administration and moderation menus."
 msgstr ""
 
-#: ../../moderator_documentation/domains/purge_domain.md:16
+#: ../../moderator/domains/purge.md:16
 msgid "To purge content from a domain:"
 msgstr ""
 
-#: ../../moderator_documentation/domains/purge_domain.md:0
+#: ../../moderator/domains/purge.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/domains/purge_domain.md:24
-#: ../../moderator_documentation/domains/purge_domain.md:38
+#: ../../moderator/domains/purge.md:24
+#: ../../moderator/domains/purge.md:38
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/domains/purge_domain.md:25
+#: ../../moderator/domains/purge.md:25
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/domains/purge_domain.md:26
-#: ../../moderator_documentation/domains/purge_domain.md:40
+#: ../../moderator/domains/purge.md:26
+#: ../../moderator/domains/purge.md:40
 msgid "Select {guilabel}`Moderation`. The {guilabel}`Reports` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/domains/purge_domain.md:27
-#: ../../moderator_documentation/domains/purge_domain.md:41
+#: ../../moderator/domains/purge.md:27
+#: ../../moderator/domains/purge.md:41
 msgid "Select {guilabel}`Domains` at the top of the page. The {guilabel}`Domains` page opens. You can see a list of known domains on this page."
 msgstr ""
 
-#: ../../moderator_documentation/domains/purge_domain.md:28
-#: ../../moderator_documentation/domains/purge_domain.md:42
+#: ../../moderator/domains/purge.md:28
+#: ../../moderator/domains/purge.md:42
 msgid "Select the checkbox ({fa}`square`) next to the domain(s) you want to purge. Selected domains show a tick ({fa}`check-square`)."
 msgstr ""
 
-#: ../../moderator_documentation/domains/purge_domain.md:29
-#: ../../moderator_documentation/domains/purge_domain.md:43
+#: ../../moderator/domains/purge.md:29
+#: ../../moderator/domains/purge.md:43
 msgid "Select {guilabel}`Purge` in the {guilabel}`Actions` dropdown."
 msgstr ""
 
-#: ../../moderator_documentation/domains/purge_domain.md:30
-#: ../../moderator_documentation/domains/purge_domain.md:44
+#: ../../moderator/domains/purge.md:30
+#: ../../moderator/domains/purge.md:44
 msgid "Select {guilabel}`Go`. A {guilabel}`Do you want to launch purge on {count} items` warning appears."
 msgstr ""
 
-#: ../../moderator_documentation/domains/purge_domain.md:31
-#: ../../moderator_documentation/domains/purge_domain.md:45
+#: ../../moderator/domains/purge.md:31
+#: ../../moderator/domains/purge.md:45
 msgid "Select {guilabel}`Launch`."
 msgstr ""
 
-#: ../../moderator_documentation/domains/purge_domain.md:0
+#: ../../moderator/domains/purge.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/domains/purge_domain.md:39
+#: ../../moderator/domains/purge.md:39
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/domains/purge_domain.md:49
+#: ../../moderator/domains/purge.md:49
 msgid "You're done! Your pod clears all the content associated with the selected domains."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/domains/rules/add.pot b/docs/locales/gettext/moderator/domains/rules/add.pot
index c4cf00c49..f4b36599f 100644
--- a/docs/locales/gettext/moderator/domains/rules/add.pot
+++ b/docs/locales/gettext/moderator/domains/rules/add.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,96 +16,96 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/domains/add_rule.md:1
+#: ../../moderator/domains/rules/add.md:1
 msgid "Add a moderation rule"
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:4
+#: ../../moderator/domains/rules/add.md:4
 msgid "Purging a domain's data removes all objects and caches associated to that domain. This impacts users who have objects from these domains in their libraries."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:7
+#: ../../moderator/domains/rules/add.md:7
 msgid "Add moderation rules to domains to control how they can interact with your {term}`pod`. Moderation rules enable you to restrict content from a domain showing on your pod."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:0
+#: ../../moderator/domains/rules/add.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:13
+#: ../../moderator/domains/rules/add.md:13
 msgid "{guilabel}`Moderation` – provides access to the administration and moderation menus."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:16
+#: ../../moderator/domains/rules/add.md:16
 msgid "To add a moderation rule to a domain:"
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:0
+#: ../../moderator/domains/rules/add.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:24
-#: ../../moderator_documentation/domains/add_rule.md:41
+#: ../../moderator/domains/rules/add.md:24
+#: ../../moderator/domains/rules/add.md:41
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:25
+#: ../../moderator/domains/rules/add.md:25
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:26
-#: ../../moderator_documentation/domains/add_rule.md:43
+#: ../../moderator/domains/rules/add.md:26
+#: ../../moderator/domains/rules/add.md:43
 msgid "Select {guilabel}`Moderation`. The {guilabel}`Reports` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:27
-#: ../../moderator_documentation/domains/add_rule.md:44
+#: ../../moderator/domains/rules/add.md:27
+#: ../../moderator/domains/rules/add.md:44
 msgid "Select {guilabel}`Domains` at the top of the page. The {guilabel}`Domains` page opens. You can see a list of known domains on this page."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:28
-#: ../../moderator_documentation/domains/add_rule.md:45
+#: ../../moderator/domains/rules/add.md:28
+#: ../../moderator/domains/rules/add.md:45
 msgid "Select the domain you want to apply the rule to. The domain's moderation page opens."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:29
-#: ../../moderator_documentation/domains/add_rule.md:46
+#: ../../moderator/domains/rules/add.md:29
+#: ../../moderator/domains/rules/add.md:46
 msgid "Select {guilabel}`Add a moderation policy`. The moderation policy form appears."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:30
-#: ../../moderator_documentation/domains/add_rule.md:47
+#: ../../moderator/domains/rules/add.md:30
+#: ../../moderator/domains/rules/add.md:47
 msgid "Enter the {guilabel}`Reason` you are applying the rule. Depending on your pod's configuration, users may be able to see this."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:31
-#: ../../moderator_documentation/domains/add_rule.md:48
+#: ../../moderator/domains/rules/add.md:31
+#: ../../moderator/domains/rules/add.md:48
 msgid "Choose your moderation rule:"
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:32
-#: ../../moderator_documentation/domains/add_rule.md:49
+#: ../../moderator/domains/rules/add.md:32
+#: ../../moderator/domains/rules/add.md:49
 msgid "{guilabel}`Block everything` – purge all content from the domain and block all content."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:33
-#: ../../moderator_documentation/domains/add_rule.md:50
+#: ../../moderator/domains/rules/add.md:33
+#: ../../moderator/domains/rules/add.md:50
 msgid "{guilabel}`Reject media` – only reject media files such as audio files, avatars, and album art."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:34
-#: ../../moderator_documentation/domains/add_rule.md:51
+#: ../../moderator/domains/rules/add.md:34
+#: ../../moderator/domains/rules/add.md:51
 msgid "Select {guilabel}`Create` to save your rule."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:0
+#: ../../moderator/domains/rules/add.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:42
+#: ../../moderator/domains/rules/add.md:42
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_rule.md:55
+#: ../../moderator/domains/rules/add.md:55
 msgid "That's all there is to it! You've applied your moderation rule. The rule takes effect as soon as you create it."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/domains/rules/delete.pot b/docs/locales/gettext/moderator/domains/rules/delete.pot
index 997035487..02af19b10 100644
--- a/docs/locales/gettext/moderator/domains/rules/delete.pot
+++ b/docs/locales/gettext/moderator/domains/rules/delete.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,77 +16,77 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/domains/delete_rule.md:1
+#: ../../moderator/domains/rules/delete.md:1
 msgid "Delete a moderation rule"
 msgstr ""
 
-#: ../../moderator_documentation/domains/delete_rule.md:3
+#: ../../moderator/domains/rules/delete.md:3
 msgid "If you no longer need a moderation rule, you can delete it completely. This allows the other server to interact with your pod normally."
 msgstr ""
 
-#: ../../moderator_documentation/domains/delete_rule.md:0
+#: ../../moderator/domains/rules/delete.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/domains/delete_rule.md:9
+#: ../../moderator/domains/rules/delete.md:9
 msgid "{guilabel}`Moderation` – provides access to the administration and moderation menus."
 msgstr ""
 
-#: ../../moderator_documentation/domains/delete_rule.md:12
+#: ../../moderator/domains/rules/delete.md:12
 msgid "To delete an existing moderation rule:"
 msgstr ""
 
-#: ../../moderator_documentation/domains/delete_rule.md:0
+#: ../../moderator/domains/rules/delete.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/domains/delete_rule.md:20
-#: ../../moderator_documentation/domains/delete_rule.md:34
+#: ../../moderator/domains/rules/delete.md:20
+#: ../../moderator/domains/rules/delete.md:34
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/domains/delete_rule.md:21
+#: ../../moderator/domains/rules/delete.md:21
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/domains/delete_rule.md:22
-#: ../../moderator_documentation/domains/delete_rule.md:36
+#: ../../moderator/domains/rules/delete.md:22
+#: ../../moderator/domains/rules/delete.md:36
 msgid "Select {guilabel}`Moderation`. The {guilabel}`Reports` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/domains/delete_rule.md:23
-#: ../../moderator_documentation/domains/delete_rule.md:37
+#: ../../moderator/domains/rules/delete.md:23
+#: ../../moderator/domains/rules/delete.md:37
 msgid "Select {guilabel}`Domains` at the top of the page. The {guilabel}`Domains` page opens. You can see a list of known domains on this page."
 msgstr ""
 
-#: ../../moderator_documentation/domains/delete_rule.md:24
-#: ../../moderator_documentation/domains/delete_rule.md:38
+#: ../../moderator/domains/rules/delete.md:24
+#: ../../moderator/domains/rules/delete.md:38
 msgid "Select the domain with the moderation rule you want to edit. The domain's moderation page opens."
 msgstr ""
 
-#: ../../moderator_documentation/domains/delete_rule.md:25
-#: ../../moderator_documentation/domains/delete_rule.md:39
+#: ../../moderator/domains/rules/delete.md:25
+#: ../../moderator/domains/rules/delete.md:39
 msgid "Select {guilabel}`Edit` under the {guilabel}`This domain is subject to specific moderation rules` header. The moderation policy form opens."
 msgstr ""
 
-#: ../../moderator_documentation/domains/delete_rule.md:26
-#: ../../moderator_documentation/domains/delete_rule.md:40
+#: ../../moderator/domains/rules/delete.md:26
+#: ../../moderator/domains/rules/delete.md:40
 msgid "Select {guilabel}`Delete`. A {guilabel}`Delete this moderation rule?` warning appears."
 msgstr ""
 
-#: ../../moderator_documentation/domains/delete_rule.md:27
-#: ../../moderator_documentation/domains/delete_rule.md:41
+#: ../../moderator/domains/rules/delete.md:27
+#: ../../moderator/domains/rules/delete.md:41
 msgid "Select {guilabel}`Delete moderation rule`."
 msgstr ""
 
-#: ../../moderator_documentation/domains/delete_rule.md:0
+#: ../../moderator/domains/rules/delete.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/domains/delete_rule.md:35
+#: ../../moderator/domains/rules/delete.md:35
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/domains/delete_rule.md:45
+#: ../../moderator/domains/rules/delete.md:45
 msgid "That's it! You've deleted your moderation rule. Content from the domain will no longer get blocked."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/domains/rules/edit.pot b/docs/locales/gettext/moderator/domains/rules/edit.pot
index 0a85b325f..a0ff2c970 100644
--- a/docs/locales/gettext/moderator/domains/rules/edit.pot
+++ b/docs/locales/gettext/moderator/domains/rules/edit.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,106 +16,106 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/domains/edit_rule.md:1
+#: ../../moderator/domains/rules/edit.md:1
 msgid "Edit a moderation rule"
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:4
+#: ../../moderator/domains/rules/edit.md:4
 msgid "Purging a domain's data removes all objects and caches associated to that domain. This impacts users who have objects from these domains in their libraries."
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:7
+#: ../../moderator/domains/rules/edit.md:7
 msgid "You can change a moderation rule on a domain at any time."
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:0
+#: ../../moderator/domains/rules/edit.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:13
+#: ../../moderator/domains/rules/edit.md:13
 msgid "{guilabel}`Moderation` – provides access to the administration and moderation menus."
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:16
+#: ../../moderator/domains/rules/edit.md:16
 msgid "To update an existing moderation rule:"
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:0
+#: ../../moderator/domains/rules/edit.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:24
-#: ../../moderator_documentation/domains/edit_rule.md:43
+#: ../../moderator/domains/rules/edit.md:24
+#: ../../moderator/domains/rules/edit.md:43
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:25
+#: ../../moderator/domains/rules/edit.md:25
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:26
-#: ../../moderator_documentation/domains/edit_rule.md:45
+#: ../../moderator/domains/rules/edit.md:26
+#: ../../moderator/domains/rules/edit.md:45
 msgid "Select {guilabel}`Moderation`. The {guilabel}`Reports` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:27
-#: ../../moderator_documentation/domains/edit_rule.md:46
+#: ../../moderator/domains/rules/edit.md:27
+#: ../../moderator/domains/rules/edit.md:46
 msgid "Select {guilabel}`Domains` at the top of the page. The {guilabel}`Domains` page opens. You can see a list of known domains on this page."
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:28
-#: ../../moderator_documentation/domains/edit_rule.md:47
+#: ../../moderator/domains/rules/edit.md:28
+#: ../../moderator/domains/rules/edit.md:47
 msgid "Select the domain with the moderation rule you want to edit. The domain's moderation page opens."
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:29
-#: ../../moderator_documentation/domains/edit_rule.md:48
+#: ../../moderator/domains/rules/edit.md:29
+#: ../../moderator/domains/rules/edit.md:48
 msgid "Select {guilabel}`Edit` under the {guilabel}`This domain is subject to specific moderation rules` header. The moderation policy form opens."
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:30
-#: ../../moderator_documentation/domains/edit_rule.md:49
+#: ../../moderator/domains/rules/edit.md:30
+#: ../../moderator/domains/rules/edit.md:49
 msgid "**Optional** – Edit the following settings:"
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:31
-#: ../../moderator_documentation/domains/edit_rule.md:50
+#: ../../moderator/domains/rules/edit.md:31
+#: ../../moderator/domains/rules/edit.md:50
 msgid "{guilabel}`Enabled` – toggle this switch to enable or disable the rule without deleting it."
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:32
-#: ../../moderator_documentation/domains/edit_rule.md:51
+#: ../../moderator/domains/rules/edit.md:32
+#: ../../moderator/domains/rules/edit.md:51
 msgid "{guilabel}`Reason` – update the reason for the moderation rule."
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:33
-#: ../../moderator_documentation/domains/edit_rule.md:52
+#: ../../moderator/domains/rules/edit.md:33
+#: ../../moderator/domains/rules/edit.md:52
 msgid "**Optional** – Update your moderation rule:"
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:34
-#: ../../moderator_documentation/domains/edit_rule.md:53
+#: ../../moderator/domains/rules/edit.md:34
+#: ../../moderator/domains/rules/edit.md:53
 msgid "{guilabel}`Block everything` – purge all content from this domain and block all content."
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:35
-#: ../../moderator_documentation/domains/edit_rule.md:54
+#: ../../moderator/domains/rules/edit.md:35
+#: ../../moderator/domains/rules/edit.md:54
 msgid "{guilabel}`Reject media` – only reject media files such as audio files, avatars, and album art."
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:36
-#: ../../moderator_documentation/domains/edit_rule.md:55
+#: ../../moderator/domains/rules/edit.md:36
+#: ../../moderator/domains/rules/edit.md:55
 msgid "Select {guilabel}`Update` to save your rule."
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:0
+#: ../../moderator/domains/rules/edit.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:44
+#: ../../moderator/domains/rules/edit.md:44
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/domains/edit_rule.md:59
+#: ../../moderator/domains/rules/edit.md:59
 msgid "You're done! The changes to the rule take effect as soon as you update it."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/external-users/index.pot b/docs/locales/gettext/moderator/external-users/index.pot
index fabc41abf..c59f5afe8 100644
--- a/docs/locales/gettext/moderator/external-users/index.pot
+++ b/docs/locales/gettext/moderator/external-users/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,18 +16,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/external_users/index.md:5
+#: ../../moderator/external-users/index.md:5
 msgid "Manage external users"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/index.md:15
+#: ../../moderator/external-users/index.md:15
 msgid "Manage moderation rules"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/index.md:1
+#: ../../moderator/external-users/index.md:1
 msgid "Moderate external users"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/index.md:3
+#: ../../moderator/external-users/index.md:3
 msgid "You can add moderation rules to control how external users can interact with your {term}`pod`. This lets you filter users from other pods without applying rules to their whole [domain](../domains/index.md)."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/external-users/purge.pot b/docs/locales/gettext/moderator/external-users/purge.pot
index 3afe586ea..481515ac5 100644
--- a/docs/locales/gettext/moderator/external-users/purge.pot
+++ b/docs/locales/gettext/moderator/external-users/purge.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,81 +16,81 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/external_users/purge_users.md:1
+#: ../../moderator/external-users/purge.md:1
 msgid "Purge user data"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/purge_users.md:4
+#: ../../moderator/external-users/purge.md:4
 msgid "Purging a user's data removes all objects and caches associated to that user. This impacts users who have objects from these users in their libraries."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/purge_users.md:7
+#: ../../moderator/external-users/purge.md:7
 msgid "When users follow users from another domain their content is visible on your {term}`pod`. If a user posts illegal or offensive content you can purge the content associated with them."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/purge_users.md:0
+#: ../../moderator/external-users/purge.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/purge_users.md:13
+#: ../../moderator/external-users/purge.md:13
 msgid "{guilabel}`Moderation` – provides access to the administration and moderation menus."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/purge_users.md:16
+#: ../../moderator/external-users/purge.md:16
 msgid "To purge a user's content:"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/purge_users.md:0
+#: ../../moderator/external-users/purge.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/purge_users.md:24
-#: ../../moderator_documentation/external_users/purge_users.md:38
+#: ../../moderator/external-users/purge.md:24
+#: ../../moderator/external-users/purge.md:38
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/purge_users.md:25
+#: ../../moderator/external-users/purge.md:25
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/purge_users.md:26
-#: ../../moderator_documentation/external_users/purge_users.md:40
+#: ../../moderator/external-users/purge.md:26
+#: ../../moderator/external-users/purge.md:40
 msgid "Select {guilabel}`Moderation`. The {guilabel}`Reports` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/purge_users.md:27
-#: ../../moderator_documentation/external_users/purge_users.md:41
+#: ../../moderator/external-users/purge.md:27
+#: ../../moderator/external-users/purge.md:41
 msgid "Select {guilabel}`Accounts` at the top of the page. The {guilabel}`Accounts` page opens. You can see a list of known accounts on this page."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/purge_users.md:28
-#: ../../moderator_documentation/external_users/purge_users.md:42
+#: ../../moderator/external-users/purge.md:28
+#: ../../moderator/external-users/purge.md:42
 msgid "Select the checkbox ({fa}`square`) next to the account(s) you want to purge. Selected accounts show a tick ({fa}`check-square`)."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/purge_users.md:29
-#: ../../moderator_documentation/external_users/purge_users.md:43
+#: ../../moderator/external-users/purge.md:29
+#: ../../moderator/external-users/purge.md:43
 msgid "Select {guilabel}`Purge` in the {guilabel}`Actions` dropdown."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/purge_users.md:30
-#: ../../moderator_documentation/external_users/purge_users.md:44
+#: ../../moderator/external-users/purge.md:30
+#: ../../moderator/external-users/purge.md:44
 msgid "Select {guilabel}`Go`. A {guilabel}`Do you want to launch purge on {count} element(s)` warning appears."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/purge_users.md:31
-#: ../../moderator_documentation/external_users/purge_users.md:45
+#: ../../moderator/external-users/purge.md:31
+#: ../../moderator/external-users/purge.md:45
 msgid "Select {guilabel}`Launch`."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/purge_users.md:0
+#: ../../moderator/external-users/purge.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/purge_users.md:39
+#: ../../moderator/external-users/purge.md:39
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/purge_users.md:49
+#: ../../moderator/external-users/purge.md:49
 msgid "You're done! Your pod clears all the content associated with the selected users."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/external-users/rules/add.pot b/docs/locales/gettext/moderator/external-users/rules/add.pot
index f6a73014f..70f1bbff6 100644
--- a/docs/locales/gettext/moderator/external-users/rules/add.pot
+++ b/docs/locales/gettext/moderator/external-users/rules/add.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,96 +16,96 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/external_users/add_rule.md:1
+#: ../../moderator/external-users/rules/add.md:1
 msgid "Add a moderation rule"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:4
+#: ../../moderator/external-users/rules/add.md:4
 msgid "Purging a user's data removes all objects and caches associated to that user. This impacts users who have objects from these users in their libraries."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:7
+#: ../../moderator/external-users/rules/add.md:7
 msgid "Add moderation rules to users to control how they can interact with your {term}`pod`. Moderation rules enable you to restrict content from a user showing on your pod."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:0
+#: ../../moderator/external-users/rules/add.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:13
+#: ../../moderator/external-users/rules/add.md:13
 msgid "{guilabel}`Moderation` – provides access to the administration and moderation menus."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:16
+#: ../../moderator/external-users/rules/add.md:16
 msgid "To add a moderation rule to a user:"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:0
+#: ../../moderator/external-users/rules/add.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:24
-#: ../../moderator_documentation/external_users/add_rule.md:41
+#: ../../moderator/external-users/rules/add.md:24
+#: ../../moderator/external-users/rules/add.md:41
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:25
+#: ../../moderator/external-users/rules/add.md:25
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:26
-#: ../../moderator_documentation/external_users/add_rule.md:43
+#: ../../moderator/external-users/rules/add.md:26
+#: ../../moderator/external-users/rules/add.md:43
 msgid "Select {guilabel}`Moderation`. The {guilabel}`Reports` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:27
-#: ../../moderator_documentation/external_users/add_rule.md:44
+#: ../../moderator/external-users/rules/add.md:27
+#: ../../moderator/external-users/rules/add.md:44
 msgid "Select {guilabel}`Accounts` at the top of the page. The {guilabel}`Accounts` page opens. You can see a list of known accounts on this page."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:28
-#: ../../moderator_documentation/external_users/add_rule.md:45
+#: ../../moderator/external-users/rules/add.md:28
+#: ../../moderator/external-users/rules/add.md:45
 msgid "Select the account you want to apply the rule to. The account's moderation page opens."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:29
-#: ../../moderator_documentation/external_users/add_rule.md:46
+#: ../../moderator/external-users/rules/add.md:29
+#: ../../moderator/external-users/rules/add.md:46
 msgid "Select {guilabel}`Add a moderation policy`. The moderation policy form appears."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:30
-#: ../../moderator_documentation/external_users/add_rule.md:47
+#: ../../moderator/external-users/rules/add.md:30
+#: ../../moderator/external-users/rules/add.md:47
 msgid "Enter the {guilabel}`Reason` you are applying the rule. Depending on your pod's configuration, users may be able to see this."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:31
-#: ../../moderator_documentation/external_users/add_rule.md:48
+#: ../../moderator/external-users/rules/add.md:31
+#: ../../moderator/external-users/rules/add.md:48
 msgid "Choose your moderation rule:"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:32
-#: ../../moderator_documentation/external_users/add_rule.md:49
+#: ../../moderator/external-users/rules/add.md:32
+#: ../../moderator/external-users/rules/add.md:49
 msgid "{guilabel}`Block everything` – purge all content from the user and block all content."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:33
-#: ../../moderator_documentation/external_users/add_rule.md:50
+#: ../../moderator/external-users/rules/add.md:33
+#: ../../moderator/external-users/rules/add.md:50
 msgid "{guilabel}`Reject media` – only reject media files such as audio files, avatars, and album art."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:34
-#: ../../moderator_documentation/external_users/add_rule.md:51
+#: ../../moderator/external-users/rules/add.md:34
+#: ../../moderator/external-users/rules/add.md:51
 msgid "Select {guilabel}`Create` to save your rule."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:0
+#: ../../moderator/external-users/rules/add.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:42
+#: ../../moderator/external-users/rules/add.md:42
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/add_rule.md:55
+#: ../../moderator/external-users/rules/add.md:55
 msgid "That's all there is to it! You've applied your moderation rule. The rule takes effect as soon as you create it."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/external-users/rules/delete.pot b/docs/locales/gettext/moderator/external-users/rules/delete.pot
index dee85e308..753999917 100644
--- a/docs/locales/gettext/moderator/external-users/rules/delete.pot
+++ b/docs/locales/gettext/moderator/external-users/rules/delete.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,77 +16,77 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/external_users/delete_rule.md:1
+#: ../../moderator/external-users/rules/delete.md:1
 msgid "Delete a moderation rule"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/delete_rule.md:3
+#: ../../moderator/external-users/rules/delete.md:3
 msgid "If you no longer need a moderation rule, you can delete it completely. This allows the user to interact with your pod normally."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/delete_rule.md:0
+#: ../../moderator/external-users/rules/delete.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/delete_rule.md:9
+#: ../../moderator/external-users/rules/delete.md:9
 msgid "{guilabel}`Moderation` – provides access to the administration and moderation menus."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/delete_rule.md:12
+#: ../../moderator/external-users/rules/delete.md:12
 msgid "To delete an existing moderation rule:"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/delete_rule.md:0
+#: ../../moderator/external-users/rules/delete.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/delete_rule.md:20
-#: ../../moderator_documentation/external_users/delete_rule.md:34
+#: ../../moderator/external-users/rules/delete.md:20
+#: ../../moderator/external-users/rules/delete.md:34
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/delete_rule.md:21
+#: ../../moderator/external-users/rules/delete.md:21
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/delete_rule.md:22
-#: ../../moderator_documentation/external_users/delete_rule.md:36
+#: ../../moderator/external-users/rules/delete.md:22
+#: ../../moderator/external-users/rules/delete.md:36
 msgid "Select {guilabel}`Moderation`. The {guilabel}`Reports` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/delete_rule.md:23
-#: ../../moderator_documentation/external_users/delete_rule.md:37
+#: ../../moderator/external-users/rules/delete.md:23
+#: ../../moderator/external-users/rules/delete.md:37
 msgid "Select {guilabel}`Users` at the top of the page. The {guilabel}`Users` page opens. You can see a list of known users on this page."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/delete_rule.md:24
-#: ../../moderator_documentation/external_users/delete_rule.md:38
+#: ../../moderator/external-users/rules/delete.md:24
+#: ../../moderator/external-users/rules/delete.md:38
 msgid "Select the user with the moderation rule you want to edit. The user's moderation page opens."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/delete_rule.md:25
-#: ../../moderator_documentation/external_users/delete_rule.md:39
+#: ../../moderator/external-users/rules/delete.md:25
+#: ../../moderator/external-users/rules/delete.md:39
 msgid "Select {guilabel}`Edit` under the {guilabel}`This user is subject to specific moderation rules` header. The moderation policy form opens."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/delete_rule.md:26
-#: ../../moderator_documentation/external_users/delete_rule.md:40
+#: ../../moderator/external-users/rules/delete.md:26
+#: ../../moderator/external-users/rules/delete.md:40
 msgid "Select {guilabel}`Delete`. A {guilabel}`Delete this moderation rule?` warning appears."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/delete_rule.md:27
-#: ../../moderator_documentation/external_users/delete_rule.md:41
+#: ../../moderator/external-users/rules/delete.md:27
+#: ../../moderator/external-users/rules/delete.md:41
 msgid "Select {guilabel}`Delete moderation rule`."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/delete_rule.md:0
+#: ../../moderator/external-users/rules/delete.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/delete_rule.md:35
+#: ../../moderator/external-users/rules/delete.md:35
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/delete_rule.md:45
+#: ../../moderator/external-users/rules/delete.md:45
 msgid "That's it! You've deleted your moderation rule. Content from the user will no longer get blocked."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/external-users/rules/edit.pot b/docs/locales/gettext/moderator/external-users/rules/edit.pot
index 810e59dc8..41ae63c68 100644
--- a/docs/locales/gettext/moderator/external-users/rules/edit.pot
+++ b/docs/locales/gettext/moderator/external-users/rules/edit.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,106 +16,106 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/external_users/edit_rule.md:1
+#: ../../moderator/external-users/rules/edit.md:1
 msgid "Edit a moderation rule"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:4
+#: ../../moderator/external-users/rules/edit.md:4
 msgid "Purging a user's data removes all objects and caches associated to that user. This impacts users who have objects from these users in their libraries."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:7
+#: ../../moderator/external-users/rules/edit.md:7
 msgid "You can change a moderation rule on a user at any time."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:0
+#: ../../moderator/external-users/rules/edit.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:13
+#: ../../moderator/external-users/rules/edit.md:13
 msgid "{guilabel}`Moderation` – provides access to the administration and moderation menus."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:16
+#: ../../moderator/external-users/rules/edit.md:16
 msgid "To update an existing moderation rule:"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:0
+#: ../../moderator/external-users/rules/edit.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:24
-#: ../../moderator_documentation/external_users/edit_rule.md:43
+#: ../../moderator/external-users/rules/edit.md:24
+#: ../../moderator/external-users/rules/edit.md:43
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:25
+#: ../../moderator/external-users/rules/edit.md:25
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:26
-#: ../../moderator_documentation/external_users/edit_rule.md:45
+#: ../../moderator/external-users/rules/edit.md:26
+#: ../../moderator/external-users/rules/edit.md:45
 msgid "Select {guilabel}`Moderation`. The {guilabel}`Reports` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:27
-#: ../../moderator_documentation/external_users/edit_rule.md:46
+#: ../../moderator/external-users/rules/edit.md:27
+#: ../../moderator/external-users/rules/edit.md:46
 msgid "Select {guilabel}`Users` at the top of the page. The {guilabel}`Users` page opens. You can see a list of known users on this page."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:28
-#: ../../moderator_documentation/external_users/edit_rule.md:47
+#: ../../moderator/external-users/rules/edit.md:28
+#: ../../moderator/external-users/rules/edit.md:47
 msgid "Select the user with the moderation rule you want to edit. The user's moderation page opens."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:29
-#: ../../moderator_documentation/external_users/edit_rule.md:48
+#: ../../moderator/external-users/rules/edit.md:29
+#: ../../moderator/external-users/rules/edit.md:48
 msgid "Select {guilabel}`Edit` under the {guilabel}`This user is subject to specific moderation rules` header. The moderation policy form opens."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:30
-#: ../../moderator_documentation/external_users/edit_rule.md:49
+#: ../../moderator/external-users/rules/edit.md:30
+#: ../../moderator/external-users/rules/edit.md:49
 msgid "**Optional** – Edit the following settings:"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:31
-#: ../../moderator_documentation/external_users/edit_rule.md:50
+#: ../../moderator/external-users/rules/edit.md:31
+#: ../../moderator/external-users/rules/edit.md:50
 msgid "{guilabel}`Enabled` – toggle this switch to enable or disable the rule without deleting it."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:32
-#: ../../moderator_documentation/external_users/edit_rule.md:51
+#: ../../moderator/external-users/rules/edit.md:32
+#: ../../moderator/external-users/rules/edit.md:51
 msgid "{guilabel}`Reason` – update the reason for the moderation rule."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:33
-#: ../../moderator_documentation/external_users/edit_rule.md:52
+#: ../../moderator/external-users/rules/edit.md:33
+#: ../../moderator/external-users/rules/edit.md:52
 msgid "**Optional** – Update your moderation rule:"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:34
-#: ../../moderator_documentation/external_users/edit_rule.md:53
+#: ../../moderator/external-users/rules/edit.md:34
+#: ../../moderator/external-users/rules/edit.md:53
 msgid "{guilabel}`Block everything` – purge all content from this user and block all content."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:35
-#: ../../moderator_documentation/external_users/edit_rule.md:54
+#: ../../moderator/external-users/rules/edit.md:35
+#: ../../moderator/external-users/rules/edit.md:54
 msgid "{guilabel}`Reject media` – only reject media files such as audio files, avatars, and album art."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:36
-#: ../../moderator_documentation/external_users/edit_rule.md:55
+#: ../../moderator/external-users/rules/edit.md:36
+#: ../../moderator/external-users/rules/edit.md:55
 msgid "Select {guilabel}`Update` to save your rule."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:0
+#: ../../moderator/external-users/rules/edit.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:44
+#: ../../moderator/external-users/rules/edit.md:44
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/external_users/edit_rule.md:59
+#: ../../moderator/external-users/rules/edit.md:59
 msgid "You're done! The changes to the rule take effect as soon as you update it."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/index.pot b/docs/locales/gettext/moderator/index.pot
index 81b2da5be..8efa2d9e1 100644
--- a/docs/locales/gettext/moderator/index.pot
+++ b/docs/locales/gettext/moderator/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,70 +16,70 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/index.md:1
+#: ../../moderator/index.md:1
 msgid "Get started"
 msgstr ""
 
-#: ../../moderator_documentation/index.md:3
+#: ../../moderator/index.md:3
 msgid "{term}`Pod` moderators are responsible for enforcing the rules of a pod. Moderation permissions enable moderators to provide specific tasks:"
 msgstr ""
 
-#: ../../moderator_documentation/index.md:5
+#: ../../moderator/index.md:5
 msgid "{guilabel}`Moderation` – enables the moderator to moderate users, domains, and the allow-list."
 msgstr ""
 
-#: ../../moderator_documentation/index.md:6
+#: ../../moderator/index.md:6
 msgid "{guilabel}`Library` – enables the moderator to make changes to library content. This includes deleting local objects and handling edit suggestions."
 msgstr ""
 
-#: ../../moderator_documentation/index.md:8
+#: ../../moderator/index.md:8
 msgid "Follow the guides in our moderator documentation to handle moderation tasks."
 msgstr ""
 
-#: ../../moderator_documentation/index.md:14
+#: ../../moderator/index.md:14
 msgid "Handle user reports"
 msgstr ""
 
-#: ../../moderator_documentation/index.md:16
+#: ../../moderator/index.md:16
 msgid "One of the most important duties of a moderator is handling reports. If a user finds content that violates your pod's rules or the law, they can report it. Users can also report other users if they have broken the rules of your pod. Follow the guides in the [Reports](reports/index.md) section to learn how to handle these reports."
 msgstr ""
 
-#: ../../moderator_documentation/index.md:18
+#: ../../moderator/index.md:18
 msgid "Moderate your pod's users"
 msgstr ""
 
-#: ../../moderator_documentation/index.md:20
-msgid "As a moderator, you are responsible for moderating the behavior of users on your pod. Funkwhale provides you with tools to help you handle users that violate your pod's rules. Check out our [Moderate your pod's users](internal_users/index.md) section for more information."
+#: ../../moderator/index.md:20
+msgid "As a moderator, you are responsible for moderating the behavior of users on your pod. Funkwhale provides you with tools to help you handle users that violate your pod's rules. Check out our [Moderate your pod's users](internal-users/index.md) section for more information."
 msgstr ""
 
-#: ../../moderator_documentation/index.md:22
+#: ../../moderator/index.md:22
 msgid "Moderate content on your pod"
 msgstr ""
 
-#: ../../moderator_documentation/index.md:24
+#: ../../moderator/index.md:24
 msgid "Funkwhale's moderation tools enable moderators to handle the content on a pod. This means you can update, delete, or hide content. It also enables you to approve or reject edits submitted by users on your pod. Check out the guides in the [Moderate content on your pod](content/index.md) for more information."
 msgstr ""
 
-#: ../../moderator_documentation/index.md:26
+#: ../../moderator/index.md:26
 msgid "Moderate external domains"
 msgstr ""
 
-#: ../../moderator_documentation/index.md:28
+#: ../../moderator/index.md:28
 msgid "As {term}`fediverse` software, Funkwhale interacts with other software over federation. Read through the [Moderate external domains](domains/index.md) section to handle content from other servers."
 msgstr ""
 
-#: ../../moderator_documentation/index.md:30
+#: ../../moderator/index.md:30
 msgid "Moderate external users"
 msgstr ""
 
-#: ../../moderator_documentation/index.md:32
-msgid "You can moderate how external users interact with users on your pod. Check out the [Moderate external users](external_users/index.md) guides to learn how to manage users from other servers."
+#: ../../moderator/index.md:32
+msgid "You can moderate how external users interact with users on your pod. Check out the [Moderate external users](external-users/index.md) guides to learn how to manage users from other servers."
 msgstr ""
 
-#: ../../moderator_documentation/index.md:34
+#: ../../moderator/index.md:34
 msgid "Manage your allow-list"
 msgstr ""
 
-#: ../../moderator_documentation/index.md:36
-msgid "If your pod admin has set up allow-listing, you can add and remove domains from your pod's list. Follow the guides in the [Allow-listing](allow_listing/index.md) section to learn how to handle your allow-list."
+#: ../../moderator/index.md:36
+msgid "If your pod admin has set up allow-listing, you can add and remove domains from your pod's list. Follow the guides in the [Allow-listing](allow-listing/index.md) section to learn how to handle your allow-list."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/internal-users/index.pot b/docs/locales/gettext/moderator/internal-users/index.pot
index 413a2f2ce..721ada39b 100644
--- a/docs/locales/gettext/moderator/internal-users/index.pot
+++ b/docs/locales/gettext/moderator/internal-users/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/internal_users/index.md:7
+#: ../../moderator/internal-users/index.md:7
 msgid "Moderate users"
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/index.md:17
+#: ../../moderator/internal-users/index.md:17
 msgid "Handle user registrations"
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/index.md:1
+#: ../../moderator/internal-users/index.md:1
 msgid "Moderate your pod's users"
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/index.md:3
+#: ../../moderator/internal-users/index.md:3
 msgid "Funkwhale provides you the tools you need to moderate users on your pod. Use these tools to tackle harassment and problematic content."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/index.md:5
+#: ../../moderator/internal-users/index.md:5
 msgid "{term}`Pod` admins can also enable manual sign-up validation. With this setting enabled, moderators need to approve or reject any user who signs up."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/internal-users/registration.pot b/docs/locales/gettext/moderator/internal-users/registration.pot
index 5bfa08aae..951eb4d08 100644
--- a/docs/locales/gettext/moderator/internal-users/registration.pot
+++ b/docs/locales/gettext/moderator/internal-users/registration.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,130 +16,130 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:1
+#: ../../moderator/internal-users/registration.md:1
 msgid "Handle user registrations"
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:3
+#: ../../moderator/internal-users/registration.md:3
 msgid "{term}`Pod` admins can enable manual sign-up validation. This setting requires moderators to approve or refuse account creations."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:0
+#: ../../moderator/internal-users/registration.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:9
+#: ../../moderator/internal-users/registration.md:9
 msgid "{guilabel}`Moderation` – provides access to the administration and moderation menus."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:12
+#: ../../moderator/internal-users/registration.md:12
 msgid "Requests appear in the {guilabel}`User Requests` list. Each request contains the following information:"
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:14
+#: ../../moderator/internal-users/registration.md:14
 msgid "The user the request was {guilabel}`Submitted by`"
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:15
+#: ../../moderator/internal-users/registration.md:15
 msgid "The {guilabel}`Creation date` of the request."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:16
+#: ../../moderator/internal-users/registration.md:16
 msgid "**Optional** – any responses the user left to fields in the sign-up form."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:17
+#: ../../moderator/internal-users/registration.md:17
 msgid "The {guilabel}`Status` of the request."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:18
+#: ../../moderator/internal-users/registration.md:18
 msgid "Which moderator the request is {guilabel}`Assigned to`."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:19
+#: ../../moderator/internal-users/registration.md:19
 msgid "The {guilabel}`Resolution date` of the request."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:20
+#: ../../moderator/internal-users/registration.md:20
 msgid "Any {guilabel}`Internal notes` left by the moderators."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:26
+#: ../../moderator/internal-users/registration.md:26
 msgid "Approve a sign-up request"
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:28
+#: ../../moderator/internal-users/registration.md:28
 msgid "To approve a sign-up request:"
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:0
+#: ../../moderator/internal-users/registration.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:36
-#: ../../moderator_documentation/internal_users/handle_registration.md:48
-#: ../../moderator_documentation/internal_users/handle_registration.md:69
-#: ../../moderator_documentation/internal_users/handle_registration.md:81
+#: ../../moderator/internal-users/registration.md:36
+#: ../../moderator/internal-users/registration.md:48
+#: ../../moderator/internal-users/registration.md:69
+#: ../../moderator/internal-users/registration.md:81
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:37
-#: ../../moderator_documentation/internal_users/handle_registration.md:70
+#: ../../moderator/internal-users/registration.md:37
+#: ../../moderator/internal-users/registration.md:70
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:38
-#: ../../moderator_documentation/internal_users/handle_registration.md:50
-#: ../../moderator_documentation/internal_users/handle_registration.md:71
-#: ../../moderator_documentation/internal_users/handle_registration.md:83
+#: ../../moderator/internal-users/registration.md:38
+#: ../../moderator/internal-users/registration.md:50
+#: ../../moderator/internal-users/registration.md:71
+#: ../../moderator/internal-users/registration.md:83
 msgid "Select {guilabel}`Moderation`. The {guilabel}`Reports` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:39
-#: ../../moderator_documentation/internal_users/handle_registration.md:51
-#: ../../moderator_documentation/internal_users/handle_registration.md:72
-#: ../../moderator_documentation/internal_users/handle_registration.md:84
+#: ../../moderator/internal-users/registration.md:39
+#: ../../moderator/internal-users/registration.md:51
+#: ../../moderator/internal-users/registration.md:72
+#: ../../moderator/internal-users/registration.md:84
 msgid "Select {guilabel}`User Requests` at the top of the screen. A list of pending requests appears."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:40
-#: ../../moderator_documentation/internal_users/handle_registration.md:52
-#: ../../moderator_documentation/internal_users/handle_registration.md:73
-#: ../../moderator_documentation/internal_users/handle_registration.md:85
+#: ../../moderator/internal-users/registration.md:40
+#: ../../moderator/internal-users/registration.md:52
+#: ../../moderator/internal-users/registration.md:73
+#: ../../moderator/internal-users/registration.md:85
 msgid "Read through the details of the request."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:41
-#: ../../moderator_documentation/internal_users/handle_registration.md:53
+#: ../../moderator/internal-users/registration.md:41
+#: ../../moderator/internal-users/registration.md:53
 msgid "Select {guilabel}`Approve` in the {guilabel}`Actions` section."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:0
+#: ../../moderator/internal-users/registration.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:49
-#: ../../moderator_documentation/internal_users/handle_registration.md:82
+#: ../../moderator/internal-users/registration.md:49
+#: ../../moderator/internal-users/registration.md:82
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:57
+#: ../../moderator/internal-users/registration.md:57
 msgid "That's it! You've approved the user's sign-up request. The user can now log in."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:59
+#: ../../moderator/internal-users/registration.md:59
 msgid "Refuse a sign-up request"
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:61
+#: ../../moderator/internal-users/registration.md:61
 msgid "To refuse a sign-up request:"
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:74
-#: ../../moderator_documentation/internal_users/handle_registration.md:86
+#: ../../moderator/internal-users/registration.md:74
+#: ../../moderator/internal-users/registration.md:86
 msgid "Select {guilabel}`Refuse` in the {guilabel}`Actions` section."
 msgstr ""
 
-#: ../../moderator_documentation/internal_users/handle_registration.md:90
+#: ../../moderator/internal-users/registration.md:90
 msgid "That's it! You've refused the user's sign-up request. The user can't log in to your pod."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/reports/content.pot b/docs/locales/gettext/moderator/reports/content.pot
index 9019234b6..68c039f8f 100644
--- a/docs/locales/gettext/moderator/reports/content.pot
+++ b/docs/locales/gettext/moderator/reports/content.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,136 +16,136 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/reports/handle_content.md:1
+#: ../../moderator/reports/content.md:1
 msgid "Handle reported content"
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:4
+#: ../../moderator/reports/content.md:4
 msgid "Deleting reported objects is irreversible. This action deletes the associated files from the pod."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:7
+#: ../../moderator/reports/content.md:7
 msgid "You can handle content reports from the {guilabel}`Reports` page or from the reported object's moderation page. You only need to open the moderation page to edit objects."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:0
+#: ../../moderator/reports/content.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:13
+#: ../../moderator/reports/content.md:13
 msgid "{guilabel}`Moderation` – provides access to the administration and moderation menus."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:14
+#: ../../moderator/reports/content.md:14
 msgid "{guilabel}`Library` – enables the moderator to delete objects."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:21
+#: ../../moderator/reports/content.md:21
 msgid "Handle reports from the Reports page"
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:23
+#: ../../moderator/reports/content.md:23
 msgid "To handle a content report from the {guilabel}`Reports` page:"
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:0
+#: ../../moderator/reports/content.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:31
-#: ../../moderator_documentation/reports/handle_content.md:44
-#: ../../moderator_documentation/reports/handle_content.md:66
-#: ../../moderator_documentation/reports/handle_content.md:83
+#: ../../moderator/reports/content.md:31
+#: ../../moderator/reports/content.md:44
+#: ../../moderator/reports/content.md:66
+#: ../../moderator/reports/content.md:83
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:32
-#: ../../moderator_documentation/reports/handle_content.md:67
+#: ../../moderator/reports/content.md:32
+#: ../../moderator/reports/content.md:67
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:33
-#: ../../moderator_documentation/reports/handle_content.md:46
-#: ../../moderator_documentation/reports/handle_content.md:68
-#: ../../moderator_documentation/reports/handle_content.md:85
+#: ../../moderator/reports/content.md:33
+#: ../../moderator/reports/content.md:46
+#: ../../moderator/reports/content.md:68
+#: ../../moderator/reports/content.md:85
 msgid "Select {guilabel}`Moderation`. The {guilabel}`Reports` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:34
-#: ../../moderator_documentation/reports/handle_content.md:47
-#: ../../moderator_documentation/reports/handle_content.md:69
-#: ../../moderator_documentation/reports/handle_content.md:86
-msgid "[Search for the report](search_reports.md)."
+#: ../../moderator/reports/content.md:34
+#: ../../moderator/reports/content.md:47
+#: ../../moderator/reports/content.md:69
+#: ../../moderator/reports/content.md:86
+msgid "[Search for the report](search.md)."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:35
-#: ../../moderator_documentation/reports/handle_content.md:48
+#: ../../moderator/reports/content.md:35
+#: ../../moderator/reports/content.md:48
 msgid "Select an action from the {guilabel}`Actions` section:"
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:36
-#: ../../moderator_documentation/reports/handle_content.md:49
+#: ../../moderator/reports/content.md:36
+#: ../../moderator/reports/content.md:49
 msgid "{guilabel}`Resolve` – resolve the report with no further action."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:37
-#: ../../moderator_documentation/reports/handle_content.md:50
+#: ../../moderator/reports/content.md:37
+#: ../../moderator/reports/content.md:50
 msgid "{guilabel}`Delete reported object` – delete the object associated with the report. If you delete an artist or album, this deletes all files associated with the object."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:0
+#: ../../moderator/reports/content.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:45
-#: ../../moderator_documentation/reports/handle_content.md:84
+#: ../../moderator/reports/content.md:45
+#: ../../moderator/reports/content.md:84
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:54
-#: ../../moderator_documentation/reports/handle_content.md:97
-msgid "Resolving the report assigns it to you so other moderators know who handled the report. Add [internal notes](internal_notes.md) to keep a record of your changes."
+#: ../../moderator/reports/content.md:54
+#: ../../moderator/reports/content.md:97
+msgid "Resolving the report assigns it to you so other moderators know who handled the report. Add [internal notes](notes.md) to keep a record of your changes."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:56
+#: ../../moderator/reports/content.md:56
 msgid "Edit content in the moderation page"
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:58
+#: ../../moderator/reports/content.md:58
 msgid "If you want to edit an object to change its metadata:"
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:70
-#: ../../moderator_documentation/reports/handle_content.md:87
+#: ../../moderator/reports/content.md:70
+#: ../../moderator/reports/content.md:87
 msgid "Select {guilabel}`Open in moderation interface` in the {guilabel}`Reported object` section. The object's moderation page opens."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:71
-#: ../../moderator_documentation/reports/handle_content.md:88
+#: ../../moderator/reports/content.md:71
+#: ../../moderator/reports/content.md:88
 msgid "Select {guilabel}`Edit`. The {guilabel}`Edit` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:72
-#: ../../moderator_documentation/reports/handle_content.md:89
+#: ../../moderator/reports/content.md:72
+#: ../../moderator/reports/content.md:89
 msgid "Edit the details on this page. Leave a {guilabel}`Summary` of your changes for reference."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:73
-#: ../../moderator_documentation/reports/handle_content.md:90
+#: ../../moderator/reports/content.md:73
+#: ../../moderator/reports/content.md:90
 msgid "Select {guilabel}`Submit and apply edit`."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:74
-#: ../../moderator_documentation/reports/handle_content.md:91
+#: ../../moderator/reports/content.md:74
+#: ../../moderator/reports/content.md:91
 msgid "Return to the {guilabel}`Reports` page."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:75
-#: ../../moderator_documentation/reports/handle_content.md:92
+#: ../../moderator/reports/content.md:75
+#: ../../moderator/reports/content.md:92
 msgid "Search for the report."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_content.md:76
-#: ../../moderator_documentation/reports/handle_content.md:93
+#: ../../moderator/reports/content.md:76
+#: ../../moderator/reports/content.md:93
 msgid "Select {guilabel}`Resolve` in the {guilabel}`Actions` section."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/reports/index.pot b/docs/locales/gettext/moderator/reports/index.pot
index d167e00cb..3eb98fe3f 100644
--- a/docs/locales/gettext/moderator/reports/index.pot
+++ b/docs/locales/gettext/moderator/reports/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,59 +16,59 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/reports/index.md:20
+#: ../../moderator/reports/index.md:20
 msgid "Use the reports page"
 msgstr ""
 
-#: ../../moderator_documentation/reports/index.md:1
-#: ../../moderator_documentation/reports/index.md:32
+#: ../../moderator/reports/index.md:1
+#: ../../moderator/reports/index.md:32
 msgid "Handle reports"
 msgstr ""
 
-#: ../../moderator_documentation/reports/index.md:3
+#: ../../moderator/reports/index.md:3
 msgid "As a Funkwhale moderator, you have extra permissions. These permissions enable you to handle reports submitted by users and anonymous browsers."
 msgstr ""
 
-#: ../../moderator_documentation/reports/index.md:5
+#: ../../moderator/reports/index.md:5
 msgid "When a user submits a report it ends up in the moderation queue on the {guilabel}`Reports` page. Moderators can use the tools on this page to handle the report."
 msgstr ""
 
-#: ../../moderator_documentation/reports/index.md:7
+#: ../../moderator/reports/index.md:7
 msgid "Each report contains information that can help you handle the reported object:"
 msgstr ""
 
-#: ../../moderator_documentation/reports/index.md:9
+#: ../../moderator/reports/index.md:9
 msgid "The user who submitted the report."
 msgstr ""
 
-#: ../../moderator_documentation/reports/index.md:10
+#: ../../moderator/reports/index.md:10
 msgid "The report {guilabel}`Category`. You can change this if it is not correct."
 msgstr ""
 
-#: ../../moderator_documentation/reports/index.md:11
+#: ../../moderator/reports/index.md:11
 msgid "The date the user submitted the report."
 msgstr ""
 
-#: ../../moderator_documentation/reports/index.md:12
+#: ../../moderator/reports/index.md:12
 msgid "The message the user posted with the report (if applicable)."
 msgstr ""
 
-#: ../../moderator_documentation/reports/index.md:13
+#: ../../moderator/reports/index.md:13
 msgid "The {guilabel}`Status` of the report."
 msgstr ""
 
-#: ../../moderator_documentation/reports/index.md:14
+#: ../../moderator/reports/index.md:14
 msgid "Any {guilabel}`Internal notes` left by moderators."
 msgstr ""
 
-#: ../../moderator_documentation/reports/index.md:15
+#: ../../moderator/reports/index.md:15
 msgid "A summary of the {guilabel}`Reported object`."
 msgstr ""
 
-#: ../../moderator_documentation/reports/index.md:16
+#: ../../moderator/reports/index.md:16
 msgid "A list of available {guilabel}`Actions`."
 msgstr ""
 
-#: ../../moderator_documentation/reports/index.md:18
+#: ../../moderator/reports/index.md:18
 msgid "Follow the guides in this section to start handling reports submitted to your {term}`pod`."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/reports/notes.pot b/docs/locales/gettext/moderator/reports/notes.pot
index 09befa29f..ad131bd48 100644
--- a/docs/locales/gettext/moderator/reports/notes.pot
+++ b/docs/locales/gettext/moderator/reports/notes.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,97 +16,97 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/reports/internal_notes.md:1
+#: ../../moderator/reports/notes.md:1
 msgid "Use internal notes"
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:3
+#: ../../moderator/reports/notes.md:3
 msgid "Use internal notes to add information to a report. This can be a summary of your actions or an update on your investigation. Internal notes are only visible to pod admins and moderators."
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:0
+#: ../../moderator/reports/notes.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:9
+#: ../../moderator/reports/notes.md:9
 msgid "{guilabel}`Moderation` – provides access to the administration and moderation menus."
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:12
+#: ../../moderator/reports/notes.md:12
 msgid "Add notes to a report"
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:14
+#: ../../moderator/reports/notes.md:14
 msgid "You can add notes to **Unresolved** and **Resolved** reports. To add an internal note:"
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:0
+#: ../../moderator/reports/notes.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:22
-#: ../../moderator_documentation/reports/internal_notes.md:34
-#: ../../moderator_documentation/reports/internal_notes.md:57
-#: ../../moderator_documentation/reports/internal_notes.md:69
+#: ../../moderator/reports/notes.md:22
+#: ../../moderator/reports/notes.md:34
+#: ../../moderator/reports/notes.md:57
+#: ../../moderator/reports/notes.md:69
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:23
-#: ../../moderator_documentation/reports/internal_notes.md:58
+#: ../../moderator/reports/notes.md:23
+#: ../../moderator/reports/notes.md:58
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:24
-#: ../../moderator_documentation/reports/internal_notes.md:36
-#: ../../moderator_documentation/reports/internal_notes.md:59
-#: ../../moderator_documentation/reports/internal_notes.md:71
+#: ../../moderator/reports/notes.md:24
+#: ../../moderator/reports/notes.md:36
+#: ../../moderator/reports/notes.md:59
+#: ../../moderator/reports/notes.md:71
 msgid "Select {guilabel}`Moderation`. The {guilabel}`Reports` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:25
-#: ../../moderator_documentation/reports/internal_notes.md:37
-#: ../../moderator_documentation/reports/internal_notes.md:60
-#: ../../moderator_documentation/reports/internal_notes.md:72
-msgid "[Search for the report](search_reports.md)."
+#: ../../moderator/reports/notes.md:25
+#: ../../moderator/reports/notes.md:37
+#: ../../moderator/reports/notes.md:60
+#: ../../moderator/reports/notes.md:72
+msgid "[Search for the report](search.md)."
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:26
-#: ../../moderator_documentation/reports/internal_notes.md:38
+#: ../../moderator/reports/notes.md:26
+#: ../../moderator/reports/notes.md:38
 msgid "{guilabel}`Write` your note in the {guilabel}`Internal notes` section. This input field supports Markdown syntax. You can {guilabel}`Preview` how the note will look to other users."
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:27
-#: ../../moderator_documentation/reports/internal_notes.md:39
+#: ../../moderator/reports/notes.md:27
+#: ../../moderator/reports/notes.md:39
 msgid "Select {guilabel}`Add note` to save your note."
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:0
+#: ../../moderator/reports/notes.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:35
-#: ../../moderator_documentation/reports/internal_notes.md:70
+#: ../../moderator/reports/notes.md:35
+#: ../../moderator/reports/notes.md:70
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:43
+#: ../../moderator/reports/notes.md:43
 msgid "Delete notes from a report"
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:46
+#: ../../moderator/reports/notes.md:46
 msgid "Deleting an internal note is irreversible. Make sure you are not deleting anything important."
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:49
+#: ../../moderator/reports/notes.md:49
 msgid "You can delete your own notes and the notes of other moderators. You can do this for both **Resolved** and **Unresolved** reports. To delete an internal note:"
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:61
-#: ../../moderator_documentation/reports/internal_notes.md:73
+#: ../../moderator/reports/notes.md:61
+#: ../../moderator/reports/notes.md:73
 msgid "Find the note you want to delete in the {guilabel}`Internal notes` section."
 msgstr ""
 
-#: ../../moderator_documentation/reports/internal_notes.md:62
-#: ../../moderator_documentation/reports/internal_notes.md:74
+#: ../../moderator/reports/notes.md:62
+#: ../../moderator/reports/notes.md:74
 msgid "Select {guilabel}`Delete`"
 msgstr ""
diff --git a/docs/locales/gettext/moderator/reports/search.pot b/docs/locales/gettext/moderator/reports/search.pot
index bb6d99cf6..40eb73074 100644
--- a/docs/locales/gettext/moderator/reports/search.pot
+++ b/docs/locales/gettext/moderator/reports/search.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,78 +16,78 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/reports/search_reports.md:1
+#: ../../moderator/reports/search.md:1
 msgid "Search for reports"
 msgstr ""
 
-#: ../../moderator_documentation/reports/search_reports.md:3
+#: ../../moderator/reports/search.md:3
 msgid "The {guilabel}`Reports` page contains filters that enable you to search for reports. Use these filters to find reports by category, status, or key words."
 msgstr ""
 
-#: ../../moderator_documentation/reports/search_reports.md:0
+#: ../../moderator/reports/search.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/reports/search_reports.md:9
+#: ../../moderator/reports/search.md:9
 msgid "{guilabel}`Moderation` – provides access to the administration and moderation menus."
 msgstr ""
 
-#: ../../moderator_documentation/reports/search_reports.md:0
+#: ../../moderator/reports/search.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/reports/search_reports.md:18
-#: ../../moderator_documentation/reports/search_reports.md:33
+#: ../../moderator/reports/search.md:18
+#: ../../moderator/reports/search.md:33
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/reports/search_reports.md:19
+#: ../../moderator/reports/search.md:19
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/reports/search_reports.md:20
-#: ../../moderator_documentation/reports/search_reports.md:35
+#: ../../moderator/reports/search.md:20
+#: ../../moderator/reports/search.md:35
 msgid "Select {guilabel}`Moderation`. The {guilabel}`Reports` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/reports/search_reports.md:21
-#: ../../moderator_documentation/reports/search_reports.md:36
+#: ../../moderator/reports/search.md:21
+#: ../../moderator/reports/search.md:36
 msgid "Use the filters to find the report you want:"
 msgstr ""
 
-#: ../../moderator_documentation/reports/search_reports.md:22
-#: ../../moderator_documentation/reports/search_reports.md:37
+#: ../../moderator/reports/search.md:22
+#: ../../moderator/reports/search.md:37
 msgid "Enter key words in the {guilabel}`Search` field. This enables you to search for content in the report's {guilabel}`Message` section. Hit {kbd}`⏎ Return` to update your search."
 msgstr ""
 
-#: ../../moderator_documentation/reports/search_reports.md:23
-#: ../../moderator_documentation/reports/search_reports.md:38
+#: ../../moderator/reports/search.md:23
+#: ../../moderator/reports/search.md:38
 msgid "Filter reports by {guilabel}`Status`."
 msgstr ""
 
-#: ../../moderator_documentation/reports/search_reports.md:24
-#: ../../moderator_documentation/reports/search_reports.md:39
+#: ../../moderator/reports/search.md:24
+#: ../../moderator/reports/search.md:39
 msgid "Filter reports by {guilabel}`Category`."
 msgstr ""
 
-#: ../../moderator_documentation/reports/search_reports.md:25
-#: ../../moderator_documentation/reports/search_reports.md:40
+#: ../../moderator/reports/search.md:25
+#: ../../moderator/reports/search.md:40
 msgid "Select the criteria for {guilabel}`Ordering` of your search results."
 msgstr ""
 
-#: ../../moderator_documentation/reports/search_reports.md:26
-#: ../../moderator_documentation/reports/search_reports.md:41
+#: ../../moderator/reports/search.md:26
+#: ../../moderator/reports/search.md:41
 msgid "Select which {guilabel}`Order` you want to see your search results in."
 msgstr ""
 
-#: ../../moderator_documentation/reports/search_reports.md:0
+#: ../../moderator/reports/search.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/reports/search_reports.md:34
+#: ../../moderator/reports/search.md:34
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/reports/search_reports.md:45
-msgid "Once you have found the required report, you can handle the reported [user](handle_users.md) or [content](handle_content.md). You can also update the [internal notes](internal_notes.md) on the report."
+#: ../../moderator/reports/search.md:45
+msgid "Once you have found the required report, you can handle the reported [user](users.md) or [content](content.md). You can also update the [internal notes](notes.md) on the report."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/reports/users.pot b/docs/locales/gettext/moderator/reports/users.pot
index bc62bfbb8..244253ca6 100644
--- a/docs/locales/gettext/moderator/reports/users.pot
+++ b/docs/locales/gettext/moderator/reports/users.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,73 +16,73 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/reports/handle_users.md:1
+#: ../../moderator/reports/users.md:1
 msgid "Handle reported users"
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_users.md:3
+#: ../../moderator/reports/users.md:3
 msgid "If a user has reported another user on your pod, you can make changes to the reported user's profile. Use the user's moderation page to take the appropriate steps to handle the report."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_users.md:0
+#: ../../moderator/reports/users.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_users.md:9
+#: ../../moderator/reports/users.md:9
 msgid "{guilabel}`Moderation` – provides access to the administration and moderation menus."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_users.md:12
+#: ../../moderator/reports/users.md:12
 msgid "To open a user's moderation page:"
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_users.md:0
+#: ../../moderator/reports/users.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_users.md:20
-#: ../../moderator_documentation/reports/handle_users.md:30
+#: ../../moderator/reports/users.md:20
+#: ../../moderator/reports/users.md:30
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_users.md:21
+#: ../../moderator/reports/users.md:21
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_users.md:22
-#: ../../moderator_documentation/reports/handle_users.md:32
+#: ../../moderator/reports/users.md:22
+#: ../../moderator/reports/users.md:32
 msgid "Select {guilabel}`Moderation`. The {guilabel}`Reports` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_users.md:23
-#: ../../moderator_documentation/reports/handle_users.md:33
-msgid "[Search for the report](search_reports.md) and select {guilabel}`Open in moderation interface` under {guilabel}`Reported object`. The user's moderation page opens."
+#: ../../moderator/reports/users.md:23
+#: ../../moderator/reports/users.md:33
+msgid "[Search for the report](search.md) and select {guilabel}`Open in moderation interface` under {guilabel}`Reported object`. The user's moderation page opens."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_users.md:0
+#: ../../moderator/reports/users.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_users.md:31
+#: ../../moderator/reports/users.md:31
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the page to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_users.md:37
+#: ../../moderator/reports/users.md:37
 msgid "You can change the following settings in the moderation interface:"
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_users.md:39
+#: ../../moderator/reports/users.md:39
 msgid "{guilabel}`Login status` – disable this switch to prevent the user being able to log in."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_users.md:40
+#: ../../moderator/reports/users.md:40
 msgid "{guilabel}`Permissions` – add or remove permissions associated with the user."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_users.md:41
+#: ../../moderator/reports/users.md:41
 msgid "{guilabel}`Upload quota` – change the amount of data (in megabytes) that the user can upload."
 msgstr ""
 
-#: ../../moderator_documentation/reports/handle_users.md:43
-msgid "Once you have made your changes, return to the {guilabel}`Reports` page and {guilabel}`Resolve` the report. Resolving the report assigns it to you so other moderators know who handled the report. Add [internal notes](internal_notes.md) to keep a record of your changes."
+#: ../../moderator/reports/users.md:43
+msgid "Once you have made your changes, return to the {guilabel}`Reports` page and {guilabel}`Resolve` the report. Resolving the report assigns it to you so other moderators know who handled the report. Add [internal notes](notes.md) to keep a record of your changes."
 msgstr ""
diff --git a/docs/locales/gettext/moderator/reports/view.pot b/docs/locales/gettext/moderator/reports/view.pot
index 5393d112c..9f86e3c98 100644
--- a/docs/locales/gettext/moderator/reports/view.pot
+++ b/docs/locales/gettext/moderator/reports/view.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,126 +16,126 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../moderator_documentation/reports/view_reports.md:1
+#: ../../moderator/reports/view.md:1
 msgid "View unresolved reports"
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:3
+#: ../../moderator/reports/view.md:3
 msgid "When a user reports an object on your {term}`pod`, the report gets sent to a moderation queue. You can check this moderation queue to handle any reports that users have submitted."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:0
+#: ../../moderator/reports/view.md:0
 msgid "Required permissions"
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:9
+#: ../../moderator/reports/view.md:9
 msgid "{guilabel}`Moderation` – provides access to the administration and moderation menus."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:12
+#: ../../moderator/reports/view.md:12
 msgid "Check the Reports page"
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:14
+#: ../../moderator/reports/view.md:14
 msgid "You can see a list of unresolved reports by going to the {guilabel}`Reports` page. To do this:"
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:0
+#: ../../moderator/reports/view.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:22
-#: ../../moderator_documentation/reports/view_reports.md:31
+#: ../../moderator/reports/view.md:22
+#: ../../moderator/reports/view.md:31
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:23
+#: ../../moderator/reports/view.md:23
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the sidebar to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:24
-#: ../../moderator_documentation/reports/view_reports.md:33
+#: ../../moderator/reports/view.md:24
+#: ../../moderator/reports/view.md:33
 msgid "Select {guilabel}`Moderation`. The {guilabel}`Reports` page opens."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:0
+#: ../../moderator/reports/view.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:32
+#: ../../moderator/reports/view.md:32
 msgid "Select the wrench icon ({fa}`wrench`) at the top of the screen to open the {guilabel}`Administration` menu."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:37
+#: ../../moderator/reports/view.md:37
 msgid "That's it! A list of unresolved reports appears on the screen. The summary contains the following information:"
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:39
-#: ../../moderator_documentation/reports/view_reports.md:54
+#: ../../moderator/reports/view.md:39
+#: ../../moderator/reports/view.md:54
 msgid "The user who submitted the report."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:40
+#: ../../moderator/reports/view.md:40
 msgid "The report {guilabel}`Category`."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:41
+#: ../../moderator/reports/view.md:41
 msgid "The date the user submitted the report."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:42
-#: ../../moderator_documentation/reports/view_reports.md:58
+#: ../../moderator/reports/view.md:42
+#: ../../moderator/reports/view.md:58
 msgid "The message the user posted with the report (if applicable)."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:43
+#: ../../moderator/reports/view.md:43
 msgid "The {guilabel}`Status` of the report."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:44
+#: ../../moderator/reports/view.md:44
 msgid "Any {guilabel}`Internal notes` left by moderators."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:45
+#: ../../moderator/reports/view.md:45
 msgid "A summary of the {guilabel}`Reported object`."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:46
+#: ../../moderator/reports/view.md:46
 msgid "A list of available {guilabel}`Actions`."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:48
-msgid "Use the tools on this page the handle the reported [content](handle_content.md) or [user](handle_users.md)."
+#: ../../moderator/reports/view.md:48
+msgid "Use the tools on this page the handle the reported [content](content.md) or [user](users.md)."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:50
+#: ../../moderator/reports/view.md:50
 msgid "Email notifications"
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:52
+#: ../../moderator/reports/view.md:52
 msgid "When a user submits a report, an email gets sent to all pod moderators. This email contains a summary of the report including:"
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:55
+#: ../../moderator/reports/view.md:55
 msgid "The object that the user reported."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:56
+#: ../../moderator/reports/view.md:56
 msgid "A link to the object on your pod."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:57
+#: ../../moderator/reports/view.md:57
 msgid "A link to the object's moderation page."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:59
+#: ../../moderator/reports/view.md:59
 msgid "A link to the report."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:60
+#: ../../moderator/reports/view.md:60
 msgid "A link to the {guilabel}`Reports` page."
 msgstr ""
 
-#: ../../moderator_documentation/reports/view_reports.md:62
+#: ../../moderator/reports/view.md:62
 msgid "Follow the links in the email to view the report."
 msgstr ""
diff --git a/docs/locales/gettext/user/accounts/activity.pot b/docs/locales/gettext/user/accounts/activity.pot
index 93566e3e4..b267482f8 100644
--- a/docs/locales/gettext/user/accounts/activity.pot
+++ b/docs/locales/gettext/user/accounts/activity.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,71 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/accounts/activity_visibility.md:1
+#: ../../user/accounts/activity.md:1
 msgid "Change your activity visibility"
 msgstr ""
 
-#: ../../user_documentation/accounts/activity_visibility.md:3
+#: ../../user/accounts/activity.md:3
 msgid "Your **activity visibility** determines who can see your listening activity on Funkwhale. There are three visibility options:"
 msgstr ""
 
-#: ../../user_documentation/accounts/activity_visibility.md:5
+#: ../../user/accounts/activity.md:5
 msgid "**Nobody except me** – only you can see your listening activity."
 msgstr ""
 
-#: ../../user_documentation/accounts/activity_visibility.md:6
+#: ../../user/accounts/activity.md:6
 msgid "**Everyone on this instance** – users who have an account on the same {term}`pod` as you can see your listening activity."
 msgstr ""
 
-#: ../../user_documentation/accounts/activity_visibility.md:7
+#: ../../user/accounts/activity.md:7
 msgid "**Everyone, across all instances** – anybody can see your listening activity."
 msgstr ""
 
-#: ../../user_documentation/accounts/activity_visibility.md:9
+#: ../../user/accounts/activity.md:9
 msgid "To change your activity visibility:"
 msgstr ""
 
-#: ../../user_documentation/accounts/activity_visibility.md:0
+#: ../../user/accounts/activity.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/accounts/activity_visibility.md:17
-#: ../../user_documentation/accounts/activity_visibility.md:29
+#: ../../user/accounts/activity.md:17
+#: ../../user/accounts/activity.md:29
 msgid "Log in to your account."
 msgstr ""
 
-#: ../../user_documentation/accounts/activity_visibility.md:18
+#: ../../user/accounts/activity.md:18
 msgid "Select the cog icon ({fa}`cog`) or your avatar to expand the user menu."
 msgstr ""
 
-#: ../../user_documentation/accounts/activity_visibility.md:19
-#: ../../user_documentation/accounts/activity_visibility.md:31
+#: ../../user/accounts/activity.md:19
+#: ../../user/accounts/activity.md:31
 msgid "Select {guilabel}`Settings`."
 msgstr ""
 
-#: ../../user_documentation/accounts/activity_visibility.md:20
-#: ../../user_documentation/accounts/activity_visibility.md:32
+#: ../../user/accounts/activity.md:20
+#: ../../user/accounts/activity.md:32
 msgid "Find {guilabel}`Activity visibility` in the {guilabel}`Account settings` section."
 msgstr ""
 
-#: ../../user_documentation/accounts/activity_visibility.md:21
-#: ../../user_documentation/accounts/activity_visibility.md:33
+#: ../../user/accounts/activity.md:21
+#: ../../user/accounts/activity.md:33
 msgid "Select your visibility level from the dropdown menu."
 msgstr ""
 
-#: ../../user_documentation/accounts/activity_visibility.md:22
-#: ../../user_documentation/accounts/activity_visibility.md:34
+#: ../../user/accounts/activity.md:22
+#: ../../user/accounts/activity.md:34
 msgid "Select {guilabel}`Update settings` to save your changes."
 msgstr ""
 
-#: ../../user_documentation/accounts/activity_visibility.md:0
+#: ../../user/accounts/activity.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/accounts/activity_visibility.md:30
+#: ../../user/accounts/activity.md:30
 msgid "Select the cog icon ({fa}`cog`) or your avatar to open the {guilabel}`Options` menu."
 msgstr ""
 
-#: ../../user_documentation/accounts/activity_visibility.md:38
+#: ../../user/accounts/activity.md:38
 msgid "That's it! You've updated your activity visibility. This change takes effect as soon as you update your settings."
 msgstr ""
diff --git a/docs/locales/gettext/user/accounts/avatar/add.pot b/docs/locales/gettext/user/accounts/avatar/add.pot
index 5b26bdea5..abd1d2148 100644
--- a/docs/locales/gettext/user/accounts/avatar/add.pot
+++ b/docs/locales/gettext/user/accounts/avatar/add.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,58 +16,58 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/accounts/add_avatar.md:1
+#: ../../user/accounts/avatar/add.md:1
 msgid "Add your avatar"
 msgstr ""
 
-#: ../../user_documentation/accounts/add_avatar.md:3
+#: ../../user/accounts/avatar/add.md:3
 msgid "You can upload an avatar to your account. Other users can see this when they visit your profile. To add an avatar:"
 msgstr ""
 
-#: ../../user_documentation/accounts/add_avatar.md:0
+#: ../../user/accounts/avatar/add.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/accounts/add_avatar.md:11
-#: ../../user_documentation/accounts/add_avatar.md:23
+#: ../../user/accounts/avatar/add.md:11
+#: ../../user/accounts/avatar/add.md:23
 msgid "Log in to your account."
 msgstr ""
 
-#: ../../user_documentation/accounts/add_avatar.md:12
+#: ../../user/accounts/avatar/add.md:12
 msgid "Select the cog icon ({fa}`cog`) or your existing avatar to expand the user menu."
 msgstr ""
 
-#: ../../user_documentation/accounts/add_avatar.md:13
-#: ../../user_documentation/accounts/add_avatar.md:25
+#: ../../user/accounts/avatar/add.md:13
+#: ../../user/accounts/avatar/add.md:25
 msgid "Select {guilabel}`Settings`."
 msgstr ""
 
-#: ../../user_documentation/accounts/add_avatar.md:14
-#: ../../user_documentation/accounts/add_avatar.md:26
+#: ../../user/accounts/avatar/add.md:14
+#: ../../user/accounts/avatar/add.md:26
 msgid "Scroll down to the {guilabel}`Avatar` section."
 msgstr ""
 
-#: ../../user_documentation/accounts/add_avatar.md:15
+#: ../../user/accounts/avatar/add.md:15
 msgid "Select {guilabel}`Browse…` to open the file picker."
 msgstr ""
 
-#: ../../user_documentation/accounts/add_avatar.md:16
-#: ../../user_documentation/accounts/add_avatar.md:28
+#: ../../user/accounts/avatar/add.md:16
+#: ../../user/accounts/avatar/add.md:28
 msgid "Select the image you want to use as your avatar and confirm."
 msgstr ""
 
-#: ../../user_documentation/accounts/add_avatar.md:0
+#: ../../user/accounts/avatar/add.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/accounts/add_avatar.md:24
+#: ../../user/accounts/avatar/add.md:24
 msgid "Select the cog icon ({fa}`cog`) or your existing avatar to open the {guilabel}`Options` menu."
 msgstr ""
 
-#: ../../user_documentation/accounts/add_avatar.md:27
+#: ../../user/accounts/avatar/add.md:27
 msgid "Select {guilabel}`Choose File` to open the file picker."
 msgstr ""
 
-#: ../../user_documentation/accounts/add_avatar.md:32
+#: ../../user/accounts/avatar/add.md:32
 msgid "Congratulations! You've updated your avatar."
 msgstr ""
diff --git a/docs/locales/gettext/user/accounts/avatar/delete.pot b/docs/locales/gettext/user/accounts/avatar/delete.pot
index 2d9aab93b..76b883953 100644
--- a/docs/locales/gettext/user/accounts/avatar/delete.pot
+++ b/docs/locales/gettext/user/accounts/avatar/delete.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,50 +16,50 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/accounts/delete_avatar.md:1
+#: ../../user/accounts/avatar/delete.md:1
 msgid "Remove your avatar"
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_avatar.md:3
+#: ../../user/accounts/avatar/delete.md:3
 msgid "If you don't want to have an avatar any more, you can remove it. To do this:"
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_avatar.md:0
+#: ../../user/accounts/avatar/delete.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_avatar.md:11
-#: ../../user_documentation/accounts/delete_avatar.md:22
+#: ../../user/accounts/avatar/delete.md:11
+#: ../../user/accounts/avatar/delete.md:22
 msgid "Log in to your account."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_avatar.md:12
+#: ../../user/accounts/avatar/delete.md:12
 msgid "Select your avatar to expand the user menu."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_avatar.md:13
-#: ../../user_documentation/accounts/delete_avatar.md:24
+#: ../../user/accounts/avatar/delete.md:13
+#: ../../user/accounts/avatar/delete.md:24
 msgid "Select {guilabel}`Settings`."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_avatar.md:14
-#: ../../user_documentation/accounts/delete_avatar.md:25
+#: ../../user/accounts/avatar/delete.md:14
+#: ../../user/accounts/avatar/delete.md:25
 msgid "Scroll down to the {guilabel}`Avatar` section."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_avatar.md:15
-#: ../../user_documentation/accounts/delete_avatar.md:26
+#: ../../user/accounts/avatar/delete.md:15
+#: ../../user/accounts/avatar/delete.md:26
 msgid "Select {guilabel}`Remove`."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_avatar.md:0
+#: ../../user/accounts/avatar/delete.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_avatar.md:23
+#: ../../user/accounts/avatar/delete.md:23
 msgid "Select your avatar to open the {guilabel}`Options` menu."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_avatar.md:30
+#: ../../user/accounts/avatar/delete.md:30
 msgid "That's it! You've removed your avatar from your account. Other users will only see the initials of your username when they visit your profile."
 msgstr ""
diff --git a/docs/locales/gettext/user/accounts/create.pot b/docs/locales/gettext/user/accounts/create.pot
index da1c1be0f..7704449d3 100644
--- a/docs/locales/gettext/user/accounts/create.pot
+++ b/docs/locales/gettext/user/accounts/create.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,111 +16,111 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/accounts/create_account.md:1
+#: ../../user/accounts/create.md:1
 msgid "Create your Funkwhale account"
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:4
+#: ../../user/accounts/create.md:4
 msgid "Use our [Pod Picker tool](https://network.funkwhale.audio/dashboards/d/overview/network-overview) to find the perfect pod for you!"
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:7
+#: ../../user/accounts/create.md:7
 msgid "To use Funkwhale, you need to create an account on a {term}`Funkwhale pod <Pod>`. Signing up to a pod requires the following information:"
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:9
+#: ../../user/accounts/create.md:9
 msgid "A valid email address. Administrators can use this to verify you are not a bot."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:10
+#: ../../user/accounts/create.md:10
 msgid "A username."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:11
+#: ../../user/accounts/create.md:11
 msgid "A password."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:13
+#: ../../user/accounts/create.md:13
 msgid "Check your pod's policies"
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:15
+#: ../../user/accounts/create.md:15
 msgid "Before you sign up to a pod, you should check its **policies**. You can find these by navigating to the pod's {guilabel}`About this pod` page."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:17
+#: ../../user/accounts/create.md:17
 msgid "Navigate to the pod."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:18
+#: ../../user/accounts/create.md:18
 msgid "Select the {guilabel}`About this pod` link in the sidebar."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:19
+#: ../../user/accounts/create.md:19
 msgid "Select the {guilabel}`Learn more` button in the {guilabel}`About this pod` section."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:21
+#: ../../user/accounts/create.md:21
 msgid "Administrators can add a pod's {guilabel}`Rules` and {guilabel}`Terms and privacy policy` to this page. Make sure to read through them before signing up. Also check the {guilabel}`Upload quota` to see how much space users have access to."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:23
+#: ../../user/accounts/create.md:23
 msgid "Sign up"
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:25
+#: ../../user/accounts/create.md:25
 msgid "Once you've found an instance you like the look of, you can create your account."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:27
+#: ../../user/accounts/create.md:27
 msgid "Select the {guilabel}`Create an account` button in the sidebar."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:28
+#: ../../user/accounts/create.md:28
 msgid "Enter the {guilabel}`Username` you have chosen."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:29
+#: ../../user/accounts/create.md:29
 msgid "Enter your {guilabel}`Email` address."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:30
-#: ../../user_documentation/accounts/create_account.md:41
+#: ../../user/accounts/create.md:30
+#: ../../user/accounts/create.md:41
 msgid "Enter your {guilabel}`Password`."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:31
+#: ../../user/accounts/create.md:31
 msgid "Pod administrators can add extra requirements for new accounts. Fields marked with an asterisk ({guilabel}`*`) are required."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:32
+#: ../../user/accounts/create.md:32
 msgid "Select {guilabel}`Create my account`."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:33
+#: ../../user/accounts/create.md:33
 msgid "Pod administrators may require you to verify your email address before you can use your account. Check your email for more instructions."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:35
+#: ../../user/accounts/create.md:35
 msgid "Log in"
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:37
+#: ../../user/accounts/create.md:37
 msgid "When you've created and activated your account, you can log in."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:39
+#: ../../user/accounts/create.md:39
 msgid "Select the {guilabel}`Login` button in the sidebar."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:40
+#: ../../user/accounts/create.md:40
 msgid "Enter your {guilabel}`Username or e-mail address`."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:42
+#: ../../user/accounts/create.md:42
 msgid "Select {guilabel}`Login`."
 msgstr ""
 
-#: ../../user_documentation/accounts/create_account.md:44
+#: ../../user/accounts/create.md:44
 msgid "Congratulations! You've set up your Funkwhale account. Check out what you can do now in our user documentation."
 msgstr ""
diff --git a/docs/locales/gettext/user/accounts/delete.pot b/docs/locales/gettext/user/accounts/delete.pot
index b2e0f9514..54c8b8c7b 100644
--- a/docs/locales/gettext/user/accounts/delete.pot
+++ b/docs/locales/gettext/user/accounts/delete.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,100 +16,100 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/accounts/delete_account.md:1
+#: ../../user/accounts/delete.md:1
 msgid "Delete your Funkwhale account"
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:3
+#: ../../user/accounts/delete.md:3
 msgid "If you have decided you no longer want your Funkwhale account, you can delete it. This action removes your profile and all your data from your {term}`pod`, including:"
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:5
+#: ../../user/accounts/delete.md:5
 msgid "Your user avatar."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:6
+#: ../../user/accounts/delete.md:6
 msgid "Your email address."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:7
+#: ../../user/accounts/delete.md:7
 msgid "The list of your followers."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:8
+#: ../../user/accounts/delete.md:8
 msgid "Music files you have uploaded."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:9
+#: ../../user/accounts/delete.md:9
 msgid "Radios you have created."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:10
+#: ../../user/accounts/delete.md:10
 msgid "Playlists you have created."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:11
+#: ../../user/accounts/delete.md:11
 msgid "Your favorites."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:13
+#: ../../user/accounts/delete.md:13
 msgid "When you delete your account, your pod sends a message to other Funkwhale pods notifying them. If these pods hold any of your data, they should also delete it."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:16
+#: ../../user/accounts/delete.md:16
 msgid "Other pods should delete local copies of your data in compliance with your request. There is no guarantee that they will do so, and some data may remain available. This can happen if a pod is offline or unavailable when your pod sends out the deletion message."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:19
+#: ../../user/accounts/delete.md:19
 msgid "To delete your account:"
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:0
+#: ../../user/accounts/delete.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:27
-#: ../../user_documentation/accounts/delete_account.md:40
+#: ../../user/accounts/delete.md:27
+#: ../../user/accounts/delete.md:40
 msgid "Log in to your account."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:28
+#: ../../user/accounts/delete.md:28
 msgid "Select the cog icon ({fa}`cog`) or your avatar to expand the user menu."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:29
-#: ../../user_documentation/accounts/delete_account.md:42
+#: ../../user/accounts/delete.md:29
+#: ../../user/accounts/delete.md:42
 msgid "Select {guilabel}`Settings`."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:30
-#: ../../user_documentation/accounts/delete_account.md:43
+#: ../../user/accounts/delete.md:30
+#: ../../user/accounts/delete.md:43
 msgid "Scroll to the {guilabel}`Delete my account` section."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:31
-#: ../../user_documentation/accounts/delete_account.md:44
+#: ../../user/accounts/delete.md:31
+#: ../../user/accounts/delete.md:44
 msgid "Enter your {guilabel}`Password`."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:32
-#: ../../user_documentation/accounts/delete_account.md:45
+#: ../../user/accounts/delete.md:32
+#: ../../user/accounts/delete.md:45
 msgid "Select {guilabel}`Delete my account…`."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:33
-#: ../../user_documentation/accounts/delete_account.md:46
+#: ../../user/accounts/delete.md:33
+#: ../../user/accounts/delete.md:46
 msgid "Select {guilabel}`Delete my account` on the warning notice that appears."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:0
+#: ../../user/accounts/delete.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:41
+#: ../../user/accounts/delete.md:41
 msgid "Select the cog icon ({fa}`cog`) or your avatar to open the {guilabel}`Options` menu."
 msgstr ""
 
-#: ../../user_documentation/accounts/delete_account.md:50
-msgid "That's it! You've deleted your account. You can [create another account](create_account.md) at any time."
+#: ../../user/accounts/delete.md:50
+msgid "That's it! You've deleted your account. You can [create another account](create.md) at any time."
 msgstr ""
diff --git a/docs/locales/gettext/user/accounts/email.pot b/docs/locales/gettext/user/accounts/email.pot
index 72b053bf5..3c3bce99e 100644
--- a/docs/locales/gettext/user/accounts/email.pot
+++ b/docs/locales/gettext/user/accounts/email.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,60 +16,60 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/accounts/change_email.md:1
+#: ../../user/accounts/email.md:1
 msgid "Change your email address"
 msgstr ""
 
-#: ../../user_documentation/accounts/change_email.md:3
+#: ../../user/accounts/email.md:3
 msgid "You can update your email address whenever you need to. To do this:"
 msgstr ""
 
-#: ../../user_documentation/accounts/change_email.md:0
+#: ../../user/accounts/email.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/accounts/change_email.md:11
-#: ../../user_documentation/accounts/change_email.md:24
+#: ../../user/accounts/email.md:11
+#: ../../user/accounts/email.md:24
 msgid "Log in to your account."
 msgstr ""
 
-#: ../../user_documentation/accounts/change_email.md:12
+#: ../../user/accounts/email.md:12
 msgid "Select the cog icon ({fa}`cog`) or your avatar to expand the user menu."
 msgstr ""
 
-#: ../../user_documentation/accounts/change_email.md:13
-#: ../../user_documentation/accounts/change_email.md:26
+#: ../../user/accounts/email.md:13
+#: ../../user/accounts/email.md:26
 msgid "Select {guilabel}`Settings`."
 msgstr ""
 
-#: ../../user_documentation/accounts/change_email.md:14
-#: ../../user_documentation/accounts/change_email.md:27
+#: ../../user/accounts/email.md:14
+#: ../../user/accounts/email.md:27
 msgid "Scroll to the {guilabel}`Change my e-mail address` section."
 msgstr ""
 
-#: ../../user_documentation/accounts/change_email.md:15
-#: ../../user_documentation/accounts/change_email.md:28
+#: ../../user/accounts/email.md:15
+#: ../../user/accounts/email.md:28
 msgid "Enter your {guilabel}`New e-mail address`."
 msgstr ""
 
-#: ../../user_documentation/accounts/change_email.md:16
-#: ../../user_documentation/accounts/change_email.md:29
+#: ../../user/accounts/email.md:16
+#: ../../user/accounts/email.md:29
 msgid "Enter your {guilabel}`Password`."
 msgstr ""
 
-#: ../../user_documentation/accounts/change_email.md:17
-#: ../../user_documentation/accounts/change_email.md:30
+#: ../../user/accounts/email.md:17
+#: ../../user/accounts/email.md:30
 msgid "Select {guilabel}`Update`."
 msgstr ""
 
-#: ../../user_documentation/accounts/change_email.md:0
+#: ../../user/accounts/email.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/accounts/change_email.md:25
+#: ../../user/accounts/email.md:25
 msgid "Select the cog icon ({fa}`cog`) or your avatar to open the {guilabel}`Options` menu."
 msgstr ""
 
-#: ../../user_documentation/accounts/change_email.md:34
+#: ../../user/accounts/email.md:34
 msgid "That's it! If your pod admin has email verification enabled, you'll receive a confirmation email. Follow the instructions in this email to finish changing your email address."
 msgstr ""
diff --git a/docs/locales/gettext/user/accounts/index.pot b/docs/locales/gettext/user/accounts/index.pot
index 7a8458492..87f582866 100644
--- a/docs/locales/gettext/user/accounts/index.pot
+++ b/docs/locales/gettext/user/accounts/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/accounts/index.md:7
+#: ../../user/accounts/index.md:7
 msgid "Manage your account"
 msgstr ""
 
-#: ../../user_documentation/accounts/index.md:19
+#: ../../user/accounts/index.md:19
 msgid "Change account settings"
 msgstr ""
 
-#: ../../user_documentation/accounts/index.md:1
+#: ../../user/accounts/index.md:1
 msgid "Your account"
 msgstr ""
 
-#: ../../user_documentation/accounts/index.md:3
+#: ../../user/accounts/index.md:3
 msgid "Your Funkwhale account is the key to your Funkwhale experience. Creating an account on a {term}`pod` gives you the ability to upload content, follow channels, and listen to audio."
 msgstr ""
 
-#: ../../user_documentation/accounts/index.md:5
+#: ../../user/accounts/index.md:5
 msgid "Follow the guides in this section to manage your Funkwhale account."
 msgstr ""
diff --git a/docs/locales/gettext/user/accounts/password.pot b/docs/locales/gettext/user/accounts/password.pot
index 11e56cfa0..5e19162b9 100644
--- a/docs/locales/gettext/user/accounts/password.pot
+++ b/docs/locales/gettext/user/accounts/password.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,64 +16,64 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/accounts/change_password.md:1
+#: ../../user/accounts/password.md:1
 msgid "Change your password"
 msgstr ""
 
-#: ../../user_documentation/accounts/change_password.md:4
+#: ../../user/accounts/password.md:4
 msgid "Changing your account password also changes your Subsonic API password. If you are using a Subsonic app, you need to update your password in the app as well."
 msgstr ""
 
-#: ../../user_documentation/accounts/change_password.md:7
+#: ../../user/accounts/password.md:7
 msgid "You can update your account password whenever you need to. To do this:"
 msgstr ""
 
-#: ../../user_documentation/accounts/change_password.md:0
+#: ../../user/accounts/password.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/accounts/change_password.md:15
-#: ../../user_documentation/accounts/change_password.md:28
+#: ../../user/accounts/password.md:15
+#: ../../user/accounts/password.md:28
 msgid "Log in to your account."
 msgstr ""
 
-#: ../../user_documentation/accounts/change_password.md:16
+#: ../../user/accounts/password.md:16
 msgid "Select the cog icon ({fa}`cog`) or your avatar to expand the user menu."
 msgstr ""
 
-#: ../../user_documentation/accounts/change_password.md:17
-#: ../../user_documentation/accounts/change_password.md:30
+#: ../../user/accounts/password.md:17
+#: ../../user/accounts/password.md:30
 msgid "Select {guilabel}`Settings`."
 msgstr ""
 
-#: ../../user_documentation/accounts/change_password.md:18
-#: ../../user_documentation/accounts/change_password.md:31
+#: ../../user/accounts/password.md:18
+#: ../../user/accounts/password.md:31
 msgid "Scroll to the {guilabel}`Change my password` section."
 msgstr ""
 
-#: ../../user_documentation/accounts/change_password.md:19
-#: ../../user_documentation/accounts/change_password.md:32
+#: ../../user/accounts/password.md:19
+#: ../../user/accounts/password.md:32
 msgid "Enter your {guilabel}`Current password`."
 msgstr ""
 
-#: ../../user_documentation/accounts/change_password.md:20
-#: ../../user_documentation/accounts/change_password.md:33
+#: ../../user/accounts/password.md:20
+#: ../../user/accounts/password.md:33
 msgid "Enter your {guilabel}`New password`."
 msgstr ""
 
-#: ../../user_documentation/accounts/change_password.md:21
-#: ../../user_documentation/accounts/change_password.md:34
+#: ../../user/accounts/password.md:21
+#: ../../user/accounts/password.md:34
 msgid "Select {guilabel}`Change password`."
 msgstr ""
 
-#: ../../user_documentation/accounts/change_password.md:0
+#: ../../user/accounts/password.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/accounts/change_password.md:29
+#: ../../user/accounts/password.md:29
 msgid "Select the cog icon ({fa}`cog`) or your avatar to open the {guilabel}`Options` menu."
 msgstr ""
 
-#: ../../user_documentation/accounts/change_password.md:38
+#: ../../user/accounts/password.md:38
 msgid "That's it! Your password is reset. You need to use your new password to log in from now on."
 msgstr ""
diff --git a/docs/locales/gettext/user/accounts/quota.pot b/docs/locales/gettext/user/accounts/quota.pot
index 62f6c5bc6..49381303f 100644
--- a/docs/locales/gettext/user/accounts/quota.pot
+++ b/docs/locales/gettext/user/accounts/quota.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,54 +16,54 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/accounts/check_quota.md:1
+#: ../../user/accounts/quota.md:1
 msgid "Check your upload quota"
 msgstr ""
 
-#: ../../user_documentation/accounts/check_quota.md:3
+#: ../../user/accounts/quota.md:3
 msgid "Your {term}`pod` admin can assign users an **upload quota**. This is the amount of storage you have access to. Pod admins can assign a default quota to all users. They can also increase or decrease quotas for individual users. Your upload quota applies to content in [libraries](../libraries/index.md) and [channels](../channels/index.md)."
 msgstr ""
 
-#: ../../user_documentation/accounts/check_quota.md:5
+#: ../../user/accounts/quota.md:5
 msgid "If you run out of space, you can contact your pod admin to request more."
 msgstr ""
 
-#: ../../user_documentation/accounts/check_quota.md:7
+#: ../../user/accounts/quota.md:7
 msgid "To check your upload quota:"
 msgstr ""
 
-#: ../../user_documentation/accounts/check_quota.md:0
+#: ../../user/accounts/quota.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/accounts/check_quota.md:15
-#: ../../user_documentation/accounts/check_quota.md:26
+#: ../../user/accounts/quota.md:15
+#: ../../user/accounts/quota.md:26
 msgid "Log in to your pod."
 msgstr ""
 
-#: ../../user_documentation/accounts/check_quota.md:16
+#: ../../user/accounts/quota.md:16
 msgid "Select the upload icon ({fa}`upload`) in the top of the sidebar."
 msgstr ""
 
-#: ../../user_documentation/accounts/check_quota.md:17
-#: ../../user_documentation/accounts/check_quota.md:28
+#: ../../user/accounts/quota.md:17
+#: ../../user/accounts/quota.md:28
 msgid "Select {guilabel}`Get started` under {guilabel}`Upload third-party content in a library`."
 msgstr ""
 
-#: ../../user_documentation/accounts/check_quota.md:18
-#: ../../user_documentation/accounts/check_quota.md:29
+#: ../../user/accounts/quota.md:18
+#: ../../user/accounts/quota.md:29
 msgid "The {guilabel}`My libraries` screen appears showing your upload quota and your libraries."
 msgstr ""
 
-#: ../../user_documentation/accounts/check_quota.md:19
-#: ../../user_documentation/accounts/check_quota.md:30
+#: ../../user/accounts/quota.md:19
+#: ../../user/accounts/quota.md:30
 msgid "The {guilabel}`Current usage` section shows you how much of your quota you are using."
 msgstr ""
 
-#: ../../user_documentation/accounts/check_quota.md:0
+#: ../../user/accounts/quota.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/accounts/check_quota.md:27
+#: ../../user/accounts/quota.md:27
 msgid "Select the upload icon ({fa}`upload`) at the top of the screen"
 msgstr ""
diff --git a/docs/locales/gettext/user/channels/artist/delete.pot b/docs/locales/gettext/user/channels/artist/delete.pot
index ef83b0f11..d68f33154 100644
--- a/docs/locales/gettext/user/channels/artist/delete.pot
+++ b/docs/locales/gettext/user/channels/artist/delete.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,126 +16,126 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/channels/delete_artist.md:1
+#: ../../user/channels/artist/delete.md:1
 msgid "Delete content from an Artist channel"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:3
+#: ../../user/channels/artist/delete.md:3
 msgid "You can delete content from your artist channel. This means that your followers won't be able to listen to the deleted content any more."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:9
+#: ../../user/channels/artist/delete.md:9
 msgid "Delete a track"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:12
+#: ../../user/channels/artist/delete.md:12
 msgid "Deleting a track also deletes the file from your {term}`Funkwhale pod <Pod>`. This action is irreversible."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:15
+#: ../../user/channels/artist/delete.md:15
 msgid "To delete a single track from a channel:"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:0
+#: ../../user/channels/artist/delete.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:23
-#: ../../user_documentation/channels/delete_artist.md:38
-#: ../../user_documentation/channels/delete_artist.md:66
-#: ../../user_documentation/channels/delete_artist.md:80
+#: ../../user/channels/artist/delete.md:23
+#: ../../user/channels/artist/delete.md:38
+#: ../../user/channels/artist/delete.md:66
+#: ../../user/channels/artist/delete.md:80
 msgid "Log in to your pod."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:24
-#: ../../user_documentation/channels/delete_artist.md:67
+#: ../../user/channels/artist/delete.md:24
+#: ../../user/channels/artist/delete.md:67
 msgid "Select the upload icon ({fa}`upload`) in the top of the sidebar."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:25
-#: ../../user_documentation/channels/delete_artist.md:40
-#: ../../user_documentation/channels/delete_artist.md:68
-#: ../../user_documentation/channels/delete_artist.md:82
+#: ../../user/channels/artist/delete.md:25
+#: ../../user/channels/artist/delete.md:40
+#: ../../user/channels/artist/delete.md:68
+#: ../../user/channels/artist/delete.md:82
 msgid "Select {guilabel}`Get started` under {guilabel}`Publish your work in a channel`. Your user profile opens."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:26
-#: ../../user_documentation/channels/delete_artist.md:41
-#: ../../user_documentation/channels/delete_artist.md:69
-#: ../../user_documentation/channels/delete_artist.md:83
+#: ../../user/channels/artist/delete.md:26
+#: ../../user/channels/artist/delete.md:41
+#: ../../user/channels/artist/delete.md:69
+#: ../../user/channels/artist/delete.md:83
 msgid "Select the channel containing the content under the {guilabel}`Channels` header. The channel's page opens."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:27
-#: ../../user_documentation/channels/delete_artist.md:42
+#: ../../user/channels/artist/delete.md:27
+#: ../../user/channels/artist/delete.md:42
 msgid "Select the kebab menu ({fa}`ellipsis-v`) next to the track in question. This opens the track options menu."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:28
-#: ../../user_documentation/channels/delete_artist.md:43
+#: ../../user/channels/artist/delete.md:28
+#: ../../user/channels/artist/delete.md:43
 msgid "Select {guilabel}`ℹ︎ Track details`. The track details page opens."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:29
-#: ../../user_documentation/channels/delete_artist.md:44
+#: ../../user/channels/artist/delete.md:29
+#: ../../user/channels/artist/delete.md:44
 msgid "Select the kebab menu ({fa}`ellipsis-v`) at the top of the page."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:30
-#: ../../user_documentation/channels/delete_artist.md:45
+#: ../../user/channels/artist/delete.md:30
+#: ../../user/channels/artist/delete.md:45
 msgid "Select {guilabel}`Delete…`. A {guilabel}`Delete this track?` warning appears."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:31
-#: ../../user_documentation/channels/delete_artist.md:46
+#: ../../user/channels/artist/delete.md:31
+#: ../../user/channels/artist/delete.md:46
 msgid "Select {guilabel}`Delete` to delete the track."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:0
+#: ../../user/channels/artist/delete.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:39
-#: ../../user_documentation/channels/delete_artist.md:81
+#: ../../user/channels/artist/delete.md:39
+#: ../../user/channels/artist/delete.md:81
 msgid "Select the upload icon ({fa}`upload`) at the top of the screen."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:50
-msgid "That's it! You've deleted your track. You can add it again by [uploading it to your channel](upload_artist.md)."
+#: ../../user/channels/artist/delete.md:50
+msgid "That's it! You've deleted your track. You can add it again by [uploading it to your channel](upload.md)."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:52
+#: ../../user/channels/artist/delete.md:52
 msgid "Delete an album"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:55
+#: ../../user/channels/artist/delete.md:55
 msgid "Deleting an album also deletes all tracks in the album and removes the files from the server. This action is irreversible."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:58
+#: ../../user/channels/artist/delete.md:58
 msgid "Delete an album to remove all tracks it contains. To do this:"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:70
-#: ../../user_documentation/channels/delete_artist.md:84
+#: ../../user/channels/artist/delete.md:70
+#: ../../user/channels/artist/delete.md:84
 msgid "Select your album in the {guilabel}`Albums` section. The album detail page opens."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:71
-#: ../../user_documentation/channels/delete_artist.md:85
+#: ../../user/channels/artist/delete.md:71
+#: ../../user/channels/artist/delete.md:85
 msgid "Select the kebab menu ({fa}`ellipsis-v`) to open the options menu."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:72
-#: ../../user_documentation/channels/delete_artist.md:86
+#: ../../user/channels/artist/delete.md:72
+#: ../../user/channels/artist/delete.md:86
 msgid "Select {guilabel}`Delete…`. A {guilabel}`Delete this album?` warning appears."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:73
-#: ../../user_documentation/channels/delete_artist.md:87
+#: ../../user/channels/artist/delete.md:73
+#: ../../user/channels/artist/delete.md:87
 msgid "Select {guilabel}`Delete` to delete the album."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_artist.md:91
-msgid "You're done! You've deleted the album and all the tracks it contained. You can add them again by [uploading it to your channel](upload_artist.md)."
+#: ../../user/channels/artist/delete.md:91
+msgid "You're done! You've deleted the album and all the tracks it contained. You can add them again by [uploading it to your channel](upload.md)."
 msgstr ""
diff --git a/docs/locales/gettext/user/channels/artist/upload.pot b/docs/locales/gettext/user/channels/artist/upload.pot
index 9a9dd5257..e2aff7894 100644
--- a/docs/locales/gettext/user/channels/artist/upload.pot
+++ b/docs/locales/gettext/user/channels/artist/upload.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,275 +16,275 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/channels/upload_artist.md:1
+#: ../../user/channels/artist/upload.md:1
 msgid "Upload content to an Artist channel"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:3
-msgid "Once you have [created a channel](create_channel.md), you can start to add content to it. Users who follow your channel can see and play your content from their {term}`pods <Pod>`."
+#: ../../user/channels/artist/upload.md:3
+msgid "Once you have [created a channel](../create.md), you can start to add content to it. Users who follow your channel can see and play your content from their {term}`pods <Pod>`."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:5
+#: ../../user/channels/artist/upload.md:5
 msgid "You can also create albums to organize your channel content."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:11
+#: ../../user/channels/artist/upload.md:11
 msgid "Create an album (optional)"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:13
+#: ../../user/channels/artist/upload.md:13
 msgid "Albums are a good way of organizing your content. You can create as many albums as you want. To create a new album:"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:0
+#: ../../user/channels/artist/upload.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:21
-#: ../../user_documentation/channels/upload_artist.md:34
-#: ../../user_documentation/channels/upload_artist.md:70
-#: ../../user_documentation/channels/upload_artist.md:88
-#: ../../user_documentation/channels/upload_artist.md:129
-#: ../../user_documentation/channels/upload_artist.md:147
+#: ../../user/channels/artist/upload.md:21
+#: ../../user/channels/artist/upload.md:34
+#: ../../user/channels/artist/upload.md:70
+#: ../../user/channels/artist/upload.md:88
+#: ../../user/channels/artist/upload.md:129
+#: ../../user/channels/artist/upload.md:147
 msgid "Log in to your pod."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:22
-#: ../../user_documentation/channels/upload_artist.md:71
-#: ../../user_documentation/channels/upload_artist.md:130
+#: ../../user/channels/artist/upload.md:22
+#: ../../user/channels/artist/upload.md:71
+#: ../../user/channels/artist/upload.md:130
 msgid "Select the upload icon ({fa}`upload`) in the top of the sidebar."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:23
-#: ../../user_documentation/channels/upload_artist.md:36
-#: ../../user_documentation/channels/upload_artist.md:72
-#: ../../user_documentation/channels/upload_artist.md:90
-#: ../../user_documentation/channels/upload_artist.md:131
-#: ../../user_documentation/channels/upload_artist.md:149
+#: ../../user/channels/artist/upload.md:23
+#: ../../user/channels/artist/upload.md:36
+#: ../../user/channels/artist/upload.md:72
+#: ../../user/channels/artist/upload.md:90
+#: ../../user/channels/artist/upload.md:131
+#: ../../user/channels/artist/upload.md:149
 msgid "Select {guilabel}`Get started` under {guilabel}`Publish your work in a channel`. Your user profile opens."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:24
-#: ../../user_documentation/channels/upload_artist.md:37
+#: ../../user/channels/artist/upload.md:24
+#: ../../user/channels/artist/upload.md:37
 msgid "Select the channel you want to add an album to under the {guilabel}`Channels` header. The channel's page opens."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:25
-#: ../../user_documentation/channels/upload_artist.md:38
+#: ../../user/channels/artist/upload.md:25
+#: ../../user/channels/artist/upload.md:38
 msgid "Select {guilabel}`+ Add new` next to the {guilabel}`Albums` section. A {guilabel}`New album` screen appears."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:26
-#: ../../user_documentation/channels/upload_artist.md:39
+#: ../../user/channels/artist/upload.md:26
+#: ../../user/channels/artist/upload.md:39
 msgid "Enter the {guilabel}`Title` of your album."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:27
-#: ../../user_documentation/channels/upload_artist.md:40
+#: ../../user/channels/artist/upload.md:27
+#: ../../user/channels/artist/upload.md:40
 msgid "Select {guilabel}`Create` to create your new album. The album appears on the screen."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:0
+#: ../../user/channels/artist/upload.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:35
-#: ../../user_documentation/channels/upload_artist.md:89
-#: ../../user_documentation/channels/upload_artist.md:148
+#: ../../user/channels/artist/upload.md:35
+#: ../../user/channels/artist/upload.md:89
+#: ../../user/channels/artist/upload.md:148
 msgid "Select the upload icon ({fa}`upload`) at the top of the screen."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:44
+#: ../../user/channels/artist/upload.md:44
 msgid "Once you've created your album, you can add some details to it. To do this:"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:46
+#: ../../user/channels/artist/upload.md:46
 msgid "Select the album. The album details screen opens."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:47
+#: ../../user/channels/artist/upload.md:47
 msgid "Select the kebab menu ({fa}`ellipsis-v`) to show the album options."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:48
+#: ../../user/channels/artist/upload.md:48
 msgid "Select {guilabel}`Edit`. The {guilabel}`Edit this album` screen opens."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:49
-#: ../../user_documentation/channels/upload_artist.md:107
+#: ../../user/channels/artist/upload.md:49
+#: ../../user/channels/artist/upload.md:107
 msgid "Change the details in any of these fields:"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:50
+#: ../../user/channels/artist/upload.md:50
 msgid "{guilabel}`Title` – the title of the album."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:51
+#: ../../user/channels/artist/upload.md:51
 msgid "{guilabel}`Description` – a description of the album."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:52
+#: ../../user/channels/artist/upload.md:52
 msgid "{guilabel}`Release date` – the release date of the album."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:53
+#: ../../user/channels/artist/upload.md:53
 msgid "{guilabel}`Cover` – the cover art of the album."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:54
+#: ../../user/channels/artist/upload.md:54
 msgid "{guilabel}`Tags` – the genre of the album."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:55
+#: ../../user/channels/artist/upload.md:55
 msgid "**Optional** – enter a {guilabel}`Summary` of your changes."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:56
+#: ../../user/channels/artist/upload.md:56
 msgid "Select {guilabel}`Submit and apply edit` to save your changes."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:58
+#: ../../user/channels/artist/upload.md:58
 msgid "That's it! You can now add content to your album."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:60
+#: ../../user/channels/artist/upload.md:60
 msgid "Add your content"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:62
+#: ../../user/channels/artist/upload.md:62
 msgid "To add content to your channel:"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:73
-#: ../../user_documentation/channels/upload_artist.md:91
-#: ../../user_documentation/channels/upload_artist.md:132
-#: ../../user_documentation/channels/upload_artist.md:150
+#: ../../user/channels/artist/upload.md:73
+#: ../../user/channels/artist/upload.md:91
+#: ../../user/channels/artist/upload.md:132
+#: ../../user/channels/artist/upload.md:150
 msgid "Select the channel you want to add content to under the {guilabel}`Channels` header. The channel's page opens."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:74
-#: ../../user_documentation/channels/upload_artist.md:92
-#: ../../user_documentation/channels/upload_artist.md:133
-#: ../../user_documentation/channels/upload_artist.md:151
+#: ../../user/channels/artist/upload.md:74
+#: ../../user/channels/artist/upload.md:92
+#: ../../user/channels/artist/upload.md:133
+#: ../../user/channels/artist/upload.md:151
 msgid "Select {guilabel}`⇧ Upload`. The {guilabel}`Publish audio` screen appears."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:75
-#: ../../user_documentation/channels/upload_artist.md:93
-#: ../../user_documentation/channels/upload_artist.md:134
-#: ../../user_documentation/channels/upload_artist.md:152
+#: ../../user/channels/artist/upload.md:75
+#: ../../user/channels/artist/upload.md:93
+#: ../../user/channels/artist/upload.md:134
+#: ../../user/channels/artist/upload.md:152
 msgid "Select the {guilabel}`Channel` you want to publish your audio in. This populates with the channel you selected by default."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:76
-#: ../../user_documentation/channels/upload_artist.md:94
-#: ../../user_documentation/channels/upload_artist.md:135
-#: ../../user_documentation/channels/upload_artist.md:153
+#: ../../user/channels/artist/upload.md:76
+#: ../../user/channels/artist/upload.md:94
+#: ../../user/channels/artist/upload.md:135
+#: ../../user/channels/artist/upload.md:153
 msgid "**Optional** – choose which [{guilabel}`Album`](#create-an-album-optional) you want to publish the music in."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:77
-#: ../../user_documentation/channels/upload_artist.md:95
-#: ../../user_documentation/channels/upload_artist.md:136
-#: ../../user_documentation/channels/upload_artist.md:154
+#: ../../user/channels/artist/upload.md:77
+#: ../../user/channels/artist/upload.md:95
+#: ../../user/channels/artist/upload.md:136
+#: ../../user/channels/artist/upload.md:154
 msgid "**Optional** – choose a {guilabel}`License` to apply to your music. Funkwhale supports [Creative Commons](https://creativecommons.org/) licenses."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:78
-#: ../../user_documentation/channels/upload_artist.md:96
-#: ../../user_documentation/channels/upload_artist.md:137
-#: ../../user_documentation/channels/upload_artist.md:155
+#: ../../user/channels/artist/upload.md:78
+#: ../../user/channels/artist/upload.md:96
+#: ../../user/channels/artist/upload.md:137
+#: ../../user/channels/artist/upload.md:155
 msgid "Select {guilabel}`Next step`. The {guilabel}`Files to upload` screen appears."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:79
+#: ../../user/channels/artist/upload.md:79
 msgid "Click on the section marked {guilabel}`Browse…` to open a file picker, or drag and drop your files on to it."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:80
+#: ../../user/channels/artist/upload.md:80
 msgid "If you opened the file picker, select the files you want to upload and confirm."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:81
-#: ../../user_documentation/channels/upload_artist.md:98
+#: ../../user/channels/artist/upload.md:81
+#: ../../user/channels/artist/upload.md:98
 msgid "The files appear at the top when you upload them. Select {guilabel}`Remove` to remove them."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:97
+#: ../../user/channels/artist/upload.md:97
 msgid "Click on the section marked {guilabel}`Browse…` to open a file picker. Select the files you want to upload and confirm."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:102
+#: ../../user/channels/artist/upload.md:102
 msgid "Edit your uploads"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:104
+#: ../../user/channels/artist/upload.md:104
 msgid "Once you have uploaded your files, you can change their details. To do this:"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:106
+#: ../../user/channels/artist/upload.md:106
 msgid "Select the edit icon ({fa}`edit`) to edit the track details. The {guilabel}`Upload details` screen appears."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:108
+#: ../../user/channels/artist/upload.md:108
 msgid "{guilabel}`Title` – the title of the track"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:109
+#: ../../user/channels/artist/upload.md:109
 msgid "{guilabel}`Track Picture` – the picture that shows up next to the track."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:110
+#: ../../user/channels/artist/upload.md:110
 msgid "{guilabel}`Tags` – the genre of the track."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:111
+#: ../../user/channels/artist/upload.md:111
 msgid "{guilabel}`Position` – the position of the track in the album."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:112
+#: ../../user/channels/artist/upload.md:112
 msgid "{guilabel}`Description` – a description of the track."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:113
+#: ../../user/channels/artist/upload.md:113
 msgid "Select {guilabel}`Update` to save the track details."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:114
+#: ../../user/channels/artist/upload.md:114
 msgid "Do this for all tracks you want to publish."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:115
+#: ../../user/channels/artist/upload.md:115
 msgid "Select {guilabel}`Publish` to publish the content. To save the content to [upload later](#continue-your-upload-later), select {menuselection}`Down arrow --> Finish later`."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:117
+#: ../../user/channels/artist/upload.md:117
 msgid "That's it! You've added content to your channel. Your followers can now listen to your content from their pods."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:119
+#: ../../user/channels/artist/upload.md:119
 msgid "Continue your upload later"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:121
+#: ../../user/channels/artist/upload.md:121
 msgid "If you selected {guilabel}`Finish later`, Funkwhale saves your files and edits. You can continue your upload later by doing the following:"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:138
-#: ../../user_documentation/channels/upload_artist.md:156
+#: ../../user/channels/artist/upload.md:138
+#: ../../user/channels/artist/upload.md:156
 msgid "If there are pending uploads, a {guilabel}`You have some draft uploads pending publication` note shows. Select {guilabel}`Resume` to resume your upload."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:139
-#: ../../user_documentation/channels/upload_artist.md:157
+#: ../../user/channels/artist/upload.md:139
+#: ../../user/channels/artist/upload.md:157
 msgid "[Add new files](#add-your-content) or [edit the pending files](#edit-your-uploads)."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:140
-#: ../../user_documentation/channels/upload_artist.md:158
+#: ../../user/channels/artist/upload.md:140
+#: ../../user/channels/artist/upload.md:158
 msgid "Once you're finished, select {guilabel}`Publish` to publish your music."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_artist.md:162
+#: ../../user/channels/artist/upload.md:162
 msgid "Congratulations! You've finished uploading the saved content. Your followers can now listen to your content from their pods."
 msgstr ""
diff --git a/docs/locales/gettext/user/channels/create.pot b/docs/locales/gettext/user/channels/create.pot
index 8e72c697d..2dba33ffd 100644
--- a/docs/locales/gettext/user/channels/create.pot
+++ b/docs/locales/gettext/user/channels/create.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,158 +16,158 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/channels/create_channel.md:1
+#: ../../user/channels/create.md:1
 msgid "Create a channel"
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:4
+#: ../../user/channels/create.md:4
 msgid "Your channel's __Fediverse handle__ needs to be unique. This is how other {term}`Fediverse` software identifies your channel. You can't change the __Fediverse handle__ once you've created your channel."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:7
+#: ../../user/channels/create.md:7
 msgid "Create a channel to start publishing your content on your {term}`Funkwhale pod <Pod>`. Users can access channel content from Funkwhale or other Fediverse software."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:9
+#: ../../user/channels/create.md:9
 msgid "You can create two types of channel:"
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:15
+#: ../../user/channels/create.md:15
 msgid "Artist discography"
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:17
+#: ../../user/channels/create.md:17
 msgid "To create an **Artist discography** channel:"
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:0
+#: ../../user/channels/create.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:25
-#: ../../user_documentation/channels/create_channel.md:42
-#: ../../user_documentation/channels/create_channel.md:68
-#: ../../user_documentation/channels/create_channel.md:90
+#: ../../user/channels/create.md:25
+#: ../../user/channels/create.md:42
+#: ../../user/channels/create.md:68
+#: ../../user/channels/create.md:90
 msgid "Log in to your pod."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:26
-#: ../../user_documentation/channels/create_channel.md:69
+#: ../../user/channels/create.md:26
+#: ../../user/channels/create.md:69
 msgid "Select the upload icon ({fa}`upload`) in the top of the sidebar."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:27
-#: ../../user_documentation/channels/create_channel.md:44
-#: ../../user_documentation/channels/create_channel.md:70
-#: ../../user_documentation/channels/create_channel.md:92
+#: ../../user/channels/create.md:27
+#: ../../user/channels/create.md:44
+#: ../../user/channels/create.md:70
+#: ../../user/channels/create.md:92
 msgid "Select {guilabel}`Get started` under {guilabel}`Publish your work in a channel`. Your user profile opens."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:28
-#: ../../user_documentation/channels/create_channel.md:45
-#: ../../user_documentation/channels/create_channel.md:71
-#: ../../user_documentation/channels/create_channel.md:93
+#: ../../user/channels/create.md:28
+#: ../../user/channels/create.md:45
+#: ../../user/channels/create.md:71
+#: ../../user/channels/create.md:93
 msgid "Select {guilabel}`+ Add new` next to the {guilabel}`Channels` header. A {guilabel}`Create channel` pop-up window appears."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:29
-#: ../../user_documentation/channels/create_channel.md:46
+#: ../../user/channels/create.md:29
+#: ../../user/channels/create.md:46
 msgid "Select {guilabel}`Artist discography` and select {guilabel}`Next step`. The {guilabel}`Artist channel` form appears."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:30
-#: ../../user_documentation/channels/create_channel.md:47
-#: ../../user_documentation/channels/create_channel.md:73
-#: ../../user_documentation/channels/create_channel.md:95
+#: ../../user/channels/create.md:30
+#: ../../user/channels/create.md:47
+#: ../../user/channels/create.md:73
+#: ../../user/channels/create.md:95
 msgid "Enter the {guilabel}`Name` of your channel. Users see this when they visit your channel page."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:31
-#: ../../user_documentation/channels/create_channel.md:48
-#: ../../user_documentation/channels/create_channel.md:74
-#: ../../user_documentation/channels/create_channel.md:96
+#: ../../user/channels/create.md:31
+#: ../../user/channels/create.md:48
+#: ../../user/channels/create.md:74
+#: ../../user/channels/create.md:96
 msgid "Enter the {guilabel}`Fediverse handle` of your channel. This is how other Fediverse software identifies your channel."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:32
-#: ../../user_documentation/channels/create_channel.md:49
-#: ../../user_documentation/channels/create_channel.md:75
-#: ../../user_documentation/channels/create_channel.md:97
+#: ../../user/channels/create.md:32
+#: ../../user/channels/create.md:49
+#: ../../user/channels/create.md:75
+#: ../../user/channels/create.md:97
 msgid "**Optional** – upload a {guilabel}`Channel picture`. Users see this when they visit your channel page. Select {guilabel}`Browse…` to open a file picker."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:33
-#: ../../user_documentation/channels/create_channel.md:50
-#: ../../user_documentation/channels/create_channel.md:76
-#: ../../user_documentation/channels/create_channel.md:98
+#: ../../user/channels/create.md:33
+#: ../../user/channels/create.md:50
+#: ../../user/channels/create.md:76
+#: ../../user/channels/create.md:98
 msgid "**Optional** – add {guilabel}`Tags` that describe your channel. Start typing in the {guilabel}`Search…` input box to find existing tags. You can also create new tags by typing them in and selecting them or hitting {kbd}`⏎ Return`."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:34
-#: ../../user_documentation/channels/create_channel.md:51
-#: ../../user_documentation/channels/create_channel.md:78
-#: ../../user_documentation/channels/create_channel.md:100
+#: ../../user/channels/create.md:34
+#: ../../user/channels/create.md:51
+#: ../../user/channels/create.md:78
+#: ../../user/channels/create.md:100
 msgid "**Optional** – enter a {guilabel}`Description` of your channel. You can {guilabel}`Write` using [Markdown](https://www.markdownguide.org/) syntax and {guilabel}`Preview` how it will look. Users see this when they visit your channel page."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:35
-#: ../../user_documentation/channels/create_channel.md:52
-#: ../../user_documentation/channels/create_channel.md:83
-#: ../../user_documentation/channels/create_channel.md:105
+#: ../../user/channels/create.md:35
+#: ../../user/channels/create.md:52
+#: ../../user/channels/create.md:83
+#: ../../user/channels/create.md:105
 msgid "Select {guilabel}`Create channel` to create your channel."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:0
+#: ../../user/channels/create.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:43
-#: ../../user_documentation/channels/create_channel.md:91
+#: ../../user/channels/create.md:43
+#: ../../user/channels/create.md:91
 msgid "Select the upload icon ({fa}`upload`) at the top of the screen."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:56
-msgid "That's it! You've created your artist channel. You can now [add some music to it](upload_artist.md)."
+#: ../../user/channels/create.md:56
+msgid "That's it! You've created your artist channel. You can now [add some music to it](artist/upload.md)."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:58
+#: ../../user/channels/create.md:58
 msgid "Podcast"
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:60
+#: ../../user/channels/create.md:60
 msgid "To create a **Podcast** channel:"
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:72
-#: ../../user_documentation/channels/create_channel.md:94
+#: ../../user/channels/create.md:72
+#: ../../user/channels/create.md:94
 msgid "Select {guilabel}`Podcasts` and select {guilabel}`Next step`. The {guilabel}`Podcast channel` form appears."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:77
-#: ../../user_documentation/channels/create_channel.md:99
+#: ../../user/channels/create.md:77
+#: ../../user/channels/create.md:99
 msgid "Choose the {guilabel}`Language` of your podcast."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:79
-#: ../../user_documentation/channels/create_channel.md:101
+#: ../../user/channels/create.md:79
+#: ../../user/channels/create.md:101
 msgid "Select the {guilabel}`Category` of your podcast. {term}`Podcatchers<Podcatcher>` use this information to sort your podcast content."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:80
-#: ../../user_documentation/channels/create_channel.md:102
+#: ../../user/channels/create.md:80
+#: ../../user/channels/create.md:102
 msgid "**Optional** – select the {guilabel}`Subcategory` of your podcast."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:81
-#: ../../user_documentation/channels/create_channel.md:103
+#: ../../user/channels/create.md:81
+#: ../../user/channels/create.md:103
 msgid "**Optional** – enter the {guilabel}`Owner e-mail address`. This populates the `itunes:email` field of your podcast's {abbr}`RSS (Really Simple Syndication)` feed."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:82
-#: ../../user_documentation/channels/create_channel.md:104
+#: ../../user/channels/create.md:82
+#: ../../user/channels/create.md:104
 msgid "**Optional** – enter the {guilabel}`Owner name`. This populates the `itunes:name` field of your podcast's {abbr}`RSS (Really Simple Syndication)` feed."
 msgstr ""
 
-#: ../../user_documentation/channels/create_channel.md:109
-msgid "You're done! You've created your podcast channel. Now you can [add some episodes to it](upload_podcast.md)."
+#: ../../user/channels/create.md:109
+msgid "You're done! You've created your podcast channel. Now you can [add some episodes to it](podcast/upload.md)."
 msgstr ""
diff --git a/docs/locales/gettext/user/channels/delete.pot b/docs/locales/gettext/user/channels/delete.pot
index 0be2ba75f..46a36d08f 100644
--- a/docs/locales/gettext/user/channels/delete.pot
+++ b/docs/locales/gettext/user/channels/delete.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,64 +16,64 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/channels/delete_channel.md:1
+#: ../../user/channels/delete.md:1
 msgid "Delete a channel"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_channel.md:4
+#: ../../user/channels/delete.md:4
 msgid "Deleting a channel is irreversible. If you delete a channel you also delete the content associated with it. Users won't be able to access the channel any more. You can't re-use the channel's __Fediverse handle__ for another channel."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_channel.md:7
+#: ../../user/channels/delete.md:7
 msgid "If you want to delete your channel, follow these steps:"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_channel.md:0
+#: ../../user/channels/delete.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_channel.md:15
-#: ../../user_documentation/channels/delete_channel.md:28
+#: ../../user/channels/delete.md:15
+#: ../../user/channels/delete.md:28
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_channel.md:16
+#: ../../user/channels/delete.md:16
 msgid "Select the upload icon ({fa}`upload`) in the top of the sidebar."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_channel.md:17
-#: ../../user_documentation/channels/delete_channel.md:30
+#: ../../user/channels/delete.md:17
+#: ../../user/channels/delete.md:30
 msgid "Select {guilabel}`Get started` under {guilabel}`Publish your work in a channel`. Your user profile opens."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_channel.md:18
-#: ../../user_documentation/channels/delete_channel.md:31
+#: ../../user/channels/delete.md:18
+#: ../../user/channels/delete.md:31
 msgid "Select the channel you want to delete under the {guilabel}`Channels` header. The channel's page opens."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_channel.md:19
-#: ../../user_documentation/channels/delete_channel.md:32
+#: ../../user/channels/delete.md:19
+#: ../../user/channels/delete.md:32
 msgid "Select the kebab menu ({fa}`ellipsis-v`) to show the channel options."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_channel.md:20
-#: ../../user_documentation/channels/delete_channel.md:33
+#: ../../user/channels/delete.md:20
+#: ../../user/channels/delete.md:33
 msgid "Select {guilabel}`Delete…`. A {guilabel}`Delete this Channel?` warning message appears"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_channel.md:21
-#: ../../user_documentation/channels/delete_channel.md:34
+#: ../../user/channels/delete.md:21
+#: ../../user/channels/delete.md:34
 msgid "Select {guilabel}`Delete`."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_channel.md:0
+#: ../../user/channels/delete.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_channel.md:29
+#: ../../user/channels/delete.md:29
 msgid "Select the upload icon ({fa}`upload`) at the top of the screen."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_channel.md:38
+#: ../../user/channels/delete.md:38
 msgid "That's it! You deleted your channel."
 msgstr ""
diff --git a/docs/locales/gettext/user/channels/edit.pot b/docs/locales/gettext/user/channels/edit.pot
index e54312966..b69a64fbf 100644
--- a/docs/locales/gettext/user/channels/edit.pot
+++ b/docs/locales/gettext/user/channels/edit.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,162 +16,162 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/channels/edit_channel.md:1
+#: ../../user/channels/edit.md:1
 msgid "Edit a channel"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:4
+#: ../../user/channels/edit.md:4
 msgid "You can't change a channel's __Fediverse handle__."
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:7
+#: ../../user/channels/edit.md:7
 msgid "Channels are like user profiles on other {term}`Fediverse` software. This means you can edit their details at any time to reflect changes you've made."
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:9
+#: ../../user/channels/edit.md:9
 msgid "You can change different details depending on what type of channel you are editing:"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:15
+#: ../../user/channels/edit.md:15
 msgid "Edit an Artist channel"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:17
+#: ../../user/channels/edit.md:17
 msgid "To edit an **Artist channel**:"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:0
+#: ../../user/channels/edit.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:25
-#: ../../user_documentation/channels/edit_channel.md:43
-#: ../../user_documentation/channels/edit_channel.md:70
-#: ../../user_documentation/channels/edit_channel.md:93
+#: ../../user/channels/edit.md:25
+#: ../../user/channels/edit.md:43
+#: ../../user/channels/edit.md:70
+#: ../../user/channels/edit.md:93
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:26
-#: ../../user_documentation/channels/edit_channel.md:71
+#: ../../user/channels/edit.md:26
+#: ../../user/channels/edit.md:71
 msgid "Select the upload icon ({fa}`upload`) in the top of the sidebar."
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:27
-#: ../../user_documentation/channels/edit_channel.md:45
-#: ../../user_documentation/channels/edit_channel.md:72
-#: ../../user_documentation/channels/edit_channel.md:95
+#: ../../user/channels/edit.md:27
+#: ../../user/channels/edit.md:45
+#: ../../user/channels/edit.md:72
+#: ../../user/channels/edit.md:95
 msgid "Select {guilabel}`Get started` under {guilabel}`Publish your work in a channel`. Your user profile opens."
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:28
-#: ../../user_documentation/channels/edit_channel.md:46
-#: ../../user_documentation/channels/edit_channel.md:73
-#: ../../user_documentation/channels/edit_channel.md:96
+#: ../../user/channels/edit.md:28
+#: ../../user/channels/edit.md:46
+#: ../../user/channels/edit.md:73
+#: ../../user/channels/edit.md:96
 msgid "Select the channel you want to delete under the {guilabel}`Channels` header. The channel's page opens."
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:29
-#: ../../user_documentation/channels/edit_channel.md:47
-#: ../../user_documentation/channels/edit_channel.md:74
-#: ../../user_documentation/channels/edit_channel.md:97
+#: ../../user/channels/edit.md:29
+#: ../../user/channels/edit.md:47
+#: ../../user/channels/edit.md:74
+#: ../../user/channels/edit.md:97
 msgid "Select the kebab menu ({fa}`ellipsis-v`) to show the channel options."
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:30
-#: ../../user_documentation/channels/edit_channel.md:48
-#: ../../user_documentation/channels/edit_channel.md:75
-#: ../../user_documentation/channels/edit_channel.md:98
+#: ../../user/channels/edit.md:30
+#: ../../user/channels/edit.md:48
+#: ../../user/channels/edit.md:75
+#: ../../user/channels/edit.md:98
 msgid "Select {guilabel}`Edit…`. The {guilabel}`Artist channel` form appears."
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:31
-#: ../../user_documentation/channels/edit_channel.md:49
-#: ../../user_documentation/channels/edit_channel.md:76
-#: ../../user_documentation/channels/edit_channel.md:99
+#: ../../user/channels/edit.md:31
+#: ../../user/channels/edit.md:49
+#: ../../user/channels/edit.md:76
+#: ../../user/channels/edit.md:99
 msgid "Change the details in any of these fields:"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:32
-#: ../../user_documentation/channels/edit_channel.md:50
-#: ../../user_documentation/channels/edit_channel.md:77
-#: ../../user_documentation/channels/edit_channel.md:100
+#: ../../user/channels/edit.md:32
+#: ../../user/channels/edit.md:50
+#: ../../user/channels/edit.md:77
+#: ../../user/channels/edit.md:100
 msgid "{guilabel}`Name`"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:33
-#: ../../user_documentation/channels/edit_channel.md:51
-#: ../../user_documentation/channels/edit_channel.md:78
-#: ../../user_documentation/channels/edit_channel.md:101
+#: ../../user/channels/edit.md:33
+#: ../../user/channels/edit.md:51
+#: ../../user/channels/edit.md:78
+#: ../../user/channels/edit.md:101
 msgid "{guilabel}`Channel Picture`"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:34
-#: ../../user_documentation/channels/edit_channel.md:52
-#: ../../user_documentation/channels/edit_channel.md:79
-#: ../../user_documentation/channels/edit_channel.md:102
+#: ../../user/channels/edit.md:34
+#: ../../user/channels/edit.md:52
+#: ../../user/channels/edit.md:79
+#: ../../user/channels/edit.md:102
 msgid "{guilabel}`Tags`"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:35
-#: ../../user_documentation/channels/edit_channel.md:53
-#: ../../user_documentation/channels/edit_channel.md:81
-#: ../../user_documentation/channels/edit_channel.md:104
+#: ../../user/channels/edit.md:35
+#: ../../user/channels/edit.md:53
+#: ../../user/channels/edit.md:81
+#: ../../user/channels/edit.md:104
 msgid "{guilabel}`Description`"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:36
-#: ../../user_documentation/channels/edit_channel.md:54
-#: ../../user_documentation/channels/edit_channel.md:86
-#: ../../user_documentation/channels/edit_channel.md:109
+#: ../../user/channels/edit.md:36
+#: ../../user/channels/edit.md:54
+#: ../../user/channels/edit.md:86
+#: ../../user/channels/edit.md:109
 msgid "Select {guilabel}`Update channel` to save your changes."
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:0
+#: ../../user/channels/edit.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:44
-#: ../../user_documentation/channels/edit_channel.md:94
+#: ../../user/channels/edit.md:44
+#: ../../user/channels/edit.md:94
 msgid "Select the upload icon ({fa}`upload`) at the top of the screen."
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:58
+#: ../../user/channels/edit.md:58
 msgid "That's it! You've updated your channel details. Users see the new details when they visit your channel page."
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:60
+#: ../../user/channels/edit.md:60
 msgid "Edit a Podcast channel"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:62
+#: ../../user/channels/edit.md:62
 msgid "To edit a **Podcast channel**:"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:80
-#: ../../user_documentation/channels/edit_channel.md:103
+#: ../../user/channels/edit.md:80
+#: ../../user/channels/edit.md:103
 msgid "{guilabel}`Language`"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:82
-#: ../../user_documentation/channels/edit_channel.md:105
+#: ../../user/channels/edit.md:82
+#: ../../user/channels/edit.md:105
 msgid "{guilabel}`Category`"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:83
-#: ../../user_documentation/channels/edit_channel.md:106
+#: ../../user/channels/edit.md:83
+#: ../../user/channels/edit.md:106
 msgid "{guilabel}`Subcategory`"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:84
-#: ../../user_documentation/channels/edit_channel.md:107
+#: ../../user/channels/edit.md:84
+#: ../../user/channels/edit.md:107
 msgid "{guilabel}`Owner e-mail address`"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:85
-#: ../../user_documentation/channels/edit_channel.md:108
+#: ../../user/channels/edit.md:85
+#: ../../user/channels/edit.md:108
 msgid "{guilabel}`Owner name`"
 msgstr ""
 
-#: ../../user_documentation/channels/edit_channel.md:113
+#: ../../user/channels/edit.md:113
 msgid "You're done! Users see the new details when they visit your channel page. The changes also reflect on your podcast's {abbr}`RSS (Really Simple Syndication)` feed."
 msgstr ""
diff --git a/docs/locales/gettext/user/channels/follow.pot b/docs/locales/gettext/user/channels/follow.pot
index a549ea723..2ee161cf2 100644
--- a/docs/locales/gettext/user/channels/follow.pot
+++ b/docs/locales/gettext/user/channels/follow.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,116 +16,116 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/channels/follow_channel.md:1
+#: ../../user/channels/follow.md:1
 msgid "Follow a channel"
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:3
+#: ../../user/channels/follow.md:3
 msgid "Get access to a channel's content by following it. Following a channel makes its content visible to all users on your {term}`pod`."
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:5
+#: ../../user/channels/follow.md:5
 msgid "You can follow channels in a few different ways:"
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:11
+#: ../../user/channels/follow.md:11
 msgid "Follow a channel on your pod"
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:13
+#: ../../user/channels/follow.md:13
 msgid "If a user on your pod follows a channel or has published a channel, you can follow it from your pod. To do this:"
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:15
-#: ../../user_documentation/channels/follow_channel.md:58
+#: ../../user/channels/follow.md:15
+#: ../../user/channels/follow.md:58
 msgid "Select the channel you want to follow. The channel details page opens."
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:16
+#: ../../user/channels/follow.md:16
 msgid "Select the {guilabel}`Subscribe` button. The label changes to {guilabel}`Subscribed`."
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:18
+#: ../../user/channels/follow.md:18
 msgid "That's it! You've subscribed to the channel. You can see the channel in the {guilabel}`Channels` page."
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:20
+#: ../../user/channels/follow.md:20
 msgid "Follow a remote channel"
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:22
+#: ../../user/channels/follow.md:22
 msgid "To follow a channel located on another pod, you need its **Federation handle**. A **Federation handle** uses the following format: `@{username}@{domain}`. Once you have the channel's **Federation handle**, you can follow it from the {guilabel}`Channels` page. To do this:"
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:0
+#: ../../user/channels/follow.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:30
+#: ../../user/channels/follow.md:30
 msgid "Select {guilabel}`Channels` in the sidebar. The {guilabel}`Channels` page opens."
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:31
-#: ../../user_documentation/channels/follow_channel.md:44
+#: ../../user/channels/follow.md:31
+#: ../../user/channels/follow.md:44
 msgid "Select {guilabel}`+ Add new` at the top of the page. The {guilabel}`Subscriptions` screen appears."
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:32
-#: ../../user_documentation/channels/follow_channel.md:45
+#: ../../user/channels/follow.md:32
+#: ../../user/channels/follow.md:45
 msgid "Select {guilabel}`Fediverse`."
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:33
-#: ../../user_documentation/channels/follow_channel.md:46
+#: ../../user/channels/follow.md:33
+#: ../../user/channels/follow.md:46
 msgid "Enter the channel's **Federation handle** in the {guilabel}`Fediverse object` input."
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:34
-#: ../../user_documentation/channels/follow_channel.md:47
+#: ../../user/channels/follow.md:34
+#: ../../user/channels/follow.md:47
 msgid "Select {guilabel}`Subscribe`. The channel details page appears."
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:35
-#: ../../user_documentation/channels/follow_channel.md:48
+#: ../../user/channels/follow.md:35
+#: ../../user/channels/follow.md:48
 msgid "Select the {guilabel}`Subscribe}` button. The label changes to {guilabel}`Subscribed`."
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:0
+#: ../../user/channels/follow.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:42
+#: ../../user/channels/follow.md:42
 msgid "Select the hamburger menu ({fa}`bars`) to open the menu bar."
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:43
+#: ../../user/channels/follow.md:43
 msgid "Select {guilabel}`Channels`. The {guilabel}`Channels` page opens."
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:52
+#: ../../user/channels/follow.md:52
 msgid "That's it! You can now see the channel's content on your pod. Other users of your pod can also see this channel."
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:54
+#: ../../user/channels/follow.md:54
 msgid "Follow a Funkwhale podcast with a podcatcher"
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:56
+#: ../../user/channels/follow.md:56
 msgid "You can follow podcasts published in channels using a standard podcatcher. To do this:"
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:59
+#: ../../user/channels/follow.md:59
 msgid "Select the feed button ({fa}`feed`). The {guilabel}`Subscribe to this channel` window appears."
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:60
+#: ../../user/channels/follow.md:60
 msgid "Select {guilabel}`Copy` under the {guilabel}`Subscribe via RSS` to copy the channel's {abbr}`RSS (Really Simple Syndication)` feed URL."
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:61
+#: ../../user/channels/follow.md:61
 msgid "Paste the URL in your podcatcher."
 msgstr ""
 
-#: ../../user_documentation/channels/follow_channel.md:63
+#: ../../user/channels/follow.md:63
 msgid "That's it! Your podcatcher fetches the podcast details from Funkwhale."
 msgstr ""
diff --git a/docs/locales/gettext/user/channels/index.pot b/docs/locales/gettext/user/channels/index.pot
index 11c1627e4..7f1f6e4e7 100644
--- a/docs/locales/gettext/user/channels/index.pot
+++ b/docs/locales/gettext/user/channels/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,38 +16,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/channels/index.md:12
+#: ../../user/channels/index.md:12
 msgid "Manage your channels"
 msgstr ""
 
-#: ../../user_documentation/channels/index.md:24
+#: ../../user/channels/index.md:24
 msgid "Manage channel content"
 msgstr ""
 
-#: ../../user_documentation/channels/index.md:37
+#: ../../user/channels/index.md:37
 msgid "Follow channels"
 msgstr ""
 
-#: ../../user_documentation/channels/index.md:1
+#: ../../user/channels/index.md:1
 msgid "Channels"
 msgstr ""
 
-#: ../../user_documentation/channels/index.md:3
+#: ../../user/channels/index.md:3
 msgid "Use channels to publish your own audio content on Funkwhale. Channels enable you to create and share your creations with the whole {term}`Fediverse`."
 msgstr ""
 
-#: ../../user_documentation/channels/index.md:5
+#: ../../user/channels/index.md:5
 msgid "Funkwhale supports two types of channel:"
 msgstr ""
 
-#: ../../user_documentation/channels/index.md:7
+#: ../../user/channels/index.md:7
 msgid "**Podcasts** – broadcast your podcast over the Fediverse. Listeners can also use their favorite {term}`podcatcher` to listen to podcasts using {abbr}`RSS (Really Simple Syndication)`."
 msgstr ""
 
-#: ../../user_documentation/channels/index.md:8
+#: ../../user/channels/index.md:8
 msgid "**Artist Discography** – upload your own music and create a following."
 msgstr ""
 
-#: ../../user_documentation/channels/index.md:10
+#: ../../user/channels/index.md:10
 msgid "Follow the guides in this section to get started."
 msgstr ""
diff --git a/docs/locales/gettext/user/channels/podcast/delete.pot b/docs/locales/gettext/user/channels/podcast/delete.pot
index 0b1766928..2a28aecac 100644
--- a/docs/locales/gettext/user/channels/podcast/delete.pot
+++ b/docs/locales/gettext/user/channels/podcast/delete.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,126 +16,126 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/channels/delete_podcast.md:1
+#: ../../user/channels/podcast/delete.md:1
 msgid "Delete content from a Podcast channel"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:3
+#: ../../user/channels/podcast/delete.md:3
 msgid "You can delete content from your podcast channel. This means that your followers won't be able to listen to the deleted content any more."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:9
+#: ../../user/channels/podcast/delete.md:9
 msgid "Delete an episode"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:12
+#: ../../user/channels/podcast/delete.md:12
 msgid "Deleting an episode also deletes the file from the {term}`pod`. This action is irreversible."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:15
+#: ../../user/channels/podcast/delete.md:15
 msgid "To delete a single episode from a channel:"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:0
+#: ../../user/channels/podcast/delete.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:23
-#: ../../user_documentation/channels/delete_podcast.md:38
-#: ../../user_documentation/channels/delete_podcast.md:66
-#: ../../user_documentation/channels/delete_podcast.md:80
+#: ../../user/channels/podcast/delete.md:23
+#: ../../user/channels/podcast/delete.md:38
+#: ../../user/channels/podcast/delete.md:66
+#: ../../user/channels/podcast/delete.md:80
 msgid "Log in to your pod."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:24
-#: ../../user_documentation/channels/delete_podcast.md:67
+#: ../../user/channels/podcast/delete.md:24
+#: ../../user/channels/podcast/delete.md:67
 msgid "Select the upload icon ({fa}`upload`) in the top of the sidebar."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:25
-#: ../../user_documentation/channels/delete_podcast.md:40
-#: ../../user_documentation/channels/delete_podcast.md:68
-#: ../../user_documentation/channels/delete_podcast.md:82
+#: ../../user/channels/podcast/delete.md:25
+#: ../../user/channels/podcast/delete.md:40
+#: ../../user/channels/podcast/delete.md:68
+#: ../../user/channels/podcast/delete.md:82
 msgid "Select {guilabel}`Get started` under {guilabel}`Publish your work in a channel`. Your user profile opens."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:26
-#: ../../user_documentation/channels/delete_podcast.md:41
-#: ../../user_documentation/channels/delete_podcast.md:69
-#: ../../user_documentation/channels/delete_podcast.md:83
+#: ../../user/channels/podcast/delete.md:26
+#: ../../user/channels/podcast/delete.md:41
+#: ../../user/channels/podcast/delete.md:69
+#: ../../user/channels/podcast/delete.md:83
 msgid "Select the channel containing the content under the {guilabel}`Channels` header. The channel's page opens."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:27
-#: ../../user_documentation/channels/delete_podcast.md:42
+#: ../../user/channels/podcast/delete.md:27
+#: ../../user/channels/podcast/delete.md:42
 msgid "Select the kebab menu ({fa}`ellipsis-v`) next to the episode in question. This opens the track options menu."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:28
-#: ../../user_documentation/channels/delete_podcast.md:43
+#: ../../user/channels/podcast/delete.md:28
+#: ../../user/channels/podcast/delete.md:43
 msgid "Select {guilabel}`ℹ︎ Episode details`. The episode details page opens."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:29
-#: ../../user_documentation/channels/delete_podcast.md:44
+#: ../../user/channels/podcast/delete.md:29
+#: ../../user/channels/podcast/delete.md:44
 msgid "Select the kebab menu ({fa}`ellipsis-v`) at the top of the page."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:30
-#: ../../user_documentation/channels/delete_podcast.md:45
+#: ../../user/channels/podcast/delete.md:30
+#: ../../user/channels/podcast/delete.md:45
 msgid "Select {guilabel}`Delete…`. A {guilabel}`Delete this track?` warning appears."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:31
-#: ../../user_documentation/channels/delete_podcast.md:46
+#: ../../user/channels/podcast/delete.md:31
+#: ../../user/channels/podcast/delete.md:46
 msgid "Select {guilabel}`Delete` to delete the episode."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:0
+#: ../../user/channels/podcast/delete.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:39
-#: ../../user_documentation/channels/delete_podcast.md:81
+#: ../../user/channels/podcast/delete.md:39
+#: ../../user/channels/podcast/delete.md:81
 msgid "Select the upload icon ({fa}`upload`) at the top of the screen."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:50
-msgid "That's it! You've deleted your episode. You can add it again by [uploading it to your channel](upload_podcast.md)."
+#: ../../user/channels/podcast/delete.md:50
+msgid "That's it! You've deleted your episode. You can add it again by [uploading it to your channel](upload.md)."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:52
+#: ../../user/channels/podcast/delete.md:52
 msgid "Delete a series"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:55
+#: ../../user/channels/podcast/delete.md:55
 msgid "Deleting a series also deletes all episodes in the series and deletes the files from the {term}`pod`. This action is irreversible."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:58
+#: ../../user/channels/podcast/delete.md:58
 msgid "Delete a series to remove all episodes it contains. To do this:"
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:70
-#: ../../user_documentation/channels/delete_podcast.md:84
+#: ../../user/channels/podcast/delete.md:70
+#: ../../user/channels/podcast/delete.md:84
 msgid "Select your series in the {guilabel}`Series` section. The series detail page opens."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:71
-#: ../../user_documentation/channels/delete_podcast.md:85
+#: ../../user/channels/podcast/delete.md:71
+#: ../../user/channels/podcast/delete.md:85
 msgid "Select the kebab menu ({fa}`ellipsis-v`) to open the options menu."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:72
-#: ../../user_documentation/channels/delete_podcast.md:86
+#: ../../user/channels/podcast/delete.md:72
+#: ../../user/channels/podcast/delete.md:86
 msgid "Select {guilabel}`Delete…`. A {guilabel}`Delete this album?` warning appears."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:73
-#: ../../user_documentation/channels/delete_podcast.md:87
+#: ../../user/channels/podcast/delete.md:73
+#: ../../user/channels/podcast/delete.md:87
 msgid "Select {guilabel}`Delete` to delete the series."
 msgstr ""
 
-#: ../../user_documentation/channels/delete_podcast.md:91
-msgid "You're done! You've deleted the series and all the episodes it contained. You can add them again by [uploading it to your channel](upload_podcast.md)."
+#: ../../user/channels/podcast/delete.md:91
+msgid "You're done! You've deleted the series and all the episodes it contained. You can add them again by [uploading it to your channel](upload.md)."
 msgstr ""
diff --git a/docs/locales/gettext/user/channels/podcast/upload.pot b/docs/locales/gettext/user/channels/podcast/upload.pot
index f948fe31a..d040493d5 100644
--- a/docs/locales/gettext/user/channels/podcast/upload.pot
+++ b/docs/locales/gettext/user/channels/podcast/upload.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,275 +16,275 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/channels/upload_podcast.md:1
+#: ../../user/channels/podcast/upload.md:1
 msgid "Upload content to an Podcast channel"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:3
-msgid "Once you have [created a channel](create_channel.md), you can start to add content to it. Users who follow your channel can see and play your content from their {term}`pods <Pod>`."
+#: ../../user/channels/podcast/upload.md:3
+msgid "Once you have [created a channel](../create.md), you can start to add content to it. Users who follow your channel can see and play your content from their {term}`pods <Pod>`."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:5
+#: ../../user/channels/podcast/upload.md:5
 msgid "You can also create series to organize your channel content."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:11
+#: ../../user/channels/podcast/upload.md:11
 msgid "Create a series (optional)"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:13
+#: ../../user/channels/podcast/upload.md:13
 msgid "Series are a good way of organizing your content. You can create as many series as you want. To create a new series:"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:0
+#: ../../user/channels/podcast/upload.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:21
-#: ../../user_documentation/channels/upload_podcast.md:34
-#: ../../user_documentation/channels/upload_podcast.md:70
-#: ../../user_documentation/channels/upload_podcast.md:88
-#: ../../user_documentation/channels/upload_podcast.md:129
-#: ../../user_documentation/channels/upload_podcast.md:147
+#: ../../user/channels/podcast/upload.md:21
+#: ../../user/channels/podcast/upload.md:34
+#: ../../user/channels/podcast/upload.md:70
+#: ../../user/channels/podcast/upload.md:88
+#: ../../user/channels/podcast/upload.md:129
+#: ../../user/channels/podcast/upload.md:147
 msgid "Log in to your pod."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:22
-#: ../../user_documentation/channels/upload_podcast.md:71
-#: ../../user_documentation/channels/upload_podcast.md:130
+#: ../../user/channels/podcast/upload.md:22
+#: ../../user/channels/podcast/upload.md:71
+#: ../../user/channels/podcast/upload.md:130
 msgid "Select the upload icon ({fa}`upload`) in the top of the sidebar."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:23
-#: ../../user_documentation/channels/upload_podcast.md:36
-#: ../../user_documentation/channels/upload_podcast.md:72
-#: ../../user_documentation/channels/upload_podcast.md:90
-#: ../../user_documentation/channels/upload_podcast.md:131
-#: ../../user_documentation/channels/upload_podcast.md:149
+#: ../../user/channels/podcast/upload.md:23
+#: ../../user/channels/podcast/upload.md:36
+#: ../../user/channels/podcast/upload.md:72
+#: ../../user/channels/podcast/upload.md:90
+#: ../../user/channels/podcast/upload.md:131
+#: ../../user/channels/podcast/upload.md:149
 msgid "Select {guilabel}`Get started` under {guilabel}`Publish your work in a channel`. Your user profile opens."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:24
-#: ../../user_documentation/channels/upload_podcast.md:37
+#: ../../user/channels/podcast/upload.md:24
+#: ../../user/channels/podcast/upload.md:37
 msgid "Select the channel you want to add a series to under the {guilabel}`Channels` header. The channel's page opens."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:25
-#: ../../user_documentation/channels/upload_podcast.md:38
+#: ../../user/channels/podcast/upload.md:25
+#: ../../user/channels/podcast/upload.md:38
 msgid "Select {guilabel}`+ Add new` next to the {guilabel}`Series` section. A {guilabel}`New album` screen appears."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:26
-#: ../../user_documentation/channels/upload_podcast.md:39
+#: ../../user/channels/podcast/upload.md:26
+#: ../../user/channels/podcast/upload.md:39
 msgid "Enter the {guilabel}`Title` of your series."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:27
-#: ../../user_documentation/channels/upload_podcast.md:40
+#: ../../user/channels/podcast/upload.md:27
+#: ../../user/channels/podcast/upload.md:40
 msgid "Select {guilabel}`Create` to create your new series. The series appears on the screen."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:0
+#: ../../user/channels/podcast/upload.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:35
-#: ../../user_documentation/channels/upload_podcast.md:89
-#: ../../user_documentation/channels/upload_podcast.md:148
+#: ../../user/channels/podcast/upload.md:35
+#: ../../user/channels/podcast/upload.md:89
+#: ../../user/channels/podcast/upload.md:148
 msgid "Select the upload icon ({fa}`upload`) at the top of the screen."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:44
+#: ../../user/channels/podcast/upload.md:44
 msgid "Once you've created your series, you can add some details to it. To do this:"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:46
+#: ../../user/channels/podcast/upload.md:46
 msgid "Select the series. The series details screen opens."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:47
+#: ../../user/channels/podcast/upload.md:47
 msgid "Select the kebab menu ({fa}`ellipsis-v`) to show the album options."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:48
+#: ../../user/channels/podcast/upload.md:48
 msgid "Select {guilabel}`✎ Edit`. The {guilabel}`Edit this album` screen opens."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:49
-#: ../../user_documentation/channels/upload_podcast.md:107
+#: ../../user/channels/podcast/upload.md:49
+#: ../../user/channels/podcast/upload.md:107
 msgid "Change the details in any of these fields:"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:50
+#: ../../user/channels/podcast/upload.md:50
 msgid "{guilabel}`Title` – the title of the series."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:51
+#: ../../user/channels/podcast/upload.md:51
 msgid "{guilabel}`Description` – a description of the series."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:52
+#: ../../user/channels/podcast/upload.md:52
 msgid "{guilabel}`Release date` – the date on which the series aired."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:53
+#: ../../user/channels/podcast/upload.md:53
 msgid "{guilabel}`Cover` – a cover image for the series."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:54
+#: ../../user/channels/podcast/upload.md:54
 msgid "{guilabel}`Tags` – tags relating to the series' content."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:55
+#: ../../user/channels/podcast/upload.md:55
 msgid "**Optional** – enter a {guilabel}`Summary` of your changes."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:56
+#: ../../user/channels/podcast/upload.md:56
 msgid "Select {guilabel}`Submit and apply edit` to save your changes."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:58
+#: ../../user/channels/podcast/upload.md:58
 msgid "That's it! Your series is ready to use."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:60
+#: ../../user/channels/podcast/upload.md:60
 msgid "Add your content"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:62
+#: ../../user/channels/podcast/upload.md:62
 msgid "To add content to your channel:"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:73
-#: ../../user_documentation/channels/upload_podcast.md:91
-#: ../../user_documentation/channels/upload_podcast.md:132
-#: ../../user_documentation/channels/upload_podcast.md:150
+#: ../../user/channels/podcast/upload.md:73
+#: ../../user/channels/podcast/upload.md:91
+#: ../../user/channels/podcast/upload.md:132
+#: ../../user/channels/podcast/upload.md:150
 msgid "Select the channel you want to add content to under the {guilabel}`Channels` header. The channel's page opens."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:74
-#: ../../user_documentation/channels/upload_podcast.md:92
-#: ../../user_documentation/channels/upload_podcast.md:133
-#: ../../user_documentation/channels/upload_podcast.md:151
+#: ../../user/channels/podcast/upload.md:74
+#: ../../user/channels/podcast/upload.md:92
+#: ../../user/channels/podcast/upload.md:133
+#: ../../user/channels/podcast/upload.md:151
 msgid "Select {guilabel}`⇧ Upload`. The {guilabel}`Publish audio` screen appears."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:75
-#: ../../user_documentation/channels/upload_podcast.md:93
-#: ../../user_documentation/channels/upload_podcast.md:134
-#: ../../user_documentation/channels/upload_podcast.md:152
+#: ../../user/channels/podcast/upload.md:75
+#: ../../user/channels/podcast/upload.md:93
+#: ../../user/channels/podcast/upload.md:134
+#: ../../user/channels/podcast/upload.md:152
 msgid "Select the {guilabel}`Channel` you want to publish your audio in. This populates with the channel you selected by default."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:76
-#: ../../user_documentation/channels/upload_podcast.md:94
-#: ../../user_documentation/channels/upload_podcast.md:135
-#: ../../user_documentation/channels/upload_podcast.md:153
+#: ../../user/channels/podcast/upload.md:76
+#: ../../user/channels/podcast/upload.md:94
+#: ../../user/channels/podcast/upload.md:135
+#: ../../user/channels/podcast/upload.md:153
 msgid "**Optional** – choose which [{guilabel}`Series`](#create-a-series-optional) you want to publish the content in."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:77
-#: ../../user_documentation/channels/upload_podcast.md:95
-#: ../../user_documentation/channels/upload_podcast.md:136
-#: ../../user_documentation/channels/upload_podcast.md:154
+#: ../../user/channels/podcast/upload.md:77
+#: ../../user/channels/podcast/upload.md:95
+#: ../../user/channels/podcast/upload.md:136
+#: ../../user/channels/podcast/upload.md:154
 msgid "**Optional** – choose a {guilabel}`License` to apply to your content. Funkwhale supports [Creative Commons](https://creativecommons.org/) licenses."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:78
-#: ../../user_documentation/channels/upload_podcast.md:96
-#: ../../user_documentation/channels/upload_podcast.md:137
-#: ../../user_documentation/channels/upload_podcast.md:155
+#: ../../user/channels/podcast/upload.md:78
+#: ../../user/channels/podcast/upload.md:96
+#: ../../user/channels/podcast/upload.md:137
+#: ../../user/channels/podcast/upload.md:155
 msgid "Select {guilabel}`Next step`. The {guilabel}`Files to upload` screen appears."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:79
+#: ../../user/channels/podcast/upload.md:79
 msgid "Click on the section marked {guilabel}`Browse…` to open a file picker, or drag and drop your files on to it."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:80
+#: ../../user/channels/podcast/upload.md:80
 msgid "If you opened the file picker, select the files you want to upload and confirm."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:81
-#: ../../user_documentation/channels/upload_podcast.md:98
+#: ../../user/channels/podcast/upload.md:81
+#: ../../user/channels/podcast/upload.md:98
 msgid "The files appear at the top when you upload them. Select {guilabel}`Remove` to remove them."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:97
+#: ../../user/channels/podcast/upload.md:97
 msgid "Click on the section marked {guilabel}`Browse…` to open a file picker. Select the files you want to upload and confirm."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:102
+#: ../../user/channels/podcast/upload.md:102
 msgid "Edit your uploads"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:104
+#: ../../user/channels/podcast/upload.md:104
 msgid "Once you have uploaded your files, you can change their details. To do this:"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:106
+#: ../../user/channels/podcast/upload.md:106
 msgid "Select the edit icon ({fa}`edit`) to edit the track details. The {guilabel}`Upload details` screen appears."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:108
+#: ../../user/channels/podcast/upload.md:108
 msgid "{guilabel}`Title` – the title of the episode"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:109
+#: ../../user/channels/podcast/upload.md:109
 msgid "{guilabel}`Track Picture` – the picture that shows up next to the episode."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:110
+#: ../../user/channels/podcast/upload.md:110
 msgid "{guilabel}`Tags` – tags relating to the episode content."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:111
+#: ../../user/channels/podcast/upload.md:111
 msgid "{guilabel}`Position` – the position of the track in the series."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:112
+#: ../../user/channels/podcast/upload.md:112
 msgid "{guilabel}`Description` – a description of the track."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:113
+#: ../../user/channels/podcast/upload.md:113
 msgid "Select {guilabel}`Update` to save the track details."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:114
+#: ../../user/channels/podcast/upload.md:114
 msgid "Do this for all episodes you want to publish."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:115
+#: ../../user/channels/podcast/upload.md:115
 msgid "Select {guilabel}`Publish` to publish the content. To save the content to upload later, select {menuselection}`Down arrow --> Finish later`."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:117
+#: ../../user/channels/podcast/upload.md:117
 msgid "That's it! You've added content to your channel. Your followers can now listen to your content from their pods or podcatchers."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:119
+#: ../../user/channels/podcast/upload.md:119
 msgid "Continue your upload later"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:121
+#: ../../user/channels/podcast/upload.md:121
 msgid "If you selected {guilabel}`Finish later`, Funkwhale saves your files and edits. You can continue your upload later by doing the following:"
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:138
-#: ../../user_documentation/channels/upload_podcast.md:156
+#: ../../user/channels/podcast/upload.md:138
+#: ../../user/channels/podcast/upload.md:156
 msgid "If there are pending uploads, a {guilabel}`You have some draft uploads pending publication` note shows. Select {guilabel}`Resume` to resume your upload."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:139
-#: ../../user_documentation/channels/upload_podcast.md:157
+#: ../../user/channels/podcast/upload.md:139
+#: ../../user/channels/podcast/upload.md:157
 msgid "[Add new files](#add-your-content) or [edit the pending files](#edit-your-uploads)."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:140
-#: ../../user_documentation/channels/upload_podcast.md:158
+#: ../../user/channels/podcast/upload.md:140
+#: ../../user/channels/podcast/upload.md:158
 msgid "Once you're finished, select {guilabel}`Publish` to publish your content."
 msgstr ""
 
-#: ../../user_documentation/channels/upload_podcast.md:162
+#: ../../user/channels/podcast/upload.md:162
 msgid "Congratulations! You've finished uploading the saved content. Your followers can now listen to your content from their pods."
 msgstr ""
diff --git a/docs/locales/gettext/user/channels/rss.pot b/docs/locales/gettext/user/channels/rss.pot
index 5fe0a0768..24409b8f3 100644
--- a/docs/locales/gettext/user/channels/rss.pot
+++ b/docs/locales/gettext/user/channels/rss.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,58 +16,58 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/channels/subscribe_rss.md:1
+#: ../../user/channels/rss.md:1
 msgid "Subscribe to an RSS feed"
 msgstr ""
 
-#: ../../user_documentation/channels/subscribe_rss.md:4
+#: ../../user/channels/rss.md:4
 msgid "Other users on your pod can't see podcasts you import using RSS. They need to subscribe to the feed themselves."
 msgstr ""
 
-#: ../../user_documentation/channels/subscribe_rss.md:7
+#: ../../user/channels/rss.md:7
 msgid "You can use Funkwhale as a {term}`podcatcher` to listen to your favorite podcasts. Funkwhale can read {abbr}`RSS (Really Simple Syndication)` feeds to import podcasts. To add an RSS feed to Funkwhale:"
 msgstr ""
 
-#: ../../user_documentation/channels/subscribe_rss.md:0
+#: ../../user/channels/rss.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/channels/subscribe_rss.md:15
+#: ../../user/channels/rss.md:15
 msgid "Select {guilabel}`Channels` in the sidebar. The {guilabel}`Channels` page opens."
 msgstr ""
 
-#: ../../user_documentation/channels/subscribe_rss.md:16
-#: ../../user_documentation/channels/subscribe_rss.md:28
+#: ../../user/channels/rss.md:16
+#: ../../user/channels/rss.md:28
 msgid "Select {guilabel}`+ Add new` at the top of the page. The {guilabel}`Subscriptions` screen appears."
 msgstr ""
 
-#: ../../user_documentation/channels/subscribe_rss.md:17
-#: ../../user_documentation/channels/subscribe_rss.md:29
+#: ../../user/channels/rss.md:17
+#: ../../user/channels/rss.md:29
 msgid "Select {guilabel}`RSS`."
 msgstr ""
 
-#: ../../user_documentation/channels/subscribe_rss.md:18
-#: ../../user_documentation/channels/subscribe_rss.md:30
+#: ../../user/channels/rss.md:18
+#: ../../user/channels/rss.md:30
 msgid "Enter the URL of the RSS feed in the {guilabel}`RSS feed location` input."
 msgstr ""
 
-#: ../../user_documentation/channels/subscribe_rss.md:19
-#: ../../user_documentation/channels/subscribe_rss.md:31
+#: ../../user/channels/rss.md:19
+#: ../../user/channels/rss.md:31
 msgid "Select {guilabel}`Subscribe`."
 msgstr ""
 
-#: ../../user_documentation/channels/subscribe_rss.md:0
+#: ../../user/channels/rss.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/channels/subscribe_rss.md:26
+#: ../../user/channels/rss.md:26
 msgid "Select the hamburger menu ({fa}`bars`) to open the menu bar."
 msgstr ""
 
-#: ../../user_documentation/channels/subscribe_rss.md:27
+#: ../../user/channels/rss.md:27
 msgid "Select {guilabel}`Channels`. The {guilabel}`Channels` page opens."
 msgstr ""
 
-#: ../../user_documentation/channels/subscribe_rss.md:35
+#: ../../user/channels/rss.md:35
 msgid "That's it! Your favorite podcast is now available in the {guilabel}`Channels` page. Funkwhale updates the feed to make sure you always have the latest episodes."
 msgstr ""
diff --git a/docs/locales/gettext/user/favorites/add.pot b/docs/locales/gettext/user/favorites/add.pot
index 62c103ccd..a94c30e4b 100644
--- a/docs/locales/gettext/user/favorites/add.pot
+++ b/docs/locales/gettext/user/favorites/add.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,95 +16,95 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/favorites/add_favorites.md:1
+#: ../../user/favorites/add.md:1
 msgid "Add tracks to your favorites"
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:3
+#: ../../user/favorites/add.md:3
 msgid "You can add tracks to your favorites list at any time. There are a few ways you can add tracks to your favorites:"
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:9
+#: ../../user/favorites/add.md:9
 msgid "Add the currently playing track"
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:11
+#: ../../user/favorites/add.md:11
 msgid "To add the currently playing track to your favorites, do one of the following:"
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:0
+#: ../../user/favorites/add.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:19
+#: ../../user/favorites/add.md:19
 msgid "Select the gray heart icon ({fa}`heart`) on the player bar. The heart turns pink to show that the track is in your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:20
+#: ../../user/favorites/add.md:20
 msgid "Hit the {kbd}`l` key on your keyboard. The heart icon on the player turns pink to show that the track is in your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:0
+#: ../../user/favorites/add.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:27
+#: ../../user/favorites/add.md:27
 msgid "Select the player at the bottom of the screen to expand it. Select the gray heart icon ({fa}`heart`) under the track art. The heart turns pink to show that the track is in your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:31
+#: ../../user/favorites/add.md:31
 msgid "That's all there is to it! The currently playing track is now in your favorites list."
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:33
+#: ../../user/favorites/add.md:33
 msgid "Add a track from a track table"
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:35
+#: ../../user/favorites/add.md:35
 msgid "You can favorite tracks on any page with a track table. This includes artist pages, album pages, and the search page. To favorite tracks on the track table:"
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:43
-#: ../../user_documentation/favorites/add_favorites.md:52
+#: ../../user/favorites/add.md:43
+#: ../../user/favorites/add.md:52
 msgid "Find your track in a track table."
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:44
+#: ../../user/favorites/add.md:44
 msgid "Hover over the track row. A gray heart icon ({fa}`heart`) appears."
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:45
+#: ../../user/favorites/add.md:45
 msgid "Select the heart icon. The heart turns pink to show that the track is in your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:53
+#: ../../user/favorites/add.md:53
 msgid "Tap on the kebab menu ({fa}`ellipsis-v`) on the track row. The track menu opens."
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:54
+#: ../../user/favorites/add.md:54
 msgid "Select {guilabel}`Add to favorites`. The heart turns pink to show that the track is in your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:58
+#: ../../user/favorites/add.md:58
 msgid "You're done! The track is in your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:60
+#: ../../user/favorites/add.md:60
 msgid "Add a track from the track details page"
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:62
+#: ../../user/favorites/add.md:62
 msgid "You can add a track to your favorites from its details page. To do this:"
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:64
+#: ../../user/favorites/add.md:64
 msgid "Go to the track's details page."
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:65
+#: ../../user/favorites/add.md:65
 msgid "Select the gray heart icon ({fa}`heart`) at the top of the screen. The heart turns pink to show that the track is in your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/add_favorites.md:67
+#: ../../user/favorites/add.md:67
 msgid "That's it! The track is in your favorites."
 msgstr ""
diff --git a/docs/locales/gettext/user/favorites/index.pot b/docs/locales/gettext/user/favorites/index.pot
index c1c29d2e6..5553c0f31 100644
--- a/docs/locales/gettext/user/favorites/index.pot
+++ b/docs/locales/gettext/user/favorites/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/favorites/index.md:5
+#: ../../user/favorites/index.md:5
 msgid "Manage your favorites"
 msgstr ""
 
-#: ../../user_documentation/favorites/index.md:1
+#: ../../user/favorites/index.md:1
 msgid "Favorites"
 msgstr ""
 
-#: ../../user_documentation/favorites/index.md:3
+#: ../../user/favorites/index.md:3
 msgid "Your favorites is a list of tracks you've liked while listening on Funkwhale. Follow the guides in this section to manage your favorites."
 msgstr ""
diff --git a/docs/locales/gettext/user/favorites/remove.pot b/docs/locales/gettext/user/favorites/remove.pot
index 3e4e6163e..7d72819aa 100644
--- a/docs/locales/gettext/user/favorites/remove.pot
+++ b/docs/locales/gettext/user/favorites/remove.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,134 +16,134 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/favorites/remove_favorites.md:1
+#: ../../user/favorites/remove.md:1
 msgid "Remove tracks from your favorites"
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:3
+#: ../../user/favorites/remove.md:3
 msgid "If you no longer want a track in your favorites list, you can remove it. There are a few ways to do this."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:9
+#: ../../user/favorites/remove.md:9
 msgid "Remove tracks from your favorites page"
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:11
+#: ../../user/favorites/remove.md:11
 msgid "The easiest way to remove tracks from your favorites is using the **Favorites** page. This page includes a list of all your favorites. To remove a track from this page:"
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:0
+#: ../../user/favorites/remove.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:19
+#: ../../user/favorites/remove.md:19
 msgid "Select {guilabel}`Favorites` under the {guilabel}`My Library` section in the sidebar. The {guilabel}`Favorites` page opens."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:20
-#: ../../user_documentation/favorites/remove_favorites.md:31
+#: ../../user/favorites/remove.md:20
+#: ../../user/favorites/remove.md:31
 msgid "Use the filters to find the track you want to remove."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:21
+#: ../../user/favorites/remove.md:21
 msgid "Select the pink heart icon ({fa}`heart`) next to the track you want to remove. The heart turns gray to show that the track isn't in your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:0
+#: ../../user/favorites/remove.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:28
+#: ../../user/favorites/remove.md:28
 msgid "Select the hamburger menu ({fa}`bars`) to open the menu bar."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:29
+#: ../../user/favorites/remove.md:29
 msgid "Select {guilabel}`My Library`."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:30
+#: ../../user/favorites/remove.md:30
 msgid "Select {guilabel}`Favorites`. The {guilabel}`Favorites` page opens."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:32
-#: ../../user_documentation/favorites/remove_favorites.md:83
+#: ../../user/favorites/remove.md:32
+#: ../../user/favorites/remove.md:83
 msgid "Tap on the kebab menu ({fa}`ellipsis-v`) on the track row. The track menu opens."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:33
-#: ../../user_documentation/favorites/remove_favorites.md:84
+#: ../../user/favorites/remove.md:33
+#: ../../user/favorites/remove.md:84
 msgid "Select {guilabel}`Remove from favorites`. The heart turns gray to show that the track isn't in your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:37
+#: ../../user/favorites/remove.md:37
 msgid "That's all there is to it! You've removed the track from your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:39
+#: ../../user/favorites/remove.md:39
 msgid "Remove the currently playing track from your favorites"
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:41
+#: ../../user/favorites/remove.md:41
 msgid "If you favorited the current track and want to remove it from your favorites, do one of the following:"
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:49
+#: ../../user/favorites/remove.md:49
 msgid "Select the pink heart icon ({fa}`heart`) on the player bar. The heart turns gray to show that the track isn't in your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:50
+#: ../../user/favorites/remove.md:50
 msgid "Hit the {kbd}`l` key on your keyboard. The heart icon on the player turns gray to show that the track isn't in your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:57
+#: ../../user/favorites/remove.md:57
 msgid "Select the player at the bottom of the screen to expand it. Select the pink heart icon ({fa}`heart`) under the track art. The heart turns gray to show that the track isn't in your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:61
+#: ../../user/favorites/remove.md:61
 msgid "That's it! You've removed the currently playing track from your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:63
+#: ../../user/favorites/remove.md:63
 msgid "Remove a track from a track table"
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:65
+#: ../../user/favorites/remove.md:65
 msgid "You can remove tracks on track tables from your favorites. You can find track tables on artist pages, album pages, and the search page. To remove a track on a track table from your favorites:"
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:73
-#: ../../user_documentation/favorites/remove_favorites.md:82
+#: ../../user/favorites/remove.md:73
+#: ../../user/favorites/remove.md:82
 msgid "Find your track in a track table."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:74
+#: ../../user/favorites/remove.md:74
 msgid "A pink heart icon ({fa}`heart`) shows next to all tracks in your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:75
+#: ../../user/favorites/remove.md:75
 msgid "Select the heart icon on the track you want to remove. The heart turns gray to show that the track isn't in your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:88
+#: ../../user/favorites/remove.md:88
 msgid "You're done! You've removed the track from your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:90
+#: ../../user/favorites/remove.md:90
 msgid "Remove a track from the track details page"
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:92
+#: ../../user/favorites/remove.md:92
 msgid "You can remove a track from your favorites from its details page. To do this:"
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:94
+#: ../../user/favorites/remove.md:94
 msgid "Go to the track's details page."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:95
+#: ../../user/favorites/remove.md:95
 msgid "Select the pink heart icon ({fa}`heart`) at the top of the screen. The heart turns gray to show that the track isn't your favorites."
 msgstr ""
 
-#: ../../user_documentation/favorites/remove_favorites.md:97
+#: ../../user/favorites/remove.md:97
 msgid "That's it! You've removed the track from your favorites."
 msgstr ""
diff --git a/docs/locales/gettext/user/index.pot b/docs/locales/gettext/user/index.pot
index fcfaf5c8c..0bcf42e7e 100644
--- a/docs/locales/gettext/user/index.pot
+++ b/docs/locales/gettext/user/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,78 +16,78 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/index.md:1
+#: ../../user/index.md:1
 msgid "Get started"
 msgstr ""
 
-#: ../../user_documentation/index.md:3
+#: ../../user/index.md:3
 msgid "Follow the guides in our user documentation to get started using Funkwhale."
 msgstr ""
 
-#: ../../user_documentation/index.md:9
+#: ../../user/index.md:9
 msgid "Set up your Funkwhale account"
 msgstr ""
 
-#: ../../user_documentation/index.md:11
+#: ../../user/index.md:11
 msgid "Some {term}`Funkwhale pods <Pod>` allow you to listen to music without signing up. To get the most out of Funkwhale, you should create an account. Check out [Your account](accounts/index.md) to get started."
 msgstr ""
 
-#: ../../user_documentation/index.md:13
+#: ../../user/index.md:13
 msgid "Publish your content on Funkwhale"
 msgstr ""
 
-#: ../../user_documentation/index.md:15
+#: ../../user/index.md:15
 msgid "Got a podcast you want to share with the world? Working on a new album? Funkwhale gives you the tools you need to share your creativity with the {term}`Fediverse`. Publish your work in [Channels](channels/index.md) to start building up your following."
 msgstr ""
 
-#: ../../user_documentation/index.md:17
+#: ../../user/index.md:17
 msgid "Upload your collection to Funkwhale"
 msgstr ""
 
-#: ../../user_documentation/index.md:19
+#: ../../user/index.md:19
 msgid "Want to listen to your private collection using Funkwhale? Upload your files to [Libraries](libraries/index.md) to store your collection on your pod and share it with others."
 msgstr ""
 
-#: ../../user_documentation/index.md:21
+#: ../../user/index.md:21
 msgid "Start listening"
 msgstr ""
 
-#: ../../user_documentation/index.md:23
+#: ../../user/index.md:23
 msgid "Want to listen to something new or enjoy an old favorite? Follow the guides in the sections linked below to master playback in Funkwhale:"
 msgstr ""
 
-#: ../../user_documentation/index.md:25
+#: ../../user/index.md:25
 msgid "Learn how to use the [Queue](queue/index.md) to organize playback."
 msgstr ""
 
-#: ../../user_documentation/index.md:26
+#: ../../user/index.md:26
 msgid "Build [Playlists](playlists/index.md) to personalize how you enjoy your favorite content."
 msgstr ""
 
-#: ../../user_documentation/index.md:27
+#: ../../user/index.md:27
 msgid "Create new [Radios](radios/index.md) to automate your listening experience."
 msgstr ""
 
-#: ../../user_documentation/index.md:29
+#: ../../user/index.md:29
 msgid "Report content and users"
 msgstr ""
 
-#: ../../user_documentation/index.md:31
+#: ../../user/index.md:31
 msgid "If you've come across something that doesn't abide by a pod's rules or the law, you can report it. Follow the guides in the [Reporting](reports/index.md) section to see how."
 msgstr ""
 
-#: ../../user_documentation/index.md:33
+#: ../../user/index.md:33
 msgid "Access Funkwhale from other apps"
 msgstr ""
 
-#: ../../user_documentation/index.md:35
+#: ../../user/index.md:35
 msgid "Funkwhale supports a subset of the Subsonic API. This means you can play your Funkwhale content on Subsonic apps. Learn more about how to do this in the [Subsonic](subsonic/index.md) section."
 msgstr ""
 
-#: ../../user_documentation/index.md:37
+#: ../../user/index.md:37
 msgid "Enhance your experience with plugins"
 msgstr ""
 
-#: ../../user_documentation/index.md:39
+#: ../../user/index.md:39
 msgid "Funkwhale supports plugins to extend its features or to add new features. Check out our [Plugins](plugins/index.md) section for details about our plugins and how to use them."
 msgstr ""
diff --git a/docs/locales/gettext/user/info/cli.pot b/docs/locales/gettext/user/info/cli.pot
index 08d14ecf5..af3665b5a 100644
--- a/docs/locales/gettext/user/info/cli.pot
+++ b/docs/locales/gettext/user/info/cli.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,474 +16,474 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/info/cli.rst:2
+#: ../../user/info/cli.rst:2
 msgid "Funkwhale CLI"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:4
+#: ../../user/info/cli.rst:4
 msgid "`Funkwhale CLI <https://dev.funkwhale.audio/funkwhale/cli/>`_ is a command-line interface you can install on your local computer to interact with any Funkwhale server via the REST API. It's especially useful if you need to do repetitive operations or write scripts that interact with Funkwhale servers."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:8
+#: ../../user/info/cli.rst:8
 msgid "Here is a (non-exhaustive) list of operations you can perform via the CLI:"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:10
+#: ../../user/info/cli.rst:10
 msgid "Manage libraries"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:11
+#: ../../user/info/cli.rst:11
 msgid "Upload local files"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:12
+#: ../../user/info/cli.rst:12
 msgid "Retrieve and search tracks, albums and artists"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:13
+#: ../../user/info/cli.rst:13
 msgid "Download tracks"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:14
+#: ../../user/info/cli.rst:14
 msgid "Manage playlists"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:15
+#: ../../user/info/cli.rst:15
 msgid "Manage favorites"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:17
+#: ../../user/info/cli.rst:17
 msgid "Table of Contents"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:20
+#: ../../user/info/cli.rst:20
 msgid "Installation"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:22
+#: ../../user/info/cli.rst:22
 msgid "We provide a prebuilt binary for Linux::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:27
+#: ../../user/info/cli.rst:27
 msgid "You can also install from source with::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:34
+#: ../../user/info/cli.rst:34
 msgid "Installing from source requires you have Python 3.6 or higher available."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:36
+#: ../../user/info/cli.rst:36
 msgid "You can check the installation was successful by running ``funkwhale --help``. This should output the list of available commands and the CLI description."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:40
+#: ../../user/info/cli.rst:40
 msgid "Basic usage"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:42
+#: ../../user/info/cli.rst:42
 msgid "Here are a couple of commands you can try to get started:"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:56
+#: ../../user/info/cli.rst:56
 msgid "Getting help"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:58
+#: ../../user/info/cli.rst:58
 msgid "The most basic way to get help is to run ``funkwhale --help``. It will list available commands, namespaces and arguments that are common to all commands."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:60
+#: ../../user/info/cli.rst:60
 msgid "You can also append the ``--help`` flag after any command to get more information about its arguments and options, like this: ``funkwhale albums ls --help``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:62
+#: ../../user/info/cli.rst:62
 msgid "The CLI offers nested commands. For instance, ``funkwhale albums`` isn't a valid command in itself, but a namespace for all albums-related commands."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:64
+#: ../../user/info/cli.rst:64
 msgid "To get the help of a specific namespace and list all its available commands, simply run ``funkwhale <namespace> --help``."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:67
+#: ../../user/info/cli.rst:67
 msgid "Authentication"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:69
+#: ../../user/info/cli.rst:69
 msgid "The CLI uses Oauth tokens to interact with the API."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:71
+#: ../../user/info/cli.rst:71
 msgid "To get started, you need to create an application for the CLI. To do this:"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:73
+#: ../../user/info/cli.rst:73
 msgid "Log in to your Funkwhale pod."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:74
+#: ../../user/info/cli.rst:74
 msgid "Select the cog icon (:fa:`cog`) or your avatar to expand the user menu."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:75
+#: ../../user/info/cli.rst:75
 msgid "Select :guilabel:`Settings`."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:76
+#: ../../user/info/cli.rst:76
 msgid "Scroll down to the :guilabel:`Your applications` section."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:77
+#: ../../user/info/cli.rst:77
 msgid "Select :guilabel:`Register a new application` to create a new application."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:78
+#: ../../user/info/cli.rst:78
 msgid "Give your application an appropriate name (e.g. \"Funkwhale CLI\")."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:79
+#: ../../user/info/cli.rst:79
 msgid "Give your application the permissions you require."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:80
+#: ../../user/info/cli.rst:80
 msgid "Select :guilabel:`Create application`. A screen appears showing :guilabel:`Application details`."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:81
+#: ../../user/info/cli.rst:81
 msgid "Copy the app's :guilabel:`Access token`."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:83
+#: ../../user/info/cli.rst:83
 msgid "Once you have your app's Access Token, you can either:"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:85
+#: ../../user/info/cli.rst:85
 msgid "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."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:86
+#: ../../user/info/cli.rst:86
 msgid "Explicitly pass a token to the command via the ``-t`` flag or the ``FUNKWHALE_TOKEN`` environment variable"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:88
+#: ../../user/info/cli.rst:88
 msgid "If you use ``funkwhale login``, you can delete the local token with ``funkwhale logout``."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:90
+#: ../../user/info/cli.rst:90
 msgid "You can check that you are fully authenticated by running ``funkwhale users me``. It will display information relating to your user profile."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:93
+#: ../../user/info/cli.rst:93
 msgid "Configuration"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:95
+#: ../../user/info/cli.rst:95
 msgid "To work, the CLI needs to be pointed to a Funkwhale server. This can be done in various ways:"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:97
+#: ../../user/info/cli.rst:97
 msgid "Via the ``-H https://funkwhale.domain`` flag when calling the CLI"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:98
+#: ../../user/info/cli.rst:98
 msgid "Via the ``FUNKWHALE_SERVER_URL`` environment variable"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:99
+#: ../../user/info/cli.rst:99
 msgid "Via an env file (see below)"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:102
+#: ../../user/info/cli.rst:102
 msgid "Env file"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:104
+#: ../../user/info/cli.rst:104
 msgid "The CLI will try to read configuration options from a ``.env`` file in the current directory. If this file is not present, it will read the configuration options from ``~/.config/funkwhale/env`` on Linux or ``~/Library/Application Support/funkwhale/env`` on macOS."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:106
+#: ../../user/info/cli.rst:106
 msgid "You can also give it a path to another env file via the ``-e /path/to/.envfile`` flag or the ``ENV_FILE`` environment variable."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:108
+#: ../../user/info/cli.rst:108
 msgid "An env file simply contains a list of variables, using the same syntax as environment variables (comments starting with # are allowed). Example::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:115
+#: ../../user/info/cli.rst:115
 msgid "List of configuration options"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:118
+#: ../../user/info/cli.rst:118
 msgid "CLI Flag"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:118
+#: ../../user/info/cli.rst:118
 msgid "Environment variable"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:118
+#: ../../user/info/cli.rst:118
 msgid "Example value"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:118
+#: ../../user/info/cli.rst:118
 msgid "Description"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:120
+#: ../../user/info/cli.rst:120
 msgid "``-e``, ``--env-file``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:120
+#: ../../user/info/cli.rst:120
 msgid "``ENV_FILE``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:120
+#: ../../user/info/cli.rst:120
 msgid "``~/Music/.env``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:120
+#: ../../user/info/cli.rst:120
 msgid "Path to a local env file to use for configuration"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:122
+#: ../../user/info/cli.rst:122
 msgid "``-H``, ``--url``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:122
+#: ../../user/info/cli.rst:122
 msgid "``FUNKWHALE_SERVER_URL``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:122
+#: ../../user/info/cli.rst:122
 msgid "``https://demo.funkwhale.audio``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:122
+#: ../../user/info/cli.rst:122
 msgid "The URL of the Funkwhale server the CLI should contact"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:124
+#: ../../user/info/cli.rst:124
 msgid "``-t``, ``--token``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:124
+#: ../../user/info/cli.rst:124
 msgid "``FUNKWHALE_TOKEN``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:124
+#: ../../user/info/cli.rst:124
 msgid "``eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:124
+#: ../../user/info/cli.rst:124
 msgid "A JWT token to use for authentication"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:126
+#: ../../user/info/cli.rst:126
 msgid "``--no-login``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:126
+#: ../../user/info/cli.rst:126
 msgid "``FUNKWHALE_NO_LOGIN``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:126
-#: ../../user_documentation/info/cli.rst:131
+#: ../../user/info/cli.rst:126
+#: ../../user/info/cli.rst:131
 msgid "``true``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:126
+#: ../../user/info/cli.rst:126
 msgid "Completely disable authentication and keyring"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:128
+#: ../../user/info/cli.rst:128
 msgid "``-v``, ``--verbosity``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:128
+#: ../../user/info/cli.rst:128
 msgid "One of ``CRITICAL``, ``ERROR``, ``WARNING``, ``INFO`` or ``DEBUG``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:128
+#: ../../user/info/cli.rst:128
 msgid "Control the verbosity (default is INFO)"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:131
+#: ../../user/info/cli.rst:131
 msgid "``-q``, ``--quiet``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:131
+#: ../../user/info/cli.rst:131
 msgid "``FUNKWHALE_QUIET``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:131
+#: ../../user/info/cli.rst:131
 msgid "Completely disable logging"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:135
+#: ../../user/info/cli.rst:135
 msgid "Read commands"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:137
+#: ../../user/info/cli.rst:137
 msgid "All commands that list results - such as ``funkwhale albums ls`` or ``funkwhale tracks ls`` - share similar behaviors and sets of arguments."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:140
+#: ../../user/info/cli.rst:140
 msgid "Filtering"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:142
+#: ../../user/info/cli.rst:142
 msgid "Results can be filtered using the ``-f`` or ``--filter`` flag. Provided values are transmitted directly in the querystring when the requests to the API is made::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:147
+#: ../../user/info/cli.rst:147
 msgid "The flag can be provided multiple times, to add multiple filter conditions::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:154
+#: ../../user/info/cli.rst:154
 msgid "The list of supported fields for filtering depends on the resource being queried, and can be found in our `API documentation`_."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:158
+#: ../../user/info/cli.rst:158
 msgid "Searching"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:160
+#: ../../user/info/cli.rst:160
 msgid "Any text provided after the ``ls`` command will be considered a search query and transmitted to the API::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:167
+#: ../../user/info/cli.rst:167
 msgid "This is technically equivalent to filtering with a ``q`` parameter as described above::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:173
+#: ../../user/info/cli.rst:173
 msgid "Ordering"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:175
+#: ../../user/info/cli.rst:175
 msgid "You can control the ordering of the results with the `-o` or ``--ordering`` flag::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:182
+#: ../../user/info/cli.rst:182
 msgid "Ordering in descending order is supported by prefixing the field name with ``-``, e.g: ``-o -creation_date``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:186
+#: ../../user/info/cli.rst:186
 msgid "The list of supported fields for ordering depends on the resource being queried, and can be found in our `API documentation`_."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:190
+#: ../../user/info/cli.rst:190
 msgid "Pagination"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:192
+#: ../../user/info/cli.rst:192
 msgid "You can retrieve a specific result page using the ``-p`` or ``--page`` flag::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:197
+#: ../../user/info/cli.rst:197
 msgid "You can also alter the size of the pages using the ``-s`` or ``--page-size`` flag::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:202
+#: ../../user/info/cli.rst:202
 msgid "Sometimes, you may want to retrieve multiple pages of results at once. This is supported using the ``-l`` or ``--limit`` flag::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:207
+#: ../../user/info/cli.rst:207
 msgid "You can, of course, combine these flags::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:213
+#: ../../user/info/cli.rst:213
 msgid "Output"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:215
+#: ../../user/info/cli.rst:215
 msgid "While the default output displays a human-readable table, you can customize it."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:217
+#: ../../user/info/cli.rst:217
 msgid "The ``--raw`` flag will simply output the raw JSON payload returned by the API server::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:221
+#: ../../user/info/cli.rst:221
 msgid "The ``-h`` or ``--no-headers`` flag simply removes the table column headers."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:223
+#: ../../user/info/cli.rst:223
 msgid "The ``-t`` or ``--format`` flag alters the rendering of result, depending on the provided value::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:230
+#: ../../user/info/cli.rst:230
 msgid "Available formats are: ``fancy_grid``, ``github``, ``grid``, ``html``, ``jira``, ``latex``, ``latex_booktabs``, ``latex_raw``, ``mediawiki``, ``moinmoin``, ``orgtbl``, ``pipe``, ``plain``, ``presto``, ``psql``, ``rst``, ``simple``, ``textile``, ``tsv``, ``youtrack``"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:232
+#: ../../user/info/cli.rst:232
 msgid "The ``-c`` or ``--column`` flag gives you control on the displayed columns::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:237
+#: ../../user/info/cli.rst:237
 msgid "For a given resource, the list of available columns can be found by running ``funkwhale <resource> ls --help``."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:239
+#: ../../user/info/cli.rst:239
 msgid "The ``-i`` or ``--ids`` flag displays only the IDs of results, one per line::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:243
+#: ../../user/info/cli.rst:243
 msgid "This is especially useful in conjunction with other commands (like deletion commands) and piping. Note that this is also technically equivalent to applying the ``--no-headers``, ``--format plain`` and ``--column ID`` flags."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:247
+#: ../../user/info/cli.rst:247
 msgid "Write commands"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:250
+#: ../../user/info/cli.rst:250
 msgid "Deleting objects"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:252
+#: ../../user/info/cli.rst:252
 msgid "Some resources support deletion, via commands such as ``funkwhale libraries rm`` or ``funkwhale playlists rm``, followed by one or more IDs::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:257
+#: ../../user/info/cli.rst:257
 msgid "By default, the ``rm`` command will ask for confirmation, but you can disable this behavior by providing the ``--no-input`` flag."
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:263
+#: ../../user/info/cli.rst:263
 msgid "Examples"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:266
+#: ../../user/info/cli.rst:266
 msgid "Uploading local files"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:268
+#: ../../user/info/cli.rst:268
 msgid "**Goal**: create a library and upload all MP3 files from ``~/Music`` to it"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:270
-#: ../../user_documentation/info/cli.rst:282
-#: ../../user_documentation/info/cli.rst:298
-#: ../../user_documentation/info/cli.rst:315
+#: ../../user/info/cli.rst:270
+#: ../../user/info/cli.rst:282
+#: ../../user/info/cli.rst:298
+#: ../../user/info/cli.rst:315
 msgid "**Commands**::"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:278
+#: ../../user/info/cli.rst:278
 msgid "Favorite an entire album"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:280
+#: ../../user/info/cli.rst:280
 msgid "**Goal**: retrieve all the tracks from an album and add these to your favorites"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:294
+#: ../../user/info/cli.rst:294
 msgid "Mirror an artist discography locally"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:296
+#: ../../user/info/cli.rst:296
 msgid "**Goal**: Download the discography of an artist locally, in the ``~/Music`` directory, in an ``Artist/Album/Track`` folder hierarchy"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:311
+#: ../../user/info/cli.rst:311
 msgid "Open a remote album in VLC"
 msgstr ""
 
-#: ../../user_documentation/info/cli.rst:313
+#: ../../user/info/cli.rst:313
 msgid "**Goal**: Variation of the previous example, but instead of downloading an artist discography, we listen to an album in VLC"
 msgstr ""
diff --git a/docs/locales/gettext/user/libraries/content/delete.pot b/docs/locales/gettext/user/libraries/content/delete.pot
index 9cb5c4d48..3b6610fbb 100644
--- a/docs/locales/gettext/user/libraries/content/delete.pot
+++ b/docs/locales/gettext/user/libraries/content/delete.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,84 +16,84 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/libraries/delete_content.md:1
+#: ../../user/libraries/content/delete.md:1
 msgid "Delete content from a library"
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_content.md:4
+#: ../../user/libraries/content/delete.md:4
 msgid "When you delete content from a library you delete the audio files from your {term}`pod`. Make sure you have a backup of any files you want to keep."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_content.md:7
+#: ../../user/libraries/content/delete.md:7
 msgid "You can delete content from a library at any time. To do this:"
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_content.md:0
+#: ../../user/libraries/content/delete.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_content.md:15
-#: ../../user_documentation/libraries/delete_content.md:32
+#: ../../user/libraries/content/delete.md:15
+#: ../../user/libraries/content/delete.md:32
 msgid "Log in to your pod."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_content.md:16
+#: ../../user/libraries/content/delete.md:16
 msgid "Select the upload icon ({fa}`upload`) in the top of the sidebar."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_content.md:17
-#: ../../user_documentation/libraries/delete_content.md:34
+#: ../../user/libraries/content/delete.md:17
+#: ../../user/libraries/content/delete.md:34
 msgid "Select {guilabel}`Get started` under {guilabel}`Upload third-party content in a library`."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_content.md:18
-#: ../../user_documentation/libraries/delete_content.md:35
+#: ../../user/libraries/content/delete.md:18
+#: ../../user/libraries/content/delete.md:35
 msgid "A screen appears showing your upload quota and your libraries."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_content.md:19
-#: ../../user_documentation/libraries/delete_content.md:36
+#: ../../user/libraries/content/delete.md:19
+#: ../../user/libraries/content/delete.md:36
 msgid "Select {guilabel}`Library Details` under the library you want to edit."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_content.md:20
-#: ../../user_documentation/libraries/delete_content.md:37
+#: ../../user/libraries/content/delete.md:20
+#: ../../user/libraries/content/delete.md:37
 msgid "Select the {guilabel}`✎ Edit` button at the top of the screen."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_content.md:21
-#: ../../user_documentation/libraries/delete_content.md:38
+#: ../../user/libraries/content/delete.md:21
+#: ../../user/libraries/content/delete.md:38
 msgid "Scroll down to the {guilabel}`Library contents` section. A list of tracks is shown."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_content.md:22
-#: ../../user_documentation/libraries/delete_content.md:39
+#: ../../user/libraries/content/delete.md:22
+#: ../../user/libraries/content/delete.md:39
 msgid "Select the checkbox ({fa}`square`) next to the tracks you want to delete. Selected tracks show a tick ({fa}`check-square`)."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_content.md:23
-#: ../../user_documentation/libraries/delete_content.md:40
+#: ../../user/libraries/content/delete.md:23
+#: ../../user/libraries/content/delete.md:40
 msgid "Select {menuselection}`Actions --> Delete`."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_content.md:24
-#: ../../user_documentation/libraries/delete_content.md:41
+#: ../../user/libraries/content/delete.md:24
+#: ../../user/libraries/content/delete.md:41
 msgid "Select {guilabel}`Go`."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_content.md:25
-#: ../../user_documentation/libraries/delete_content.md:42
+#: ../../user/libraries/content/delete.md:25
+#: ../../user/libraries/content/delete.md:42
 msgid "Select {guilabel}`Launch` on the warning message that appears."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_content.md:0
+#: ../../user/libraries/content/delete.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_content.md:33
+#: ../../user/libraries/content/delete.md:33
 msgid "Select the upload icon ({fa}`upload`) at the top of the screen."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_content.md:46
+#: ../../user/libraries/content/delete.md:46
 msgid "That's it! You've successfully deleted the content from your library."
 msgstr ""
diff --git a/docs/locales/gettext/user/libraries/content/edit.pot b/docs/locales/gettext/user/libraries/content/edit.pot
index 8ac3aec81..6f5cddb26 100644
--- a/docs/locales/gettext/user/libraries/content/edit.pot
+++ b/docs/locales/gettext/user/libraries/content/edit.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,240 +16,240 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/libraries/edit_content.md:1
+#: ../../user/libraries/content/edit.md:1
 msgid "Edit library content"
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:4
+#: ../../user/libraries/content/edit.md:4
 msgid "You can only edit content in libraries you own. {term}`Pod` admins can edit all content."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:7
-msgid "You can edit library content after you have uploaded it. This is helpful if the content isn't [tagged](./tag_music.md)."
+#: ../../user/libraries/content/edit.md:7
+msgid "You can edit library content after you have uploaded it. This is helpful if the content isn't [tagged](tag.md)."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:13
+#: ../../user/libraries/content/edit.md:13
 msgid "Edit artist"
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:15
+#: ../../user/libraries/content/edit.md:15
 msgid "To edit an artist:"
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:0
+#: ../../user/libraries/content/edit.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:23
+#: ../../user/libraries/content/edit.md:23
 msgid "Search for the artist in the sidebar or go to the {guilabel}`Artists` page in {guilabel}`My Library` and search there."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:24
-#: ../../user_documentation/libraries/edit_content.md:42
+#: ../../user/libraries/content/edit.md:24
+#: ../../user/libraries/content/edit.md:42
 msgid "Select the artist you want to edit. The artist details page opens."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:25
-#: ../../user_documentation/libraries/edit_content.md:43
+#: ../../user/libraries/content/edit.md:25
+#: ../../user/libraries/content/edit.md:43
 msgid "Select the {guilabel}`More…` button. The artist options menu opens."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:26
-#: ../../user_documentation/libraries/edit_content.md:44
+#: ../../user/libraries/content/edit.md:26
+#: ../../user/libraries/content/edit.md:44
 msgid "Select {guilabel}`✎ Edit`. The {guilabel}`Edit this artist` screen opens."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:27
-#: ../../user_documentation/libraries/edit_content.md:45
-#: ../../user_documentation/libraries/edit_content.md:71
-#: ../../user_documentation/libraries/edit_content.md:90
-#: ../../user_documentation/libraries/edit_content.md:117
-#: ../../user_documentation/libraries/edit_content.md:138
+#: ../../user/libraries/content/edit.md:27
+#: ../../user/libraries/content/edit.md:45
+#: ../../user/libraries/content/edit.md:71
+#: ../../user/libraries/content/edit.md:90
+#: ../../user/libraries/content/edit.md:117
+#: ../../user/libraries/content/edit.md:138
 msgid "Change the details in any of these fields:"
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:28
-#: ../../user_documentation/libraries/edit_content.md:46
+#: ../../user/libraries/content/edit.md:28
+#: ../../user/libraries/content/edit.md:46
 msgid "{guilabel}`Name` – the name of the artist."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:29
-#: ../../user_documentation/libraries/edit_content.md:47
+#: ../../user/libraries/content/edit.md:29
+#: ../../user/libraries/content/edit.md:47
 msgid "{guilabel}`Description` – a description of the artist. This appears on the artist details page."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:30
-#: ../../user_documentation/libraries/edit_content.md:48
+#: ../../user/libraries/content/edit.md:30
+#: ../../user/libraries/content/edit.md:48
 msgid "{guilabel}`Cover` – the cover image for the artist. This appears on the artist details page."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:31
-#: ../../user_documentation/libraries/edit_content.md:49
+#: ../../user/libraries/content/edit.md:31
+#: ../../user/libraries/content/edit.md:49
 msgid "{guilabel}`Tags` – the genre(s) the artist fits in."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:32
-#: ../../user_documentation/libraries/edit_content.md:50
-#: ../../user_documentation/libraries/edit_content.md:77
-#: ../../user_documentation/libraries/edit_content.md:96
-#: ../../user_documentation/libraries/edit_content.md:125
-#: ../../user_documentation/libraries/edit_content.md:146
+#: ../../user/libraries/content/edit.md:32
+#: ../../user/libraries/content/edit.md:50
+#: ../../user/libraries/content/edit.md:77
+#: ../../user/libraries/content/edit.md:96
+#: ../../user/libraries/content/edit.md:125
+#: ../../user/libraries/content/edit.md:146
 msgid "**Optional** – enter a {guilabel}`Summary` of your edits."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:33
-#: ../../user_documentation/libraries/edit_content.md:51
-#: ../../user_documentation/libraries/edit_content.md:78
-#: ../../user_documentation/libraries/edit_content.md:97
-#: ../../user_documentation/libraries/edit_content.md:126
-#: ../../user_documentation/libraries/edit_content.md:147
+#: ../../user/libraries/content/edit.md:33
+#: ../../user/libraries/content/edit.md:51
+#: ../../user/libraries/content/edit.md:78
+#: ../../user/libraries/content/edit.md:97
+#: ../../user/libraries/content/edit.md:126
+#: ../../user/libraries/content/edit.md:147
 msgid "Select {guilabel}`Submit and apply edit` to save your changes."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:0
+#: ../../user/libraries/content/edit.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:40
-#: ../../user_documentation/libraries/edit_content.md:85
-#: ../../user_documentation/libraries/edit_content.md:133
+#: ../../user/libraries/content/edit.md:40
+#: ../../user/libraries/content/edit.md:85
+#: ../../user/libraries/content/edit.md:133
 msgid "Select the hamburger menu ({fa}`bars`) to open the menu bar."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:41
+#: ../../user/libraries/content/edit.md:41
 msgid "Use the search bar to search for your artist. You can also select {menuselection}`My Library --> Artists` to open the artist search page."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:55
+#: ../../user/libraries/content/edit.md:55
 msgid "That's it! You've edited the artist's details. You can see these details by visiting the artist page."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:57
+#: ../../user/libraries/content/edit.md:57
 msgid "Edit album"
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:59
+#: ../../user/libraries/content/edit.md:59
 msgid "To edit an album:"
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:67
+#: ../../user/libraries/content/edit.md:67
 msgid "Search for the album in the sidebar or go to the {guilabel}`Albums` page in {guilabel}`My Library` and search there."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:68
-#: ../../user_documentation/libraries/edit_content.md:87
+#: ../../user/libraries/content/edit.md:68
+#: ../../user/libraries/content/edit.md:87
 msgid "Select the album you want to edit. The album details page opens."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:69
-#: ../../user_documentation/libraries/edit_content.md:88
+#: ../../user/libraries/content/edit.md:69
+#: ../../user/libraries/content/edit.md:88
 msgid "Select the kebab menu ({fa}`ellipsis-v`) to show the album options."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:70
-#: ../../user_documentation/libraries/edit_content.md:89
+#: ../../user/libraries/content/edit.md:70
+#: ../../user/libraries/content/edit.md:89
 msgid "Select {guilabel}`✎ Edit`. The {guilabel}`Edit this album` screen opens."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:72
-#: ../../user_documentation/libraries/edit_content.md:91
+#: ../../user/libraries/content/edit.md:72
+#: ../../user/libraries/content/edit.md:91
 msgid "{guilabel}`Title` – the title of the album."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:73
-#: ../../user_documentation/libraries/edit_content.md:92
+#: ../../user/libraries/content/edit.md:73
+#: ../../user/libraries/content/edit.md:92
 msgid "{guilabel}`Description` – a description of the album. This appears on the album details page."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:74
-#: ../../user_documentation/libraries/edit_content.md:93
+#: ../../user/libraries/content/edit.md:74
+#: ../../user/libraries/content/edit.md:93
 msgid "{guilabel}`Release date` – the release date of the album."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:75
-#: ../../user_documentation/libraries/edit_content.md:94
+#: ../../user/libraries/content/edit.md:75
+#: ../../user/libraries/content/edit.md:94
 msgid "{guilabel}`Cover` – the album cover art."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:76
-#: ../../user_documentation/libraries/edit_content.md:95
+#: ../../user/libraries/content/edit.md:76
+#: ../../user/libraries/content/edit.md:95
 msgid "{guilabel}`Tags` – the genre(s) associated with the album."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:86
+#: ../../user/libraries/content/edit.md:86
 msgid "Use the search bar to search for your album. You can also select {menuselection}`My Library --> Albums` to open the album search page."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:101
+#: ../../user/libraries/content/edit.md:101
 msgid "That's it! You've edited the album's details. You can see these details by visiting the album page."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:103
+#: ../../user/libraries/content/edit.md:103
 msgid "Edit track"
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:105
+#: ../../user/libraries/content/edit.md:105
 msgid "To edit a track:"
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:113
+#: ../../user/libraries/content/edit.md:113
 msgid "Search for the track in the sidebar."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:114
-#: ../../user_documentation/libraries/edit_content.md:135
+#: ../../user/libraries/content/edit.md:114
+#: ../../user/libraries/content/edit.md:135
 msgid "Select the track you want to edit. The track details page opens."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:115
-#: ../../user_documentation/libraries/edit_content.md:136
+#: ../../user/libraries/content/edit.md:115
+#: ../../user/libraries/content/edit.md:136
 msgid "Select the kebab menu ({fa}`ellipsis-v`) to show the track options."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:116
-#: ../../user_documentation/libraries/edit_content.md:137
+#: ../../user/libraries/content/edit.md:116
+#: ../../user/libraries/content/edit.md:137
 msgid "Select {guilabel}`✎ Edit`. The {guilabel}`Edit this track` screen opens."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:118
-#: ../../user_documentation/libraries/edit_content.md:139
+#: ../../user/libraries/content/edit.md:118
+#: ../../user/libraries/content/edit.md:139
 msgid "{guilabel}`Title` – the title of the track."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:119
-#: ../../user_documentation/libraries/edit_content.md:140
+#: ../../user/libraries/content/edit.md:119
+#: ../../user/libraries/content/edit.md:140
 msgid "{guilabel}`Description` – a description of the track. This appears on the track details page."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:120
-#: ../../user_documentation/libraries/edit_content.md:141
+#: ../../user/libraries/content/edit.md:120
+#: ../../user/libraries/content/edit.md:141
 msgid "{guilabel}`Cover` – the track cover art. This appears on the track details page."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:121
-#: ../../user_documentation/libraries/edit_content.md:142
+#: ../../user/libraries/content/edit.md:121
+#: ../../user/libraries/content/edit.md:142
 msgid "{guilabel}`Position` – the position of the track in its album."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:122
-#: ../../user_documentation/libraries/edit_content.md:143
+#: ../../user/libraries/content/edit.md:122
+#: ../../user/libraries/content/edit.md:143
 msgid "{guilabel}`Copyright` – the name of the copyright holder."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:123
-#: ../../user_documentation/libraries/edit_content.md:144
+#: ../../user/libraries/content/edit.md:123
+#: ../../user/libraries/content/edit.md:144
 msgid "{guilabel}`License` – the license of the track. Funkwhale supports [Creative Commons](https://creativecommons.org) licenses. Leave this blank if you aren't sure."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:124
-#: ../../user_documentation/libraries/edit_content.md:145
+#: ../../user/libraries/content/edit.md:124
+#: ../../user/libraries/content/edit.md:145
 msgid "{guilabel}`Tags` – the genre(s) associated with the track."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:134
+#: ../../user/libraries/content/edit.md:134
 msgid "Use the search bar to search for your track."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_content.md:151
+#: ../../user/libraries/content/edit.md:151
 msgid "That's it! You've edited the track's details. You can see these details by visiting the track details page."
 msgstr ""
diff --git a/docs/locales/gettext/user/libraries/content/tag.pot b/docs/locales/gettext/user/libraries/content/tag.pot
index ecd09a560..2f7095b76 100644
--- a/docs/locales/gettext/user/libraries/content/tag.pot
+++ b/docs/locales/gettext/user/libraries/content/tag.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,294 +16,294 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/libraries/tag_music.md:1
+#: ../../user/libraries/content/tag.md:1
 msgid "Tag your content with Picard"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:3
+#: ../../user/libraries/content/tag.md:3
 msgid "Funkwhale relies on [ID3 tags](https://id3.org/) to sort audio content. ID3 tags tell Funkwhale information about your files. Funkwhale uses this information to display your content in your {term}`pod`."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:5
+#: ../../user/libraries/content/tag.md:5
 msgid "We recommend using [MusicBrainz Picard](https://picard.musicbrainz.org/) to tag your content. MusicBrainz Picard is free and open source software that connects to [MusicBrainz](https://musicbrainz.org). Funkwhale uses MusicBrainz as its primary data source."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:7
+#: ../../user/libraries/content/tag.md:7
 msgid "This guide shows you how to tag your content with MusicBrainz Picard."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:0
+#: ../../user/libraries/content/tag.md:0
 msgid "Supported tags"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:21
+#: ../../user/libraries/content/tag.md:21
 msgid "Name"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:22
+#: ../../user/libraries/content/tag.md:22
 msgid "Description"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:23
+#: ../../user/libraries/content/tag.md:23
 msgid "Example value"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:24
+#: ../../user/libraries/content/tag.md:24
 msgid "`Title`*"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:25
+#: ../../user/libraries/content/tag.md:25
 msgid "The track title."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:26
+#: ../../user/libraries/content/tag.md:26
 msgid "`Letting you`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:27
+#: ../../user/libraries/content/tag.md:27
 msgid "`Artist`*"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:28
+#: ../../user/libraries/content/tag.md:28
 msgid "The artist name."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:29
+#: ../../user/libraries/content/tag.md:29
 msgid "`Nine Inch Nails`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:30
+#: ../../user/libraries/content/tag.md:30
 msgid "`Album`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:31
+#: ../../user/libraries/content/tag.md:31
 msgid "The album title. If none is provided, an `[Unknown Album]` entry is created."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:32
+#: ../../user/libraries/content/tag.md:32
 msgid "`The Slip`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:33
+#: ../../user/libraries/content/tag.md:33
 msgid "`Album artist`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:34
+#: ../../user/libraries/content/tag.md:34
 msgid "The album artist name (can be different than the track artist)."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:35
+#: ../../user/libraries/content/tag.md:35
 msgid "`Trent Reznor`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:36
+#: ../../user/libraries/content/tag.md:36
 msgid "`Genre`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:37
+#: ../../user/libraries/content/tag.md:37
 msgid "A comma separated list of tags to associate with the track. Other supported separators: `;` and `/`."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:39
+#: ../../user/libraries/content/tag.md:39
 msgid "`Industrial, Metal`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:40
+#: ../../user/libraries/content/tag.md:40
 msgid "`Track number`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:41
+#: ../../user/libraries/content/tag.md:41
 msgid "The position of the track in the album/release."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:42
+#: ../../user/libraries/content/tag.md:42
 msgid "`4`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:43
+#: ../../user/libraries/content/tag.md:43
 msgid "`Disc number`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:44
+#: ../../user/libraries/content/tag.md:44
 msgid "The disc number (in case of multi-disc albums)."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:45
+#: ../../user/libraries/content/tag.md:45
 msgid "`1`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:46
+#: ../../user/libraries/content/tag.md:46
 msgid "`Date`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:47
+#: ../../user/libraries/content/tag.md:47
 msgid "The release date of the track or album."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:48
+#: ../../user/libraries/content/tag.md:48
 msgid "`2019`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:49
+#: ../../user/libraries/content/tag.md:49
 msgid "`License`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:50
+#: ../../user/libraries/content/tag.md:50
 msgid "The license associated with this work. The first URL found is checked against our list of supported licenses."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:52
-#: ../../user_documentation/libraries/tag_music.md:56
+#: ../../user/libraries/content/tag.md:52
+#: ../../user/libraries/content/tag.md:56
 msgid "`CC-BY 3.0: http://creativecommons.org/licenses/cc-by/3.0/`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:53
+#: ../../user/libraries/content/tag.md:53
 msgid "`Copyright`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:54
+#: ../../user/libraries/content/tag.md:54
 msgid "The license associated with this work. The first URL found is checked against our list of supported licenses. Used if no license found in the `License` tag."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:57
+#: ../../user/libraries/content/tag.md:57
 msgid "`Pictures`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:58
+#: ../../user/libraries/content/tag.md:58
 msgid "The first embedded picture found is used as the album cover."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:60
+#: ../../user/libraries/content/tag.md:60
 msgid "`MusicBrainz Recording ID`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:61
+#: ../../user/libraries/content/tag.md:61
 msgid "The MusicBrainz ID for the recording."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:62
+#: ../../user/libraries/content/tag.md:62
 msgid "`99244237-850b-4a93-904d-57305bcadb4e`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:63
+#: ../../user/libraries/content/tag.md:63
 msgid "`MusicBrainz Album ID`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:64
+#: ../../user/libraries/content/tag.md:64
 msgid "The MusicBrainz ID for the album."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:65
+#: ../../user/libraries/content/tag.md:65
 msgid "`bca982fd-ab73-3c9f-ad07-9104a4f53a32`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:66
+#: ../../user/libraries/content/tag.md:66
 msgid "`MusicBrainz Artist ID`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:67
+#: ../../user/libraries/content/tag.md:67
 msgid "The MusicBrainz ID for the artist."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:68
-#: ../../user_documentation/libraries/tag_music.md:71
+#: ../../user/libraries/content/tag.md:68
+#: ../../user/libraries/content/tag.md:71
 msgid "`b7ffd2af-418f-4be2-bdd1-22f8b48613da`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:69
+#: ../../user/libraries/content/tag.md:69
 msgid "`MusicBrainz Album Artist ID`"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:70
+#: ../../user/libraries/content/tag.md:70
 msgid "The MusicBrainz ID for the album artist."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:75
+#: ../../user/libraries/content/tag.md:75
 msgid "Tag content"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:77
+#: ../../user/libraries/content/tag.md:77
 msgid "To tag content using MusicBrainz Picard:"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:79
+#: ../../user/libraries/content/tag.md:79
 msgid "Select {guilabel}`Add Files` to add individual files or {guilabel}`Add Folder` to add a directory of files."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:80
+#: ../../user/libraries/content/tag.md:80
 msgid "Select the files or directory you want to tag."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:81
+#: ../../user/libraries/content/tag.md:81
 msgid "Picard shows the files in the left panel. Picard moves files to the right panel as it tags them. If Picard doesn't tag a file automatically, select {guilabel}`Scan`."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:82
+#: ../../user/libraries/content/tag.md:82
 msgid "Check a file's tags by highlighting it and looking at the details in the bottom panel. If Picard has applied the wrong tags, look for [alternative versions](#alternative-versions)."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:83
-#: ../../user_documentation/libraries/tag_music.md:97
-#: ../../user_documentation/libraries/tag_music.md:106
+#: ../../user/libraries/content/tag.md:83
+#: ../../user/libraries/content/tag.md:97
+#: ../../user/libraries/content/tag.md:106
 msgid "Select {guilabel}`Save` or hit {kbd}`ctrl+s` ({kbd}`cmd+s` on macOS) to save the tags to the files."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:85
-msgid "That's it! You've added ID3 tags to your files. You can now [add these to a library](upload_content.md)"
+#: ../../user/libraries/content/tag.md:85
+msgid "That's it! You've added ID3 tags to your files. You can now [add these to a library](upload.md)"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:87
+#: ../../user/libraries/content/tag.md:87
 msgid "Alternative versions"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:89
+#: ../../user/libraries/content/tag.md:89
 msgid "Picard will choose tags based on details included in your file. Sometimes it chooses a different version of a release than the one you want. You can choose an alternative version of your content to get the right tags."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:91
+#: ../../user/libraries/content/tag.md:91
 msgid "Alternative albums"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:93
+#: ../../user/libraries/content/tag.md:93
 msgid "If Picard has selected a different version of the album you are tagging:"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:95
+#: ../../user/libraries/content/tag.md:95
 msgid "Right-click on the album and hover your mouse over {guilabel}`Other versions`. A dropdown list of alternative versions appears."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:96
+#: ../../user/libraries/content/tag.md:96
 msgid "Select the correct release from the list."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:99
+#: ../../user/libraries/content/tag.md:99
 msgid "Alternative tracks"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:101
+#: ../../user/libraries/content/tag.md:101
 msgid "If Picard can't find a release for a track:"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:103
+#: ../../user/libraries/content/tag.md:103
 msgid "Right-click on the track and select {guilabel}`Search for Similar Tracks…`. A search screen appears."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:104
+#: ../../user/libraries/content/tag.md:104
 msgid "Search for your track. Use [MusicBrainz's search syntax](https://musicbrainz.org/doc/Indexed_Search_Syntax) for the best results."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:105
+#: ../../user/libraries/content/tag.md:105
 msgid "Select the correct track and click on {guilabel}`Load into Picard`."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:108
+#: ../../user/libraries/content/tag.md:108
 msgid "Add items to MusicBrainz"
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:110
+#: ../../user/libraries/content/tag.md:110
 msgid "If Picard can't find your content, you can add it to MusicBrainz yourself. To get started, check out [MusicBrainz's guide](https://musicbrainz.org/doc/How_to_Add_a_Release/)."
 msgstr ""
 
-#: ../../user_documentation/libraries/tag_music.md:112
+#: ../../user/libraries/content/tag.md:112
 msgid "Once you have added the content to MusicBrainz, Picard can tag your files."
 msgstr ""
diff --git a/docs/locales/gettext/user/libraries/content/upload.pot b/docs/locales/gettext/user/libraries/content/upload.pot
index 2fca75974..b157983c8 100644
--- a/docs/locales/gettext/user/libraries/content/upload.pot
+++ b/docs/locales/gettext/user/libraries/content/upload.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,71 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/libraries/upload_content.md:1
+#: ../../user/libraries/content/upload.md:1
 msgid "Upload content to a library"
 msgstr ""
 
-#: ../../user_documentation/libraries/upload_content.md:4
+#: ../../user/libraries/content/upload.md:4
 msgid "Access to a library's content is set at a __library level__. You can't change the privacy level of content within the library."
 msgstr ""
 
-#: ../../user_documentation/libraries/upload_content.md:7
-msgid "Once you have [created a library](create_library.md), you can start uploading content to it. Funkwhale reads information about your content from its metadata. For the best results, make sure to [tag your files well](tag_music.md)."
+#: ../../user/libraries/content/upload.md:7
+msgid "Once you have [created a library](../create.md), you can start uploading content to it. Funkwhale reads information about your content from its metadata. For the best results, make sure to [tag your files well](tag.md)."
 msgstr ""
 
-#: ../../user_documentation/libraries/upload_content.md:9
+#: ../../user/libraries/content/upload.md:9
 msgid "To upload content to a library:"
 msgstr ""
 
-#: ../../user_documentation/libraries/upload_content.md:0
+#: ../../user/libraries/content/upload.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/libraries/upload_content.md:17
-#: ../../user_documentation/libraries/upload_content.md:31
+#: ../../user/libraries/content/upload.md:17
+#: ../../user/libraries/content/upload.md:31
 msgid "Log in to your pod."
 msgstr ""
 
-#: ../../user_documentation/libraries/upload_content.md:18
+#: ../../user/libraries/content/upload.md:18
 msgid "Select the upload icon ({fa}`upload`) in the top of the sidebar."
 msgstr ""
 
-#: ../../user_documentation/libraries/upload_content.md:19
-#: ../../user_documentation/libraries/upload_content.md:33
+#: ../../user/libraries/content/upload.md:19
+#: ../../user/libraries/content/upload.md:33
 msgid "Select {guilabel}`Get started` under {guilabel}`Upload third-party content in a library`."
 msgstr ""
 
-#: ../../user_documentation/libraries/upload_content.md:20
-#: ../../user_documentation/libraries/upload_content.md:34
+#: ../../user/libraries/content/upload.md:20
+#: ../../user/libraries/content/upload.md:34
 msgid "A screen appears showing your upload quota and your libraries."
 msgstr ""
 
-#: ../../user_documentation/libraries/upload_content.md:21
-#: ../../user_documentation/libraries/upload_content.md:35
+#: ../../user/libraries/content/upload.md:21
+#: ../../user/libraries/content/upload.md:35
 msgid "Select {guilabel}`Upload` under the library you want to add content to."
 msgstr ""
 
-#: ../../user_documentation/libraries/upload_content.md:22
+#: ../../user/libraries/content/upload.md:22
 msgid "Click on the section marked {guilabel}`Click to select files` to open a file picker, or drag and drop your files on to it."
 msgstr ""
 
-#: ../../user_documentation/libraries/upload_content.md:23
+#: ../../user/libraries/content/upload.md:23
 msgid "If you opened the file picker, select the files you want to upload and confirm."
 msgstr ""
 
-#: ../../user_documentation/libraries/upload_content.md:24
-#: ../../user_documentation/libraries/upload_content.md:37
+#: ../../user/libraries/content/upload.md:24
+#: ../../user/libraries/content/upload.md:37
 msgid "The screen shows you the status of each upload. Once the upload queue is empty, your upload is complete."
 msgstr ""
 
-#: ../../user_documentation/libraries/upload_content.md:32
+#: ../../user/libraries/content/upload.md:32
 msgid "Select the upload icon ({fa}`upload`) at the top of the screen."
 msgstr ""
 
-#: ../../user_documentation/libraries/upload_content.md:36
+#: ../../user/libraries/content/upload.md:36
 msgid "Click on the section marked {guilabel}`Click to select files` to open a file picker Select the files you want to upload and confirm."
 msgstr ""
 
-#: ../../user_documentation/libraries/upload_content.md:41
+#: ../../user/libraries/content/upload.md:41
 msgid "Congratulations! You added some content to your library. You can now listen to your tracks on your {term}`Funkwhale pod <Pod>`."
 msgstr ""
diff --git a/docs/locales/gettext/user/libraries/create.pot b/docs/locales/gettext/user/libraries/create.pot
index c18f82027..1f9eb2cec 100644
--- a/docs/locales/gettext/user/libraries/create.pot
+++ b/docs/locales/gettext/user/libraries/create.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,102 +16,102 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/libraries/create_library.md:1
+#: ../../user/libraries/create.md:1
 msgid "Create a library"
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:4
+#: ../../user/libraries/create.md:4
 msgid "Want to publish your own content on your {term}`pod`? Take a look at [channels](../channels/index)."
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:7
+#: ../../user/libraries/create.md:7
 msgid "To start uploading your collection to your pod, you need to create a library. You can create as many libraries as you need."
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:9
+#: ../../user/libraries/create.md:9
 msgid "To create a library:"
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:0
+#: ../../user/libraries/create.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:17
-#: ../../user_documentation/libraries/create_library.md:36
+#: ../../user/libraries/create.md:17
+#: ../../user/libraries/create.md:36
 msgid "Log in to your pod."
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:18
+#: ../../user/libraries/create.md:18
 msgid "Select the upload icon ({fa}`upload`) in the top of the sidebar."
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:19
-#: ../../user_documentation/libraries/create_library.md:38
+#: ../../user/libraries/create.md:19
+#: ../../user/libraries/create.md:38
 msgid "Select {guilabel}`Get started` under {guilabel}`Upload third-party content in a library`."
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:20
-#: ../../user_documentation/libraries/create_library.md:39
+#: ../../user/libraries/create.md:20
+#: ../../user/libraries/create.md:39
 msgid "A screen appears showing your upload quota. If you have created any libraries, these are also shown."
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:21
-#: ../../user_documentation/libraries/create_library.md:40
+#: ../../user/libraries/create.md:21
+#: ../../user/libraries/create.md:40
 msgid "Select {guilabel}`Create a new library`."
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:22
-#: ../../user_documentation/libraries/create_library.md:41
+#: ../../user/libraries/create.md:22
+#: ../../user/libraries/create.md:41
 msgid "Enter a {guilabel}`Name` for your library (required)."
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:23
-#: ../../user_documentation/libraries/create_library.md:42
+#: ../../user/libraries/create.md:23
+#: ../../user/libraries/create.md:42
 msgid "Enter {guilabel}`Description` for your library."
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:24
-#: ../../user_documentation/libraries/create_library.md:43
+#: ../../user/libraries/create.md:24
+#: ../../user/libraries/create.md:43
 msgid "Set the {guilabel}`Visibility` of your library. This determines who can access the content."
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:25
-#: ../../user_documentation/libraries/create_library.md:44
+#: ../../user/libraries/create.md:25
+#: ../../user/libraries/create.md:44
 msgid "{guilabel}`Everyone, across all instances` – the library's content is available to everybody who interacts with your pod. This includes users of other pods."
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:26
-#: ../../user_documentation/libraries/create_library.md:45
+#: ../../user/libraries/create.md:26
+#: ../../user/libraries/create.md:45
 msgid "{guilabel}`Everyone on this instance` – the library's content is available to all users on your pod. This does not include users of other pods."
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:27
-#: ../../user_documentation/libraries/create_library.md:46
+#: ../../user/libraries/create.md:27
+#: ../../user/libraries/create.md:46
 msgid "{guilabel}`Nobody except me` – the library's content is only available to you and people you share the library with."
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:28
-#: ../../user_documentation/libraries/create_library.md:47
+#: ../../user/libraries/create.md:28
+#: ../../user/libraries/create.md:47
 msgid "Select {guilabel}`Create library`."
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:29
-#: ../../user_documentation/libraries/create_library.md:48
+#: ../../user/libraries/create.md:29
+#: ../../user/libraries/create.md:48
 msgid "A screen appears showing you a summary of your library."
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:0
+#: ../../user/libraries/create.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:37
+#: ../../user/libraries/create.md:37
 msgid "Select the upload icon ({fa}`upload`) at the top of the screen."
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:53
+#: ../../user/libraries/create.md:53
 msgid "Select {guilabel}`Nobody except me` if you don't own the copyright for the content or it isn't freely licensed."
 msgstr ""
 
-#: ../../user_documentation/libraries/create_library.md:56
+#: ../../user/libraries/create.md:56
 msgid "Well done! You've created your library. Now you can add some content to it."
 msgstr ""
diff --git a/docs/locales/gettext/user/libraries/delete.pot b/docs/locales/gettext/user/libraries/delete.pot
index 3efc598c1..9504f37f6 100644
--- a/docs/locales/gettext/user/libraries/delete.pot
+++ b/docs/locales/gettext/user/libraries/delete.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,69 +16,69 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/libraries/delete_library.md:1
+#: ../../user/libraries/delete.md:1
 msgid "Delete a library"
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_library.md:4
+#: ../../user/libraries/delete.md:4
 msgid "Deleting a library also deletes all content in the library."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_library.md:7
+#: ../../user/libraries/delete.md:7
 msgid "You can delete a library at any time. To do this:"
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_library.md:0
+#: ../../user/libraries/delete.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_library.md:15
-#: ../../user_documentation/libraries/delete_library.md:29
+#: ../../user/libraries/delete.md:15
+#: ../../user/libraries/delete.md:29
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_library.md:16
+#: ../../user/libraries/delete.md:16
 msgid "Select the upload icon ({fa}`upload`) in the top of the sidebar."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_library.md:17
-#: ../../user_documentation/libraries/delete_library.md:31
+#: ../../user/libraries/delete.md:17
+#: ../../user/libraries/delete.md:31
 msgid "Select {guilabel}`Get started` under {guilabel}`Upload third-party content in a library`."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_library.md:18
-#: ../../user_documentation/libraries/delete_library.md:32
+#: ../../user/libraries/delete.md:18
+#: ../../user/libraries/delete.md:32
 msgid "A screen appears showing your upload quota and your libraries."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_library.md:19
-#: ../../user_documentation/libraries/delete_library.md:33
+#: ../../user/libraries/delete.md:19
+#: ../../user/libraries/delete.md:33
 msgid "Select {guilabel}`Library Details` under the library you want to edit."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_library.md:20
-#: ../../user_documentation/libraries/delete_library.md:34
+#: ../../user/libraries/delete.md:20
+#: ../../user/libraries/delete.md:34
 msgid "Select the {guilabel}`✎ Edit` button at the top of the screen."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_library.md:21
-#: ../../user_documentation/libraries/delete_library.md:35
+#: ../../user/libraries/delete.md:21
+#: ../../user/libraries/delete.md:35
 msgid "Select {guilabel}`Delete`."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_library.md:22
-#: ../../user_documentation/libraries/delete_library.md:36
+#: ../../user/libraries/delete.md:22
+#: ../../user/libraries/delete.md:36
 msgid "Select {guilabel}`Delete library` on the warning notice that appears."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_library.md:0
+#: ../../user/libraries/delete.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_library.md:30
+#: ../../user/libraries/delete.md:30
 msgid "Select the upload icon ({fa}`upload`) at the top of the screen."
 msgstr ""
 
-#: ../../user_documentation/libraries/delete_library.md:40
+#: ../../user/libraries/delete.md:40
 msgid "That's it! You've deleted your library and all its content."
 msgstr ""
diff --git a/docs/locales/gettext/user/libraries/edit.pot b/docs/locales/gettext/user/libraries/edit.pot
index 475625aa3..8b78404d6 100644
--- a/docs/locales/gettext/user/libraries/edit.pot
+++ b/docs/locales/gettext/user/libraries/edit.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,80 +16,80 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/libraries/edit_library.md:1
+#: ../../user/libraries/edit.md:1
 msgid "Edit a library"
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_library.md:3
+#: ../../user/libraries/edit.md:3
 msgid "You can update the details of your libraries at any time. To do this:"
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_library.md:0
+#: ../../user/libraries/edit.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_library.md:11
-#: ../../user_documentation/libraries/edit_library.md:28
+#: ../../user/libraries/edit.md:11
+#: ../../user/libraries/edit.md:28
 msgid "Log in to your {term}`pod`."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_library.md:12
+#: ../../user/libraries/edit.md:12
 msgid "Select the upload icon ({fa}`upload`) in the top of the sidebar."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_library.md:13
-#: ../../user_documentation/libraries/edit_library.md:30
+#: ../../user/libraries/edit.md:13
+#: ../../user/libraries/edit.md:30
 msgid "Select {guilabel}`Get started` under {guilabel}`Upload third-party content in a library`."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_library.md:14
-#: ../../user_documentation/libraries/edit_library.md:31
+#: ../../user/libraries/edit.md:14
+#: ../../user/libraries/edit.md:31
 msgid "A screen appears showing your upload quota and your libraries."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_library.md:15
-#: ../../user_documentation/libraries/edit_library.md:32
+#: ../../user/libraries/edit.md:15
+#: ../../user/libraries/edit.md:32
 msgid "Select {guilabel}`Library Details` under the library you want to edit."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_library.md:16
-#: ../../user_documentation/libraries/edit_library.md:33
+#: ../../user/libraries/edit.md:16
+#: ../../user/libraries/edit.md:33
 msgid "Select the {guilabel}`✎ Edit` button at the top of the screen."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_library.md:17
-#: ../../user_documentation/libraries/edit_library.md:34
+#: ../../user/libraries/edit.md:17
+#: ../../user/libraries/edit.md:34
 msgid "Change any of the following:"
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_library.md:18
-#: ../../user_documentation/libraries/edit_library.md:35
+#: ../../user/libraries/edit.md:18
+#: ../../user/libraries/edit.md:35
 msgid "{guilabel}`Name`."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_library.md:19
-#: ../../user_documentation/libraries/edit_library.md:36
+#: ../../user/libraries/edit.md:19
+#: ../../user/libraries/edit.md:36
 msgid "{guilabel}`Description`."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_library.md:20
-#: ../../user_documentation/libraries/edit_library.md:37
+#: ../../user/libraries/edit.md:20
+#: ../../user/libraries/edit.md:37
 msgid "{guilabel}`Visibility`."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_library.md:21
-#: ../../user_documentation/libraries/edit_library.md:38
+#: ../../user/libraries/edit.md:21
+#: ../../user/libraries/edit.md:38
 msgid "Select {guilabel}`Update Library` to save your changes. A toast notification appears at the bottom of the screen to confirm your changes."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_library.md:0
+#: ../../user/libraries/edit.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_library.md:29
+#: ../../user/libraries/edit.md:29
 msgid "Select the upload icon ({fa}`upload`) at the top of the screen."
 msgstr ""
 
-#: ../../user_documentation/libraries/edit_library.md:42
+#: ../../user/libraries/edit.md:42
 msgid "That's it! You've updated your library's details."
 msgstr ""
diff --git a/docs/locales/gettext/user/libraries/follow.pot b/docs/locales/gettext/user/libraries/follow.pot
index 55728c80b..fc21bb0e8 100644
--- a/docs/locales/gettext/user/libraries/follow.pot
+++ b/docs/locales/gettext/user/libraries/follow.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,92 +16,92 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/libraries/follow_library.md:1
+#: ../../user/libraries/follow.md:1
 msgid "Follow a library"
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:3
+#: ../../user/libraries/follow.md:3
 msgid "Follow a library to get access to its content. There are two ways to follow a library:"
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:9
+#: ../../user/libraries/follow.md:9
 msgid "Use a sharing link"
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:11
+#: ../../user/libraries/follow.md:11
 msgid "If you've received a sharing link, you can use this to follow a library. To do this:"
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:0
+#: ../../user/libraries/follow.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:19
-#: ../../user_documentation/libraries/follow_library.md:31
-#: ../../user_documentation/libraries/follow_library.md:50
+#: ../../user/libraries/follow.md:19
+#: ../../user/libraries/follow.md:31
+#: ../../user/libraries/follow.md:50
 msgid "Log in to your pod."
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:20
+#: ../../user/libraries/follow.md:20
 msgid "Select the upload icon ({fa}`upload`) in the top of the sidebar."
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:21
-#: ../../user_documentation/libraries/follow_library.md:33
+#: ../../user/libraries/follow.md:21
+#: ../../user/libraries/follow.md:33
 msgid "Select {guilabel}`Get started` under {guilabel}`Follow remote libraries`. A screen appears showing you the libraries you are following."
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:22
-#: ../../user_documentation/libraries/follow_library.md:34
+#: ../../user/libraries/follow.md:22
+#: ../../user/libraries/follow.md:34
 msgid "Paste the sharing link into the {guilabel}`Search a remote library` search bar."
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:23
-#: ../../user_documentation/libraries/follow_library.md:35
+#: ../../user/libraries/follow.md:23
+#: ../../user/libraries/follow.md:35
 msgid "Select the {guilabel}`Search` icon or hit {kbd}`⏎ Return` to search for the library. If the library exists, a library card appears."
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:24
-#: ../../user_documentation/libraries/follow_library.md:36
+#: ../../user/libraries/follow.md:24
+#: ../../user/libraries/follow.md:36
 msgid "Select {guilabel}`Follow` on the library card. If the library's privacy level is {guilabel}`Nobody except me`, the owner needs to approve the request."
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:0
+#: ../../user/libraries/follow.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:32
+#: ../../user/libraries/follow.md:32
 msgid "Select the upload icon ({fa}`upload`) at the top of the screen"
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:40
+#: ../../user/libraries/follow.md:40
 msgid "That's it! The server then scans the content and you can see it on your {term}`pod`."
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:42
+#: ../../user/libraries/follow.md:42
 msgid "Follow from content on your pod"
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:45
+#: ../../user/libraries/follow.md:45
 msgid "You can only follow a library from content pages if its privacy level is not {guilabel}`Nobody except me`."
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:48
+#: ../../user/libraries/follow.md:48
 msgid "If a user on your {term}`pod` has already followed a library, you can find it by selecting content from that library. To do this:"
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:51
+#: ../../user/libraries/follow.md:51
 msgid "Select a track, album, or artist from the library you want to follow."
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:52
+#: ../../user/libraries/follow.md:52
 msgid "Scroll to the bottom of the page. The library card appears in the {guilabel}`User libraries` section."
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:53
+#: ../../user/libraries/follow.md:53
 msgid "Select {guilabel}`Follow` on the library card."
 msgstr ""
 
-#: ../../user_documentation/libraries/follow_library.md:55
+#: ../../user/libraries/follow.md:55
 msgid "You're done! The content will remain on the server even if the other user stops following the library."
 msgstr ""
diff --git a/docs/locales/gettext/user/libraries/index.pot b/docs/locales/gettext/user/libraries/index.pot
index 83af110b8..425ecb749 100644
--- a/docs/locales/gettext/user/libraries/index.pot
+++ b/docs/locales/gettext/user/libraries/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,38 +16,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/libraries/index.md:11
+#: ../../user/libraries/index.md:11
 msgid "Manage your libraries"
 msgstr ""
 
-#: ../../user_documentation/libraries/index.md:23
+#: ../../user/libraries/index.md:23
 msgid "Manage library content"
 msgstr ""
 
-#: ../../user_documentation/libraries/index.md:36
+#: ../../user/libraries/index.md:36
 msgid "Share and follow libraries"
 msgstr ""
 
-#: ../../user_documentation/libraries/index.md:1
+#: ../../user/libraries/index.md:1
 msgid "Libraries"
 msgstr ""
 
-#: ../../user_documentation/libraries/index.md:3
+#: ../../user/libraries/index.md:3
 msgid "Libraries enable you to organize audio content you upload to your {term}`pod`. You can set the privacy level on libraries to control who can access them. Choose from the available privacy levels:"
 msgstr ""
 
-#: ../../user_documentation/libraries/index.md:5
+#: ../../user/libraries/index.md:5
 msgid "**Everyone, across all instances** – the library's content is available to everybody who interacts with your pod. This includes users of other pods."
 msgstr ""
 
-#: ../../user_documentation/libraries/index.md:6
+#: ../../user/libraries/index.md:6
 msgid "**Everyone on this instance** – the library's content is available to all users on your pod. This does not include users of other pods."
 msgstr ""
 
-#: ../../user_documentation/libraries/index.md:7
+#: ../../user/libraries/index.md:7
 msgid "**Nobody except me** – the library's content is only available to you and people you share the library with."
 msgstr ""
 
-#: ../../user_documentation/libraries/index.md:9
+#: ../../user/libraries/index.md:9
 msgid "Use libraries for private collections or freely licensed music you want to share."
 msgstr ""
diff --git a/docs/locales/gettext/user/libraries/share.pot b/docs/locales/gettext/user/libraries/share.pot
index d66686721..e0b4df8c7 100644
--- a/docs/locales/gettext/user/libraries/share.pot
+++ b/docs/locales/gettext/user/libraries/share.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,88 +16,88 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/libraries/share_library.md:1
+#: ../../user/libraries/share.md:1
 msgid "Share a library"
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:3
+#: ../../user/libraries/share.md:3
 msgid "Sharing a library gives another user access to the library's content. When a user follows your library, they'll be able to play and download any content it contains from their {term}`pod`. Share private libraries with friends and family or share public libraries with everyone!"
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:5
+#: ../../user/libraries/share.md:5
 msgid "To share a library you own:"
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:0
+#: ../../user/libraries/share.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:13
-#: ../../user_documentation/libraries/share_library.md:26
-#: ../../user_documentation/libraries/share_library.md:44
-#: ../../user_documentation/libraries/share_library.md:54
+#: ../../user/libraries/share.md:13
+#: ../../user/libraries/share.md:26
+#: ../../user/libraries/share.md:44
+#: ../../user/libraries/share.md:54
 msgid "Log in to your pod."
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:14
+#: ../../user/libraries/share.md:14
 msgid "Select the upload icon ({fa}`upload`) in the top of the sidebar."
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:15
-#: ../../user_documentation/libraries/share_library.md:28
+#: ../../user/libraries/share.md:15
+#: ../../user/libraries/share.md:28
 msgid "Select {guilabel}`Get started` under {guilabel}`Upload third-party content in a library`."
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:16
-#: ../../user_documentation/libraries/share_library.md:29
+#: ../../user/libraries/share.md:16
+#: ../../user/libraries/share.md:29
 msgid "A screen appears showing your upload quota and your libraries."
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:17
-#: ../../user_documentation/libraries/share_library.md:30
+#: ../../user/libraries/share.md:17
+#: ../../user/libraries/share.md:30
 msgid "Select {guilabel}`Library Details` under the library you want to share."
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:18
-#: ../../user_documentation/libraries/share_library.md:31
+#: ../../user/libraries/share.md:18
+#: ../../user/libraries/share.md:31
 msgid "The {guilabel}`Sharing link` appears on the library details page. Select {guilabel}`Copy` to copy the sharing link to your clipboard. A label appears letting you know you've copied the link."
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:19
-#: ../../user_documentation/libraries/share_library.md:32
+#: ../../user/libraries/share.md:19
+#: ../../user/libraries/share.md:32
 msgid "Send the link to whomever you want to share the library with."
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:0
+#: ../../user/libraries/share.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:27
+#: ../../user/libraries/share.md:27
 msgid "Select the upload icon ({fa}`upload`) at the top of the screen."
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:36
+#: ../../user/libraries/share.md:36
 msgid "If you have set the library's privacy level to {guilabel}`Nobody except me`, you need to approve followers. You receive a notification when a user follows your library. To approve a follow request:"
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:45
+#: ../../user/libraries/share.md:45
 msgid "Select the cog icon ({fa}`cog`) or your avatar to expand the user menu."
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:46
-#: ../../user_documentation/libraries/share_library.md:56
+#: ../../user/libraries/share.md:46
+#: ../../user/libraries/share.md:56
 msgid "Select {guilabel}`Notifications`. The notifications screen opens."
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:47
-#: ../../user_documentation/libraries/share_library.md:57
+#: ../../user/libraries/share.md:47
+#: ../../user/libraries/share.md:57
 msgid "Notifications show the username of the user who wants to follow the library as well as the library name. Select {guilabel}`Accept` to approve the follow request or {guilabel}`Reject` to reject the request."
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:55
+#: ../../user/libraries/share.md:55
 msgid "Select the cog icon ({fa}`cog`) or your avatar to open the {guilabel}`Options` menu."
 msgstr ""
 
-#: ../../user_documentation/libraries/share_library.md:61
+#: ../../user/libraries/share.md:61
 msgid "That's it! You've shared your library. The invited users can now listen to its content."
 msgstr ""
diff --git a/docs/locales/gettext/user/playlists/content/add.pot b/docs/locales/gettext/user/playlists/content/add.pot
index 19dc5147a..61cabd499 100644
--- a/docs/locales/gettext/user/playlists/content/add.pot
+++ b/docs/locales/gettext/user/playlists/content/add.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,137 +16,137 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/playlists/add_content.md:1
+#: ../../user/playlists/content/add.md:1
 msgid "Add content to a playlist"
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:3
+#: ../../user/playlists/content/add.md:3
 msgid "To build a playlist, you need to add content to it. You can add content in a few different ways:"
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:9
+#: ../../user/playlists/content/add.md:9
 msgid "Add the currently playing track"
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:11
+#: ../../user/playlists/content/add.md:11
 msgid "If you want to add the currently playing track to a playlist:"
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:0
+#: ../../user/playlists/content/add.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:19
+#: ../../user/playlists/content/add.md:19
 msgid "Select the playlist icon ({fa}`list`) on the player. The {guilabel}`Manage playlists` screen appears."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:20
-#: ../../user_documentation/playlists/add_content.md:29
-#: ../../user_documentation/playlists/add_content.md:73
-#: ../../user_documentation/playlists/add_content.md:84
+#: ../../user/playlists/content/add.md:20
+#: ../../user/playlists/content/add.md:29
+#: ../../user/playlists/content/add.md:73
+#: ../../user/playlists/content/add.md:84
 msgid "Select {guilabel}`+ Add track` next to the playlist you want to add the track to."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:0
+#: ../../user/playlists/content/add.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:27
+#: ../../user/playlists/content/add.md:27
 msgid "Select the player at the bottom of the screen to expand it."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:28
+#: ../../user/playlists/content/add.md:28
 msgid "Select the playlist icon ({fa}`list`) under the track art. The {guilabel}`Manage playlists` screen appears."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:33
+#: ../../user/playlists/content/add.md:33
 msgid "That's it! The currently playing track is now in your playlist."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:35
+#: ../../user/playlists/content/add.md:35
 msgid "Add content from queue"
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:37
-msgid "You can add all content that is currently in your [player queue](../queue/index.md). To do this:"
+#: ../../user/playlists/content/add.md:37
+msgid "You can add all content that is currently in your [player queue](../../queue/index.md). To do this:"
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:45
+#: ../../user/playlists/content/add.md:45
 msgid "Select {guilabel}`Playlists` under the {guilabel}`My Library` section of the sidebar. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:46
-#: ../../user_documentation/playlists/add_content.md:58
+#: ../../user/playlists/content/add.md:46
+#: ../../user/playlists/content/add.md:58
 msgid "Select {guilabel}`Manage your playlists`. The {guilabel}`Manage playlists` screen appears."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:47
-#: ../../user_documentation/playlists/add_content.md:59
+#: ../../user/playlists/content/add.md:47
+#: ../../user/playlists/content/add.md:59
 msgid "Select the edit icon ({fa}`edit`) next to the playlist you want to edit. The playlist edit screen appears."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:48
-#: ../../user_documentation/playlists/add_content.md:60
+#: ../../user/playlists/content/add.md:48
+#: ../../user/playlists/content/add.md:60
 msgid "Select {guilabel}`+ Insert from queue`. Your tracks appear in the playlist. The changes save to the server."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:49
-#: ../../user_documentation/playlists/add_content.md:61
+#: ../../user/playlists/content/add.md:49
+#: ../../user/playlists/content/add.md:61
 msgid "Select {guilabel}`Stop editing` to stop editing."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:56
+#: ../../user/playlists/content/add.md:56
 msgid "Select the hamburger menu ({fa}`bars`) to open the menu bar."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:57
+#: ../../user/playlists/content/add.md:57
 msgid "Select {menuselection}`My Library --> Playlists`. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:65
+#: ../../user/playlists/content/add.md:65
 msgid "That's it! You've added the contents from your queue to a playlist."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:67
+#: ../../user/playlists/content/add.md:67
 msgid "Add track from track details page"
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:69
+#: ../../user/playlists/content/add.md:69
 msgid "You can add a track to a playlist from the track details page. To do this:"
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:71
+#: ../../user/playlists/content/add.md:71
 msgid "Go to the track details page of the track you want to add."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:72
+#: ../../user/playlists/content/add.md:72
 msgid "Select the playlist icon ({fa}`list`) at the top of the screen. The {guilabel}`Manage playlists` screen appears."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:75
+#: ../../user/playlists/content/add.md:75
 msgid "That's it! The track is available in your playlist."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:77
+#: ../../user/playlists/content/add.md:77
 msgid "Add track from track table"
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:79
+#: ../../user/playlists/content/add.md:79
 msgid "You can add tracks from any page with a track table. This includes artist pages, album pages, and the search page. To add tracks from the track table:"
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:81
+#: ../../user/playlists/content/add.md:81
 msgid "Find your track in a track table."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:82
+#: ../../user/playlists/content/add.md:82
 msgid "Select the kebab menu ({fa}`ellipsis-v`) next to the track to open the track options menu."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:83
+#: ../../user/playlists/content/add.md:83
 msgid "Select {guilabel}`Add to playlist…`. The {guilabel}`Manage playlists` screen appears."
 msgstr ""
 
-#: ../../user_documentation/playlists/add_content.md:86
+#: ../../user/playlists/content/add.md:86
 msgid "Well done! You've added the track to your playlist."
 msgstr ""
diff --git a/docs/locales/gettext/user/playlists/content/remove.pot b/docs/locales/gettext/user/playlists/content/remove.pot
index b5205a143..c65270700 100644
--- a/docs/locales/gettext/user/playlists/content/remove.pot
+++ b/docs/locales/gettext/user/playlists/content/remove.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,59 +16,59 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/playlists/remove_content.md:1
+#: ../../user/playlists/content/remove.md:1
 msgid "Remove content from a playlist"
 msgstr ""
 
-#: ../../user_documentation/playlists/remove_content.md:4
+#: ../../user/playlists/content/remove.md:4
 msgid "Removing content from a playlist removes it for anybody who follows the playlist."
 msgstr ""
 
-#: ../../user_documentation/playlists/remove_content.md:7
+#: ../../user/playlists/content/remove.md:7
 msgid "You can remove content from a playlist at any time. To do this:"
 msgstr ""
 
-#: ../../user_documentation/playlists/remove_content.md:0
+#: ../../user/playlists/content/remove.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/playlists/remove_content.md:15
-#: ../../user_documentation/playlists/remove_content.md:27
+#: ../../user/playlists/content/remove.md:15
+#: ../../user/playlists/content/remove.md:27
 msgid "Log in to your account."
 msgstr ""
 
-#: ../../user_documentation/playlists/remove_content.md:16
+#: ../../user/playlists/content/remove.md:16
 msgid "Select {guilabel}`Playlists` under the {guilabel}`My Library` section of the sidebar. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/playlists/remove_content.md:17
-#: ../../user_documentation/playlists/remove_content.md:30
+#: ../../user/playlists/content/remove.md:17
+#: ../../user/playlists/content/remove.md:30
 msgid "Select {guilabel}`Manage your playlists`. The {guilabel}`Manage playlists` screen appears."
 msgstr ""
 
-#: ../../user_documentation/playlists/remove_content.md:18
-#: ../../user_documentation/playlists/remove_content.md:31
+#: ../../user/playlists/content/remove.md:18
+#: ../../user/playlists/content/remove.md:31
 msgid "Select the edit icon ({fa}`edit`) next to the playlist you want to edit. The playlist edit screen appears."
 msgstr ""
 
-#: ../../user_documentation/playlists/remove_content.md:19
-#: ../../user_documentation/playlists/remove_content.md:32
+#: ../../user/playlists/content/remove.md:19
+#: ../../user/playlists/content/remove.md:32
 msgid "Select the delete icon ({fa}`trash`) next to the content you want to remove. Select {guilabel}`Clear playlist` to remove all content at once."
 msgstr ""
 
-#: ../../user_documentation/playlists/remove_content.md:20
-#: ../../user_documentation/playlists/remove_content.md:33
+#: ../../user/playlists/content/remove.md:20
+#: ../../user/playlists/content/remove.md:33
 msgid "Select {guilabel}`Stop Editing` to finish editing."
 msgstr ""
 
-#: ../../user_documentation/playlists/remove_content.md:28
+#: ../../user/playlists/content/remove.md:28
 msgid "Select the hamburger menu ({fa}`bars`) to open the menu bar."
 msgstr ""
 
-#: ../../user_documentation/playlists/remove_content.md:29
+#: ../../user/playlists/content/remove.md:29
 msgid "Select {menuselection}`My Library --> Playlists`. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/playlists/remove_content.md:37
+#: ../../user/playlists/content/remove.md:37
 msgid "That's it! You've removed the content from your playlist."
 msgstr ""
diff --git a/docs/locales/gettext/user/playlists/content/reorder.pot b/docs/locales/gettext/user/playlists/content/reorder.pot
index 1548e6bfd..56e7c428f 100644
--- a/docs/locales/gettext/user/playlists/content/reorder.pot
+++ b/docs/locales/gettext/user/playlists/content/reorder.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,55 +16,55 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/playlists/reorder_content.md:1
+#: ../../user/playlists/content/reorder.md:1
 msgid "Reorder content in a playlist"
 msgstr ""
 
-#: ../../user_documentation/playlists/reorder_content.md:3
+#: ../../user/playlists/content/reorder.md:3
 msgid "You can change the order of the tracks in a playlist. To do this:"
 msgstr ""
 
-#: ../../user_documentation/playlists/reorder_content.md:0
+#: ../../user/playlists/content/reorder.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/playlists/reorder_content.md:11
-#: ../../user_documentation/playlists/reorder_content.md:23
+#: ../../user/playlists/content/reorder.md:11
+#: ../../user/playlists/content/reorder.md:23
 msgid "Log in to your account."
 msgstr ""
 
-#: ../../user_documentation/playlists/reorder_content.md:12
+#: ../../user/playlists/content/reorder.md:12
 msgid "Select {guilabel}`Playlists` under the {guilabel}`My Library` section of the sidebar. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/playlists/reorder_content.md:13
-#: ../../user_documentation/playlists/reorder_content.md:26
+#: ../../user/playlists/content/reorder.md:13
+#: ../../user/playlists/content/reorder.md:26
 msgid "Select {guilabel}`Manage your playlists`. The {guilabel}`Manage playlists` screen appears."
 msgstr ""
 
-#: ../../user_documentation/playlists/reorder_content.md:14
-#: ../../user_documentation/playlists/reorder_content.md:27
+#: ../../user/playlists/content/reorder.md:14
+#: ../../user/playlists/content/reorder.md:27
 msgid "Select the edit icon ({fa}`edit`) next to the playlist you want to edit. The playlist edit screen appears."
 msgstr ""
 
-#: ../../user_documentation/playlists/reorder_content.md:15
-#: ../../user_documentation/playlists/reorder_content.md:28
+#: ../../user/playlists/content/reorder.md:15
+#: ../../user/playlists/content/reorder.md:28
 msgid "Drag and drop the tracks in the playlist into the order you want. The position number of each track appears on the left side."
 msgstr ""
 
-#: ../../user_documentation/playlists/reorder_content.md:16
-#: ../../user_documentation/playlists/reorder_content.md:29
+#: ../../user/playlists/content/reorder.md:16
+#: ../../user/playlists/content/reorder.md:29
 msgid "Select {guilabel}`Stop Editing` to finish editing."
 msgstr ""
 
-#: ../../user_documentation/playlists/reorder_content.md:24
+#: ../../user/playlists/content/reorder.md:24
 msgid "Select the hamburger menu ({fa}`bars`) to open the menu bar."
 msgstr ""
 
-#: ../../user_documentation/playlists/reorder_content.md:25
+#: ../../user/playlists/content/reorder.md:25
 msgid "Select {menuselection}`My Library --> Playlists`. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/playlists/reorder_content.md:33
+#: ../../user/playlists/content/reorder.md:33
 msgid "You're done! You've updated the order of the tracks in your playlist."
 msgstr ""
diff --git a/docs/locales/gettext/user/playlists/create.pot b/docs/locales/gettext/user/playlists/create.pot
index 121cfd245..c628a6f74 100644
--- a/docs/locales/gettext/user/playlists/create.pot
+++ b/docs/locales/gettext/user/playlists/create.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,78 +16,78 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/playlists/create_playlist.md:1
+#: ../../user/playlists/create.md:1
 msgid "Create a playlist"
 msgstr ""
 
-#: ../../user_documentation/playlists/create_playlist.md:3
+#: ../../user/playlists/create.md:3
 msgid "Create playlists to share your favorite tracks with other Funkwhale users."
 msgstr ""
 
-#: ../../user_documentation/playlists/create_playlist.md:5
+#: ../../user/playlists/create.md:5
 msgid "To create a playlist:"
 msgstr ""
 
-#: ../../user_documentation/playlists/create_playlist.md:0
+#: ../../user/playlists/create.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/playlists/create_playlist.md:13
-#: ../../user_documentation/playlists/create_playlist.md:28
+#: ../../user/playlists/create.md:13
+#: ../../user/playlists/create.md:28
 msgid "Log in to your account."
 msgstr ""
 
-#: ../../user_documentation/playlists/create_playlist.md:14
+#: ../../user/playlists/create.md:14
 msgid "Select {guilabel}`Playlists` under the {guilabel}`My Library` section of the sidebar. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/playlists/create_playlist.md:15
-#: ../../user_documentation/playlists/create_playlist.md:31
+#: ../../user/playlists/create.md:15
+#: ../../user/playlists/create.md:31
 msgid "Select {guilabel}`Manage your playlists`. The {guilabel}`Manage playlists` screen appears."
 msgstr ""
 
-#: ../../user_documentation/playlists/create_playlist.md:16
-#: ../../user_documentation/playlists/create_playlist.md:32
+#: ../../user/playlists/create.md:16
+#: ../../user/playlists/create.md:32
 msgid "Enter a {guilabel}`Playlist name` for your new playlist."
 msgstr ""
 
-#: ../../user_documentation/playlists/create_playlist.md:17
-#: ../../user_documentation/playlists/create_playlist.md:33
+#: ../../user/playlists/create.md:17
+#: ../../user/playlists/create.md:33
 msgid "Select the {guilabel}`Playlist visibility` for your playlist. Choose from the following options:"
 msgstr ""
 
-#: ../../user_documentation/playlists/create_playlist.md:18
-#: ../../user_documentation/playlists/create_playlist.md:34
+#: ../../user/playlists/create.md:18
+#: ../../user/playlists/create.md:34
 msgid "{guilabel}`Everyone, across all instances` – the playlist is available to everybody who interacts with your {term}`pod`. This includes users of other pods."
 msgstr ""
 
-#: ../../user_documentation/playlists/create_playlist.md:19
-#: ../../user_documentation/playlists/create_playlist.md:35
+#: ../../user/playlists/create.md:19
+#: ../../user/playlists/create.md:35
 msgid "{guilabel}`Everyone on this instance` – the playlist is available to all users on your pod. This does not include users of other pods."
 msgstr ""
 
-#: ../../user_documentation/playlists/create_playlist.md:20
-#: ../../user_documentation/playlists/create_playlist.md:36
+#: ../../user/playlists/create.md:20
+#: ../../user/playlists/create.md:36
 msgid "{guilabel}`Nobody except me` – the playlist is only available to you and people you share it with."
 msgstr ""
 
-#: ../../user_documentation/playlists/create_playlist.md:21
-#: ../../user_documentation/playlists/create_playlist.md:37
+#: ../../user/playlists/create.md:21
+#: ../../user/playlists/create.md:37
 msgid "Select {guilabel}`Create playlist`. A {guilabel}`Playlist created` message appears."
 msgstr ""
 
-#: ../../user_documentation/playlists/create_playlist.md:0
+#: ../../user/playlists/create.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/playlists/create_playlist.md:29
+#: ../../user/playlists/create.md:29
 msgid "Select the hamburger menu ({fa}`bars`) to open the menu bar."
 msgstr ""
 
-#: ../../user_documentation/playlists/create_playlist.md:30
+#: ../../user/playlists/create.md:30
 msgid "Select {menuselection}`My Library --> Playlists`. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/playlists/create_playlist.md:41
-msgid "Congratulations! You've created your playlist. Now you can [add some content to it](add_content.md)."
+#: ../../user/playlists/create.md:41
+msgid "Congratulations! You've created your playlist. Now you can [add some content to it](content/add.md)."
 msgstr ""
diff --git a/docs/locales/gettext/user/playlists/delete.pot b/docs/locales/gettext/user/playlists/delete.pot
index 2ea534fcf..6d1db2a43 100644
--- a/docs/locales/gettext/user/playlists/delete.pot
+++ b/docs/locales/gettext/user/playlists/delete.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,63 +16,63 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/playlists/delete_playlist.md:1
+#: ../../user/playlists/delete.md:1
 msgid "Delete a playlist"
 msgstr ""
 
-#: ../../user_documentation/playlists/delete_playlist.md:4
+#: ../../user/playlists/delete.md:4
 msgid "Deleting a playlist removes the playlist for all users. This action is irreversible."
 msgstr ""
 
-#: ../../user_documentation/playlists/delete_playlist.md:7
+#: ../../user/playlists/delete.md:7
 msgid "You can delete a playlist if you no longer want it. To do this:"
 msgstr ""
 
-#: ../../user_documentation/playlists/delete_playlist.md:0
+#: ../../user/playlists/delete.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/playlists/delete_playlist.md:15
-#: ../../user_documentation/playlists/delete_playlist.md:27
+#: ../../user/playlists/delete.md:15
+#: ../../user/playlists/delete.md:27
 msgid "Log in to your account."
 msgstr ""
 
-#: ../../user_documentation/playlists/delete_playlist.md:16
+#: ../../user/playlists/delete.md:16
 msgid "Select {guilabel}`Playlists` under the {guilabel}`My Library` section of the sidebar. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/playlists/delete_playlist.md:17
-#: ../../user_documentation/playlists/delete_playlist.md:30
+#: ../../user/playlists/delete.md:17
+#: ../../user/playlists/delete.md:30
 msgid "Select {guilabel}`Manage your playlists`. The {guilabel}`Manage playlists` screen appears."
 msgstr ""
 
-#: ../../user_documentation/playlists/delete_playlist.md:18
-#: ../../user_documentation/playlists/delete_playlist.md:31
+#: ../../user/playlists/delete.md:18
+#: ../../user/playlists/delete.md:31
 msgid "Select the playlist from the {guilabel}`Available playlists` list. The playlist details screen opens."
 msgstr ""
 
-#: ../../user_documentation/playlists/delete_playlist.md:19
-#: ../../user_documentation/playlists/delete_playlist.md:32
+#: ../../user/playlists/delete.md:19
+#: ../../user/playlists/delete.md:32
 msgid "Select {guilabel}`Delete`. A {guilabel}`Do you want to delete the playlist?` warning appears."
 msgstr ""
 
-#: ../../user_documentation/playlists/delete_playlist.md:20
-#: ../../user_documentation/playlists/delete_playlist.md:33
+#: ../../user/playlists/delete.md:20
+#: ../../user/playlists/delete.md:33
 msgid "Select {guilabel}`Delete playlist`."
 msgstr ""
 
-#: ../../user_documentation/playlists/delete_playlist.md:0
+#: ../../user/playlists/delete.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/playlists/delete_playlist.md:28
+#: ../../user/playlists/delete.md:28
 msgid "Select the hamburger menu ({fa}`bars`) to open the menu bar."
 msgstr ""
 
-#: ../../user_documentation/playlists/delete_playlist.md:29
+#: ../../user/playlists/delete.md:29
 msgid "Select {menuselection}`My Library --> Playlists`. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/playlists/delete_playlist.md:37
+#: ../../user/playlists/delete.md:37
 msgid "That's it! You've deleted your playlist."
 msgstr ""
diff --git a/docs/locales/gettext/user/playlists/edit.pot b/docs/locales/gettext/user/playlists/edit.pot
index 610b0b4e1..743586ecd 100644
--- a/docs/locales/gettext/user/playlists/edit.pot
+++ b/docs/locales/gettext/user/playlists/edit.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,69 +16,69 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/playlists/edit_playlist.md:1
+#: ../../user/playlists/edit.md:1
 msgid "Edit a playlist"
 msgstr ""
 
-#: ../../user_documentation/playlists/edit_playlist.md:3
+#: ../../user/playlists/edit.md:3
 msgid "You can edit the details of your playlists at any time. To do this:"
 msgstr ""
 
-#: ../../user_documentation/playlists/edit_playlist.md:0
+#: ../../user/playlists/edit.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/playlists/edit_playlist.md:11
-#: ../../user_documentation/playlists/edit_playlist.md:25
+#: ../../user/playlists/edit.md:11
+#: ../../user/playlists/edit.md:25
 msgid "Log in to your account."
 msgstr ""
 
-#: ../../user_documentation/playlists/edit_playlist.md:12
+#: ../../user/playlists/edit.md:12
 msgid "Select {guilabel}`Playlists` under the {guilabel}`My Library` section of the sidebar. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/playlists/edit_playlist.md:13
-#: ../../user_documentation/playlists/edit_playlist.md:28
+#: ../../user/playlists/edit.md:13
+#: ../../user/playlists/edit.md:28
 msgid "Select {guilabel}`Manage your playlists`. The {guilabel}`Manage playlists` screen appears."
 msgstr ""
 
-#: ../../user_documentation/playlists/edit_playlist.md:14
-#: ../../user_documentation/playlists/edit_playlist.md:29
+#: ../../user/playlists/edit.md:14
+#: ../../user/playlists/edit.md:29
 msgid "Select the edit icon ({fa}`edit`) next to the playlist you want to edit. The playlist edit screen appears."
 msgstr ""
 
-#: ../../user_documentation/playlists/edit_playlist.md:15
-#: ../../user_documentation/playlists/edit_playlist.md:30
+#: ../../user/playlists/edit.md:15
+#: ../../user/playlists/edit.md:30
 msgid "Update the following fields:"
 msgstr ""
 
-#: ../../user_documentation/playlists/edit_playlist.md:16
-#: ../../user_documentation/playlists/edit_playlist.md:31
+#: ../../user/playlists/edit.md:16
+#: ../../user/playlists/edit.md:31
 msgid "{guilabel}`Playlist name`."
 msgstr ""
 
-#: ../../user_documentation/playlists/edit_playlist.md:17
-#: ../../user_documentation/playlists/edit_playlist.md:32
+#: ../../user/playlists/edit.md:17
+#: ../../user/playlists/edit.md:32
 msgid "{guilabel}`Playlist visibility`."
 msgstr ""
 
-#: ../../user_documentation/playlists/edit_playlist.md:18
-#: ../../user_documentation/playlists/edit_playlist.md:33
+#: ../../user/playlists/edit.md:18
+#: ../../user/playlists/edit.md:33
 msgid "Select {guilabel}`Update playlist` to save your changes. A message displays {guilabel}`Playlist updated`."
 msgstr ""
 
-#: ../../user_documentation/playlists/edit_playlist.md:0
+#: ../../user/playlists/edit.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/playlists/edit_playlist.md:26
+#: ../../user/playlists/edit.md:26
 msgid "Select the hamburger menu ({fa}`bars`) to open the menu bar."
 msgstr ""
 
-#: ../../user_documentation/playlists/edit_playlist.md:27
+#: ../../user/playlists/edit.md:27
 msgid "Select {menuselection}`My Library --> Playlists`. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/playlists/edit_playlist.md:37
+#: ../../user/playlists/edit.md:37
 msgid "That's it! You've edited your playlist."
 msgstr ""
diff --git a/docs/locales/gettext/user/playlists/index.pot b/docs/locales/gettext/user/playlists/index.pot
index 9fbd71e7b..67821a239 100644
--- a/docs/locales/gettext/user/playlists/index.pot
+++ b/docs/locales/gettext/user/playlists/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,18 +16,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/playlists/index.md:5
+#: ../../user/playlists/index.md:5
 msgid "Manage your playlists"
 msgstr ""
 
-#: ../../user_documentation/playlists/index.md:18
+#: ../../user/playlists/index.md:18
 msgid "Manage playlist content"
 msgstr ""
 
-#: ../../user_documentation/playlists/index.md:1
+#: ../../user/playlists/index.md:1
 msgid "Playlists"
 msgstr ""
 
-#: ../../user_documentation/playlists/index.md:3
+#: ../../user/playlists/index.md:3
 msgid "You can create and share playlists with the {term}`Fediverse`. Add content from all over the network to build playlists you love."
 msgstr ""
diff --git a/docs/locales/gettext/user/playlists/listen.pot b/docs/locales/gettext/user/playlists/listen.pot
index 565c21338..1f642fd85 100644
--- a/docs/locales/gettext/user/playlists/listen.pot
+++ b/docs/locales/gettext/user/playlists/listen.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,87 +16,87 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/playlists/listen_playlist.md:1
+#: ../../user/playlists/listen.md:1
 msgid "Listen to a playlist"
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:4
-msgid "You can only listen to content in libraries you have access to. For more information, see [Follow a library](../libraries/follow_library)."
+#: ../../user/playlists/listen.md:4
+msgid "You can only listen to content in libraries you have access to. For more information, see [Follow a library](../libraries/follow)."
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:7
+#: ../../user/playlists/listen.md:7
 msgid "You can listen to your playlists or playlists created by other users of your {term}`pod`."
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:13
+#: ../../user/playlists/listen.md:13
 msgid "Listen to your playlists"
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:15
+#: ../../user/playlists/listen.md:15
 msgid "To listen to playlists you created:"
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:0
+#: ../../user/playlists/listen.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:23
+#: ../../user/playlists/listen.md:23
 msgid "Select {menuselection}`My Library --> Playlists` in the sidebar. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:24
-#: ../../user_documentation/playlists/listen_playlist.md:34
+#: ../../user/playlists/listen.md:24
+#: ../../user/playlists/listen.md:34
 msgid "Use the filters to search for your playlist."
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:25
-#: ../../user_documentation/playlists/listen_playlist.md:35
+#: ../../user/playlists/listen.md:25
+#: ../../user/playlists/listen.md:35
 msgid "Select the orange play icon ({fa}`play`) on your playlist to start playing the content."
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:0
+#: ../../user/playlists/listen.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:32
-#: ../../user_documentation/playlists/listen_playlist.md:60
+#: ../../user/playlists/listen.md:32
+#: ../../user/playlists/listen.md:60
 msgid "Select the hamburger menu ({fa}`bars`) to open the menu bar."
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:33
+#: ../../user/playlists/listen.md:33
 msgid "Select {menuselection}`My Library --> Playlists`. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:39
+#: ../../user/playlists/listen.md:39
 msgid "You're done! Your playlist's content appears in your [queue](../queue/index.md)."
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:41
+#: ../../user/playlists/listen.md:41
 msgid "Listen to public playlists from your pod"
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:43
+#: ../../user/playlists/listen.md:43
 msgid "To listen to public playlists other users created:"
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:51
+#: ../../user/playlists/listen.md:51
 msgid "Select {menuselection}`Explore --> Playlists` in the sidebar. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:52
-#: ../../user_documentation/playlists/listen_playlist.md:62
+#: ../../user/playlists/listen.md:52
+#: ../../user/playlists/listen.md:62
 msgid "Use the filters to search for a playlist."
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:53
-#: ../../user_documentation/playlists/listen_playlist.md:63
+#: ../../user/playlists/listen.md:53
+#: ../../user/playlists/listen.md:63
 msgid "Select the orange play icon ({fa}`play`) on your selected playlist to start playing the content."
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:61
+#: ../../user/playlists/listen.md:61
 msgid "Select {menuselection}`Explore --> Playlists`. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/playlists/listen_playlist.md:67
+#: ../../user/playlists/listen.md:67
 msgid "That's it! The playlist's content appears in your [queue](../queue/index.md)."
 msgstr ""
diff --git a/docs/locales/gettext/user/plugins/index.pot b/docs/locales/gettext/user/plugins/index.pot
index 383561925..2e8265728 100644
--- a/docs/locales/gettext/user/plugins/index.pot
+++ b/docs/locales/gettext/user/plugins/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,18 +16,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/plugins/index.md:9
+#: ../../user/plugins/index.md:9
 msgid "Core plugins"
 msgstr ""
 
-#: ../../user_documentation/plugins/index.md:1
+#: ../../user/plugins/index.md:1
 msgid "User plugins"
 msgstr ""
 
-#: ../../user_documentation/plugins/index.md:4
+#: ../../user/plugins/index.md:4
 msgid "Your {term}`pod's <Pod>` admin needs to enable plugins for you to use them. If you can't find the plugins mentioned here, contact your pod admin."
 msgstr ""
 
-#: ../../user_documentation/plugins/index.md:7
+#: ../../user/plugins/index.md:7
 msgid "Use plugins to extend Funkwhale's features. The Funkwhale collective maintains core plugins to make your listening experience even better. Developers can create extra plugins to add features to a pod."
 msgstr ""
diff --git a/docs/locales/gettext/user/plugins/listenbrainz.pot b/docs/locales/gettext/user/plugins/listenbrainz.pot
index 4bef4b163..4b234ffd6 100644
--- a/docs/locales/gettext/user/plugins/listenbrainz.pot
+++ b/docs/locales/gettext/user/plugins/listenbrainz.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,66 +16,66 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:1
+#: ../../user/plugins/listenbrainz.md:1
 msgid "ListenBrainz plugin"
 msgstr ""
 
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:3
+#: ../../user/plugins/listenbrainz.md:3
 msgid "The **ListenBrainz** plugin enables you to submit ({term}`scrobble<Scrobbling>`) listens to your [ListenBrainz](https://listenbrainz.org) account. Scrobbling listens helps you build up a profile of your music tastes. It also enables you to keep a record of your listens. To set up the **ListenBrainz plugin**:"
 msgstr ""
 
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:0
+#: ../../user/plugins/listenbrainz.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:11
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:26
+#: ../../user/plugins/listenbrainz.md:11
+#: ../../user/plugins/listenbrainz.md:26
 msgid "Log in to your account."
 msgstr ""
 
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:12
+#: ../../user/plugins/listenbrainz.md:12
 msgid "Select the cog icon ({fa}`cog`) or your avatar to expand the user menu."
 msgstr ""
 
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:13
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:28
+#: ../../user/plugins/listenbrainz.md:13
+#: ../../user/plugins/listenbrainz.md:28
 msgid "Select {guilabel}`Settings`."
 msgstr ""
 
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:14
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:29
+#: ../../user/plugins/listenbrainz.md:14
+#: ../../user/plugins/listenbrainz.md:29
 msgid "Scroll down to the {guilabel}`Plugins` section."
 msgstr ""
 
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:15
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:30
+#: ../../user/plugins/listenbrainz.md:15
+#: ../../user/plugins/listenbrainz.md:30
 msgid "Select {guilabel}`Manage plugins`."
 msgstr ""
 
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:16
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:31
+#: ../../user/plugins/listenbrainz.md:16
+#: ../../user/plugins/listenbrainz.md:31
 msgid "Find the {guilabel}`ListenBrainz` plugin."
 msgstr ""
 
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:17
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:32
+#: ../../user/plugins/listenbrainz.md:17
+#: ../../user/plugins/listenbrainz.md:32
 msgid "Toggle the {guilabel}`Enabled` switch."
 msgstr ""
 
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:18
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:33
+#: ../../user/plugins/listenbrainz.md:18
+#: ../../user/plugins/listenbrainz.md:33
 msgid "Enter {guilabel}`Your ListenBrainz user token`. You can find this on your ListenBrainz profile."
 msgstr ""
 
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:19
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:34
+#: ../../user/plugins/listenbrainz.md:19
+#: ../../user/plugins/listenbrainz.md:34
 msgid "Select {guilabel}`Save`."
 msgstr ""
 
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:27
+#: ../../user/plugins/listenbrainz.md:27
 msgid "Select the cog icon ({fa}`cog`) or your avatar to open the {guilabel}`Options` menu."
 msgstr ""
 
-#: ../../user_documentation/plugins/listenbrainz_plugin.md:38
+#: ../../user/plugins/listenbrainz.md:38
 msgid "That's it! You've set up the **ListenBrainz** plugin. When you listen to tracks, the plugin sends the information to ListenBrainz."
 msgstr ""
diff --git a/docs/locales/gettext/user/plugins/maloja.pot b/docs/locales/gettext/user/plugins/maloja.pot
index b2280166c..eff577b9e 100644
--- a/docs/locales/gettext/user/plugins/maloja.pot
+++ b/docs/locales/gettext/user/plugins/maloja.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,75 +16,75 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/plugins/maloja_plugin.md:1
+#: ../../user/plugins/maloja.md:1
 msgid "Maloja plugin"
 msgstr ""
 
-#: ../../user_documentation/plugins/maloja_plugin.md:3
+#: ../../user/plugins/maloja.md:3
 msgid "The **Maloja** plugin enables you to submit ({term}`scrobble <Scrobbling>`) listens to your Maloja server. [Maloja](https://github.com/krateng/maloja) is a self-hosted scrobbling service similar to [Last.fm](https://last.fm) and [ListenBrainz](https://listenbrainz.org). Check out [their documentation](https://github.com/krateng/maloja#how-to-install) to set up your own server."
 msgstr ""
 
-#: ../../user_documentation/plugins/maloja_plugin.md:5
+#: ../../user/plugins/maloja.md:5
 msgid "Scrobbling listens helps you build up a profile of your music tastes. It also enables you to keep a record of your listens. To set up the **Maloja plugin**:"
 msgstr ""
 
-#: ../../user_documentation/plugins/maloja_plugin.md:0
+#: ../../user/plugins/maloja.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/plugins/maloja_plugin.md:13
-#: ../../user_documentation/plugins/maloja_plugin.md:29
+#: ../../user/plugins/maloja.md:13
+#: ../../user/plugins/maloja.md:29
 msgid "Log in to your account."
 msgstr ""
 
-#: ../../user_documentation/plugins/maloja_plugin.md:14
+#: ../../user/plugins/maloja.md:14
 msgid "Select the cog icon ({fa}`cog`) or your avatar to expand the user menu."
 msgstr ""
 
-#: ../../user_documentation/plugins/maloja_plugin.md:15
-#: ../../user_documentation/plugins/maloja_plugin.md:31
+#: ../../user/plugins/maloja.md:15
+#: ../../user/plugins/maloja.md:31
 msgid "Select {guilabel}`Settings`."
 msgstr ""
 
-#: ../../user_documentation/plugins/maloja_plugin.md:16
-#: ../../user_documentation/plugins/maloja_plugin.md:32
+#: ../../user/plugins/maloja.md:16
+#: ../../user/plugins/maloja.md:32
 msgid "Scroll down to the {guilabel}`Plugins` section."
 msgstr ""
 
-#: ../../user_documentation/plugins/maloja_plugin.md:17
-#: ../../user_documentation/plugins/maloja_plugin.md:33
+#: ../../user/plugins/maloja.md:17
+#: ../../user/plugins/maloja.md:33
 msgid "Select {guilabel}`Manage plugins`."
 msgstr ""
 
-#: ../../user_documentation/plugins/maloja_plugin.md:18
-#: ../../user_documentation/plugins/maloja_plugin.md:34
+#: ../../user/plugins/maloja.md:18
+#: ../../user/plugins/maloja.md:34
 msgid "Find the {guilabel}`Maloja` plugin."
 msgstr ""
 
-#: ../../user_documentation/plugins/maloja_plugin.md:19
-#: ../../user_documentation/plugins/maloja_plugin.md:35
+#: ../../user/plugins/maloja.md:19
+#: ../../user/plugins/maloja.md:35
 msgid "Toggle the {guilabel}`Enabled` switch."
 msgstr ""
 
-#: ../../user_documentation/plugins/maloja_plugin.md:20
-#: ../../user_documentation/plugins/maloja_plugin.md:36
+#: ../../user/plugins/maloja.md:20
+#: ../../user/plugins/maloja.md:36
 msgid "Enter your {guilabel}`Maloja server URL`. This is the URL you set up for your Maloja server."
 msgstr ""
 
-#: ../../user_documentation/plugins/maloja_plugin.md:21
-#: ../../user_documentation/plugins/maloja_plugin.md:37
+#: ../../user/plugins/maloja.md:21
+#: ../../user/plugins/maloja.md:37
 msgid "Enter {guilabel}`Your Maloja API key`. Check out [Maloja's documentation](https://github.com/krateng/maloja#how-to-scrobble) for more information."
 msgstr ""
 
-#: ../../user_documentation/plugins/maloja_plugin.md:22
-#: ../../user_documentation/plugins/maloja_plugin.md:38
+#: ../../user/plugins/maloja.md:22
+#: ../../user/plugins/maloja.md:38
 msgid "Select {guilabel}`Save`."
 msgstr ""
 
-#: ../../user_documentation/plugins/maloja_plugin.md:30
+#: ../../user/plugins/maloja.md:30
 msgid "Select the cog icon ({fa}`cog`) or your avatar to open the {guilabel}`Options` menu."
 msgstr ""
 
-#: ../../user_documentation/plugins/maloja_plugin.md:42
+#: ../../user/plugins/maloja.md:42
 msgid "That's it! You've set up the **Maloja** plugin. When you listen to tracks, the plugin sends the information to your Maloja server."
 msgstr ""
diff --git a/docs/locales/gettext/user/plugins/scrobbler.pot b/docs/locales/gettext/user/plugins/scrobbler.pot
index 9edfea97c..5e60fbf55 100644
--- a/docs/locales/gettext/user/plugins/scrobbler.pot
+++ b/docs/locales/gettext/user/plugins/scrobbler.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,88 +16,88 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:1
+#: ../../user/plugins/scrobbler.md:1
 msgid "Scrobbler plugin"
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:4
+#: ../../user/plugins/scrobbler.md:4
 msgid "If you want to use [Last.fm](https://last.fm) to scrobble your listens, your pod admin needs to set up an API account. Contact your {term}`pod` admin if you have any questions."
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:7
+#: ../../user/plugins/scrobbler.md:7
 msgid "The **Scrobbler** plugin enables you to submit ({term}`scrobble<Scrobbling>`) listens to a scrobbler service. Scrobbling listens helps you build up a profile of your music tastes. It also enables you to keep a record of your listens."
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:10
-msgid "Using ListenBrainz or Maloja? Check out the [ListenBrainz](listenbrainz_plugin) and [Maloja](maloja_plugin) plugins!"
+#: ../../user/plugins/scrobbler.md:10
+msgid "Using ListenBrainz or Maloja? Check out the [ListenBrainz](listenbrainz.md) and [Maloja](maloja.md) plugins!"
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:13
+#: ../../user/plugins/scrobbler.md:13
 msgid "The **Scrobbler** plugin supports any scrobbling service that uses the Audioscrobbler protocol. To set up the **Scrobbler plugin**:"
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:0
+#: ../../user/plugins/scrobbler.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:21
-#: ../../user_documentation/plugins/scrobbler_plugin.md:38
+#: ../../user/plugins/scrobbler.md:21
+#: ../../user/plugins/scrobbler.md:38
 msgid "Log in to your account."
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:22
+#: ../../user/plugins/scrobbler.md:22
 msgid "Select the cog icon ({fa}`cog`) or your avatar to expand the user menu."
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:23
-#: ../../user_documentation/plugins/scrobbler_plugin.md:40
+#: ../../user/plugins/scrobbler.md:23
+#: ../../user/plugins/scrobbler.md:40
 msgid "Select {guilabel}`Settings`."
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:24
-#: ../../user_documentation/plugins/scrobbler_plugin.md:41
+#: ../../user/plugins/scrobbler.md:24
+#: ../../user/plugins/scrobbler.md:41
 msgid "Scroll down to the {guilabel}`Plugins` section."
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:25
-#: ../../user_documentation/plugins/scrobbler_plugin.md:42
+#: ../../user/plugins/scrobbler.md:25
+#: ../../user/plugins/scrobbler.md:42
 msgid "Select {guilabel}`Manage plugins`."
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:26
-#: ../../user_documentation/plugins/scrobbler_plugin.md:43
+#: ../../user/plugins/scrobbler.md:26
+#: ../../user/plugins/scrobbler.md:43
 msgid "Find the {guilabel}`Scrobbler` plugin."
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:27
-#: ../../user_documentation/plugins/scrobbler_plugin.md:44
+#: ../../user/plugins/scrobbler.md:27
+#: ../../user/plugins/scrobbler.md:44
 msgid "Toggle the {guilabel}`Enabled` switch."
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:28
-#: ../../user_documentation/plugins/scrobbler_plugin.md:45
+#: ../../user/plugins/scrobbler.md:28
+#: ../../user/plugins/scrobbler.md:45
 msgid "Enter the {guilabel}`URL of the scrobbler service`. If you leave this field blank, the plugin defaults to **Last.fm**."
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:29
-#: ../../user_documentation/plugins/scrobbler_plugin.md:46
+#: ../../user/plugins/scrobbler.md:29
+#: ../../user/plugins/scrobbler.md:46
 msgid "Enter {guilabel}`Your scrobbler username`. You can set this up on your scrobbler service."
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:30
-#: ../../user_documentation/plugins/scrobbler_plugin.md:47
+#: ../../user/plugins/scrobbler.md:30
+#: ../../user/plugins/scrobbler.md:47
 msgid "Enter {guilabel}`Your scrobbler password`. You can set this up on your scrobbler service."
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:31
-#: ../../user_documentation/plugins/scrobbler_plugin.md:48
+#: ../../user/plugins/scrobbler.md:31
+#: ../../user/plugins/scrobbler.md:48
 msgid "Select {guilabel}`Save`."
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:39
+#: ../../user/plugins/scrobbler.md:39
 msgid "Select the cog icon ({fa}`cog`) or your avatar to open the {guilabel}`Options` menu."
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:52
+#: ../../user/plugins/scrobbler.md:52
 msgid "That's it! You've set up the **Scrobbler** plugin. When you listen to tracks, the plugin sends the information to your scrobbler service."
 msgstr ""
diff --git a/docs/locales/gettext/user/queue/album.pot b/docs/locales/gettext/user/queue/album.pot
index 9557231f3..200ac8de2 100644
--- a/docs/locales/gettext/user/queue/album.pot
+++ b/docs/locales/gettext/user/queue/album.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,70 +16,70 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/queue/add_album.md:1
+#: ../../user/queue/album.md:1
 msgid "Add albums to your queue"
 msgstr ""
 
-#: ../../user_documentation/queue/add_album.md:3
+#: ../../user/queue/album.md:3
 msgid "Add entire albums to your queue to start listening to them. Choose from the following **Play options**:"
 msgstr ""
 
-#: ../../user_documentation/queue/add_album.md:5
+#: ../../user/queue/album.md:5
 msgid "**Play** – remove all content from the queue and play the selected album."
 msgstr ""
 
-#: ../../user_documentation/queue/add_album.md:6
+#: ../../user/queue/album.md:6
 msgid "**Add to queue** – add the selected album to the end of the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_album.md:7
+#: ../../user/queue/album.md:7
 msgid "**Play next** – add the selected album to the next position in the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_album.md:8
+#: ../../user/queue/album.md:8
 msgid "**Play now** – play the selected album immediately but do not clear the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_album.md:10
+#: ../../user/queue/album.md:10
 msgid "You can add albums from the following places:"
 msgstr ""
 
-#: ../../user_documentation/queue/add_album.md:16
+#: ../../user/queue/album.md:16
 msgid "From the album details page"
 msgstr ""
 
-#: ../../user_documentation/queue/add_album.md:18
+#: ../../user/queue/album.md:18
 msgid "To add an album to the queue from the album details page:"
 msgstr ""
 
-#: ../../user_documentation/queue/add_album.md:20
+#: ../../user/queue/album.md:20
 msgid "Go to the album's details page."
 msgstr ""
 
-#: ../../user_documentation/queue/add_album.md:21
+#: ../../user/queue/album.md:21
 msgid "Select the orange play button ({fa}`play`) to **Play** the album. Select the dropdown icon ({fa}`caret-down`) to select a different **Play option**."
 msgstr ""
 
-#: ../../user_documentation/queue/add_album.md:23
+#: ../../user/queue/album.md:23
 msgid "You're done! You've added the album to your queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_album.md:25
+#: ../../user/queue/album.md:25
 msgid "From an album card"
 msgstr ""
 
-#: ../../user_documentation/queue/add_album.md:27
+#: ../../user/queue/album.md:27
 msgid "To add an album from its album card:"
 msgstr ""
 
-#: ../../user_documentation/queue/add_album.md:29
+#: ../../user/queue/album.md:29
 msgid "Find the album card in the interface."
 msgstr ""
 
-#: ../../user_documentation/queue/add_album.md:30
+#: ../../user/queue/album.md:30
 msgid "Select the orange play button ({fa}`play`) to **Play** the album. Select the kebab menu ({fa}`ellipsis-v`) to select a different **Play option**."
 msgstr ""
 
-#: ../../user_documentation/queue/add_album.md:32
+#: ../../user/queue/album.md:32
 msgid "That's it! You've added the album to your queue."
 msgstr ""
diff --git a/docs/locales/gettext/user/queue/artist.pot b/docs/locales/gettext/user/queue/artist.pot
index f109e27d3..47a32cc5a 100644
--- a/docs/locales/gettext/user/queue/artist.pot
+++ b/docs/locales/gettext/user/queue/artist.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,70 +16,70 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/queue/add_artist.md:1
+#: ../../user/queue/artist.md:1
 msgid "Add artist discographies to your queue"
 msgstr ""
 
-#: ../../user_documentation/queue/add_artist.md:3
+#: ../../user/queue/artist.md:3
 msgid "Add an artist's entire discography to your queue to start listening to it. Choose from the following **Play options**:"
 msgstr ""
 
-#: ../../user_documentation/queue/add_artist.md:5
+#: ../../user/queue/artist.md:5
 msgid "**Play** – remove all content from the queue and play the artist's discography."
 msgstr ""
 
-#: ../../user_documentation/queue/add_artist.md:6
+#: ../../user/queue/artist.md:6
 msgid "**Add to queue** – add the selected artist's discography to the end of the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_artist.md:7
+#: ../../user/queue/artist.md:7
 msgid "**Play next** – add the selected artist's discography to the next position in the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_artist.md:8
+#: ../../user/queue/artist.md:8
 msgid "**Play now** – play the artist's discography immediately but do not clear the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_artist.md:10
+#: ../../user/queue/artist.md:10
 msgid "You can add an artist's discography from the following places:"
 msgstr ""
 
-#: ../../user_documentation/queue/add_artist.md:16
+#: ../../user/queue/artist.md:16
 msgid "From the artist details page"
 msgstr ""
 
-#: ../../user_documentation/queue/add_artist.md:18
+#: ../../user/queue/artist.md:18
 msgid "To add an artist's discography to the queue from the artist details page:"
 msgstr ""
 
-#: ../../user_documentation/queue/add_artist.md:20
+#: ../../user/queue/artist.md:20
 msgid "Go to the artist's details page."
 msgstr ""
 
-#: ../../user_documentation/queue/add_artist.md:21
+#: ../../user/queue/artist.md:21
 msgid "Select the orange play button ({fa}`play`) to **Play** the album. Select the {guilabel}`More…` to select a different **Play option**."
 msgstr ""
 
-#: ../../user_documentation/queue/add_artist.md:23
+#: ../../user/queue/artist.md:23
 msgid "You're done! You've added the artist's discography to your queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_artist.md:25
+#: ../../user/queue/artist.md:25
 msgid "From an artist card"
 msgstr ""
 
-#: ../../user_documentation/queue/add_artist.md:27
+#: ../../user/queue/artist.md:27
 msgid "To add an artist's discography from their artist card:"
 msgstr ""
 
-#: ../../user_documentation/queue/add_artist.md:29
+#: ../../user/queue/artist.md:29
 msgid "Find the artist card in the interface."
 msgstr ""
 
-#: ../../user_documentation/queue/add_artist.md:30
+#: ../../user/queue/artist.md:30
 msgid "Select the orange play button ({fa}`play`) to **Play** the album. Select the kebab menu ({fa}`ellipsis-v`) to select a different **Play option**."
 msgstr ""
 
-#: ../../user_documentation/queue/add_artist.md:32
+#: ../../user/queue/artist.md:32
 msgid "That's it! You've added the artist's discography to your queue."
 msgstr ""
diff --git a/docs/locales/gettext/user/queue/index.pot b/docs/locales/gettext/user/queue/index.pot
index f26c167b1..eb94f567d 100644
--- a/docs/locales/gettext/user/queue/index.pot
+++ b/docs/locales/gettext/user/queue/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,18 +16,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/queue/index.md:7
+#: ../../user/queue/index.md:7
 msgid "Manage your queue"
 msgstr ""
 
-#: ../../user_documentation/queue/index.md:1
+#: ../../user/queue/index.md:1
 msgid "Queue"
 msgstr ""
 
-#: ../../user_documentation/queue/index.md:3
+#: ../../user/queue/index.md:3
 msgid "Use the audio queue to manage audio playback. You can add tracks, albums, series, artist discographies, and playlists to your queue."
 msgstr ""
 
-#: ../../user_documentation/queue/index.md:5
+#: ../../user/queue/index.md:5
 msgid "Follow the guides in this section to get started."
 msgstr ""
diff --git a/docs/locales/gettext/user/queue/playlist.pot b/docs/locales/gettext/user/queue/playlist.pot
index ea9f3458d..71eca9475 100644
--- a/docs/locales/gettext/user/queue/playlist.pot
+++ b/docs/locales/gettext/user/queue/playlist.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,70 +16,70 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/queue/add_playlist.md:1
+#: ../../user/queue/playlist.md:1
 msgid "Add playlists to your queue"
 msgstr ""
 
-#: ../../user_documentation/queue/add_playlist.md:3
+#: ../../user/queue/playlist.md:3
 msgid "Add entire playlists to your queue to start listening to them. Choose from the following **Play options**:"
 msgstr ""
 
-#: ../../user_documentation/queue/add_playlist.md:5
+#: ../../user/queue/playlist.md:5
 msgid "**Play** – remove all content from the queue and play the selected playlist."
 msgstr ""
 
-#: ../../user_documentation/queue/add_playlist.md:6
+#: ../../user/queue/playlist.md:6
 msgid "**Add to queue** – add the selected playlist to the end of the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_playlist.md:7
+#: ../../user/queue/playlist.md:7
 msgid "**Play next** – add the selected playlist to the next position in the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_playlist.md:8
+#: ../../user/queue/playlist.md:8
 msgid "**Play now** – play the selected playlist immediately but do not clear the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_playlist.md:10
+#: ../../user/queue/playlist.md:10
 msgid "You can add playlists from the following places:"
 msgstr ""
 
-#: ../../user_documentation/queue/add_playlist.md:16
+#: ../../user/queue/playlist.md:16
 msgid "From the playlist details page"
 msgstr ""
 
-#: ../../user_documentation/queue/add_playlist.md:18
+#: ../../user/queue/playlist.md:18
 msgid "To add an playlist to the queue from the playlist details page:"
 msgstr ""
 
-#: ../../user_documentation/queue/add_playlist.md:20
+#: ../../user/queue/playlist.md:20
 msgid "Go to the playlist's details page."
 msgstr ""
 
-#: ../../user_documentation/queue/add_playlist.md:21
+#: ../../user/queue/playlist.md:21
 msgid "Select {guilabel}`Play all` to **Play** the playlist. Select the dropdown icon ({fa}`caret-down`) to select a different **Play option**."
 msgstr ""
 
-#: ../../user_documentation/queue/add_playlist.md:23
+#: ../../user/queue/playlist.md:23
 msgid "You're done! You've added the playlist to your queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_playlist.md:25
+#: ../../user/queue/playlist.md:25
 msgid "From an playlist card"
 msgstr ""
 
-#: ../../user_documentation/queue/add_playlist.md:27
+#: ../../user/queue/playlist.md:27
 msgid "To add an playlist from its playlist card:"
 msgstr ""
 
-#: ../../user_documentation/queue/add_playlist.md:29
+#: ../../user/queue/playlist.md:29
 msgid "Find the playlist card in the interface."
 msgstr ""
 
-#: ../../user_documentation/queue/add_playlist.md:30
+#: ../../user/queue/playlist.md:30
 msgid "Select the orange play button ({fa}`play`) to **Play** the playlist. Select the kebab menu ({fa}`ellipsis-v`) to select a different **Play option**."
 msgstr ""
 
-#: ../../user_documentation/queue/add_playlist.md:32
+#: ../../user/queue/playlist.md:32
 msgid "That's it! You've added the playlist to your queue."
 msgstr ""
diff --git a/docs/locales/gettext/user/queue/rearrange.pot b/docs/locales/gettext/user/queue/rearrange.pot
index e34afe2ea..39118b324 100644
--- a/docs/locales/gettext/user/queue/rearrange.pot
+++ b/docs/locales/gettext/user/queue/rearrange.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,34 +16,34 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/queue/rearrange_content.md:1
+#: ../../user/queue/rearrange.md:1
 msgid "Rearrange content in your queue"
 msgstr ""
 
-#: ../../user_documentation/queue/rearrange_content.md:4
+#: ../../user/queue/rearrange.md:4
 msgid "Rearranging content is currently only supported on the desktop."
 msgstr ""
 
-#: ../../user_documentation/queue/rearrange_content.md:7
+#: ../../user/queue/rearrange.md:7
 msgid "You can change the order of content in your queue at any time. To do this:"
 msgstr ""
 
-#: ../../user_documentation/queue/rearrange_content.md:9
+#: ../../user/queue/rearrange.md:9
 msgid "Select the up arrow ({fa}`caret-up`) on the queue menu to expand the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/rearrange_content.md:10
+#: ../../user/queue/rearrange.md:10
 msgid "Pick up tracks by selecting the grip lines on the left. Your mouse pointer shows a hand ({fa}`hand-grab-o`)."
 msgstr ""
 
-#: ../../user_documentation/queue/rearrange_content.md:11
+#: ../../user/queue/rearrange.md:11
 msgid "Drop the tracks in their new position in the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/rearrange_content.md:12
+#: ../../user/queue/rearrange.md:12
 msgid "Select {guilabel}`Close` to close the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/rearrange_content.md:14
+#: ../../user/queue/rearrange.md:14
 msgid "That's it! You've rearranged the content in your queue."
 msgstr ""
diff --git a/docs/locales/gettext/user/queue/remove.pot b/docs/locales/gettext/user/queue/remove.pot
index b7c3ab151..5964d1d4c 100644
--- a/docs/locales/gettext/user/queue/remove.pot
+++ b/docs/locales/gettext/user/queue/remove.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,68 +16,68 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/queue/remove_content.md:1
+#: ../../user/queue/remove.md:1
 msgid "Remove content from your queue"
 msgstr ""
 
-#: ../../user_documentation/queue/remove_content.md:4
+#: ../../user/queue/remove.md:4
 msgid "If you remove the currently playing track, the next item in the queue plays. If you remove all items, the queue closes."
 msgstr ""
 
-#: ../../user_documentation/queue/remove_content.md:7
+#: ../../user/queue/remove.md:7
 msgid "You can remove content from your queue at any time. You can choose between the following options:"
 msgstr ""
 
-#: ../../user_documentation/queue/remove_content.md:13
+#: ../../user/queue/remove.md:13
 msgid "Remove individual tracks from the queue"
 msgstr ""
 
-#: ../../user_documentation/queue/remove_content.md:15
+#: ../../user/queue/remove.md:15
 msgid "To remove individual tracks from the queue:"
 msgstr ""
 
-#: ../../user_documentation/queue/remove_content.md:0
+#: ../../user/queue/remove.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/queue/remove_content.md:23
-#: ../../user_documentation/queue/remove_content.md:32
-#: ../../user_documentation/queue/remove_content.md:49
-#: ../../user_documentation/queue/remove_content.md:58
+#: ../../user/queue/remove.md:23
+#: ../../user/queue/remove.md:32
+#: ../../user/queue/remove.md:49
+#: ../../user/queue/remove.md:58
 msgid "Select the up arrow ({fa}`caret-up`) on the queue menu to expand the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/remove_content.md:24
-#: ../../user_documentation/queue/remove_content.md:33
+#: ../../user/queue/remove.md:24
+#: ../../user/queue/remove.md:33
 msgid "Select the delete icon ({fa}`times`) next to the track you want to remove."
 msgstr ""
 
-#: ../../user_documentation/queue/remove_content.md:0
+#: ../../user/queue/remove.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/queue/remove_content.md:31
-#: ../../user_documentation/queue/remove_content.md:57
+#: ../../user/queue/remove.md:31
+#: ../../user/queue/remove.md:57
 msgid "Select the player bar at the bottom of the screen to expand the player."
 msgstr ""
 
-#: ../../user_documentation/queue/remove_content.md:37
+#: ../../user/queue/remove.md:37
 msgid "That's it! You've removed tracks from your queue."
 msgstr ""
 
-#: ../../user_documentation/queue/remove_content.md:39
+#: ../../user/queue/remove.md:39
 msgid "Remove all content from the queue"
 msgstr ""
 
-#: ../../user_documentation/queue/remove_content.md:41
+#: ../../user/queue/remove.md:41
 msgid "To remove all content from your queue at once:"
 msgstr ""
 
-#: ../../user_documentation/queue/remove_content.md:50
-#: ../../user_documentation/queue/remove_content.md:59
+#: ../../user/queue/remove.md:50
+#: ../../user/queue/remove.md:59
 msgid "Select {guilabel}`Clear` to remove all content from the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/remove_content.md:63
+#: ../../user/queue/remove.md:63
 msgid "That's it! You've removed all content from your queue."
 msgstr ""
diff --git a/docs/locales/gettext/user/queue/series.pot b/docs/locales/gettext/user/queue/series.pot
index 322f3c73a..b3d33b771 100644
--- a/docs/locales/gettext/user/queue/series.pot
+++ b/docs/locales/gettext/user/queue/series.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,42 +16,42 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/queue/add_series.md:1
+#: ../../user/queue/series.md:1
 msgid "Add series to your queue"
 msgstr ""
 
-#: ../../user_documentation/queue/add_series.md:3
+#: ../../user/queue/series.md:3
 msgid "Add entire series to your queue to start listening to them. Choose from the following **Play options**:"
 msgstr ""
 
-#: ../../user_documentation/queue/add_series.md:5
+#: ../../user/queue/series.md:5
 msgid "**Play** – remove all content from the queue and play the selected series."
 msgstr ""
 
-#: ../../user_documentation/queue/add_series.md:6
+#: ../../user/queue/series.md:6
 msgid "**Add to queue** – add the selected series to the end of the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_series.md:7
+#: ../../user/queue/series.md:7
 msgid "**Play next** – add the selected series to the next position in the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_series.md:8
+#: ../../user/queue/series.md:8
 msgid "**Play now** – play the selected series immediately but do not clear the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_series.md:10
+#: ../../user/queue/series.md:10
 msgid "To add a series to the queue from the album details page:"
 msgstr ""
 
-#: ../../user_documentation/queue/add_series.md:12
+#: ../../user/queue/series.md:12
 msgid "Go to the series' details page."
 msgstr ""
 
-#: ../../user_documentation/queue/add_series.md:13
+#: ../../user/queue/series.md:13
 msgid "Select the orange play button ({fa}`play`) to **Play** the series. Select the dropdown icon ({fa}`caret-down`) to select a different **Play option**."
 msgstr ""
 
-#: ../../user_documentation/queue/add_series.md:15
+#: ../../user/queue/series.md:15
 msgid "You're done! You've added the series to your queue."
 msgstr ""
diff --git a/docs/locales/gettext/user/queue/tracks.pot b/docs/locales/gettext/user/queue/tracks.pot
index 18f09e9bc..84a6ad3ec 100644
--- a/docs/locales/gettext/user/queue/tracks.pot
+++ b/docs/locales/gettext/user/queue/tracks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,42 +16,42 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/queue/add_tracks.md:1
+#: ../../user/queue/tracks.md:1
 msgid "Add tracks to your queue"
 msgstr ""
 
-#: ../../user_documentation/queue/add_tracks.md:3
+#: ../../user/queue/tracks.md:3
 msgid "Add tracks to your queue to start listening to them. Choose from the following **Play options**:"
 msgstr ""
 
-#: ../../user_documentation/queue/add_tracks.md:5
+#: ../../user/queue/tracks.md:5
 msgid "**Play** – remove all content from the queue and play the selected track."
 msgstr ""
 
-#: ../../user_documentation/queue/add_tracks.md:6
+#: ../../user/queue/tracks.md:6
 msgid "**Add to queue** – add the selected track to the end of the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_tracks.md:7
+#: ../../user/queue/tracks.md:7
 msgid "**Play next** – add the selected track to the next position in the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_tracks.md:8
+#: ../../user/queue/tracks.md:8
 msgid "**Play now** – play the selected track immediately but do not clear the queue."
 msgstr ""
 
-#: ../../user_documentation/queue/add_tracks.md:10
+#: ../../user/queue/tracks.md:10
 msgid "To add a track to the queue:"
 msgstr ""
 
-#: ../../user_documentation/queue/add_tracks.md:12
+#: ../../user/queue/tracks.md:12
 msgid "Find your track in a track table."
 msgstr ""
 
-#: ../../user_documentation/queue/add_tracks.md:13
+#: ../../user/queue/tracks.md:13
 msgid "Select the orange play button ({fa}`play`) to **Play** the track. Select the kebab menu ({fa}`ellipsis-v`) to select a different **Play option**."
 msgstr ""
 
-#: ../../user_documentation/queue/add_tracks.md:15
+#: ../../user/queue/tracks.md:15
 msgid "That's it! You've added the track to your queue."
 msgstr ""
diff --git a/docs/locales/gettext/user/radios/create.pot b/docs/locales/gettext/user/radios/create.pot
index d5d5d1bb7..2002d3603 100644
--- a/docs/locales/gettext/user/radios/create.pot
+++ b/docs/locales/gettext/user/radios/create.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,102 +16,102 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/radios/create_radio.md:1
+#: ../../user/radios/create.md:1
 msgid "Create a radio"
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:4
+#: ../../user/radios/create.md:4
 msgid "If you add content from a __private__ library to a __public__ radio, users can see the tracks but can't play them."
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:7
+#: ../../user/radios/create.md:7
 msgid "Create a new radio to create a dynamic playlist of content based on filters. You can filter tracks by **Artist** and **Tag**."
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:9
+#: ../../user/radios/create.md:9
 msgid "To create a new radio:"
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:0
+#: ../../user/radios/create.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:17
+#: ../../user/radios/create.md:17
 msgid "Select {guilabel}`Radios` in the sidebar. The {guilabel}`Browsing radios` screen opens."
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:18
-#: ../../user_documentation/radios/create_radio.md:38
+#: ../../user/radios/create.md:18
+#: ../../user/radios/create.md:38
 msgid "Select {guilabel}`Create your own radio` under the {guilabel}`User radios` section. The {guilabel}`Builder` screen opens."
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:19
-#: ../../user_documentation/radios/create_radio.md:39
+#: ../../user/radios/create.md:19
+#: ../../user/radios/create.md:39
 msgid "Enter a {guilabel}`Radio name`."
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:20
-#: ../../user_documentation/radios/create_radio.md:40
+#: ../../user/radios/create.md:20
+#: ../../user/radios/create.md:40
 msgid "**Optional** – enter a {guilabel}`Description` for your radio."
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:21
-#: ../../user_documentation/radios/create_radio.md:41
+#: ../../user/radios/create.md:21
+#: ../../user/radios/create.md:41
 msgid "To make your radio available to other users on your {term}`pod`, enable the {guilabel}`Display publicly` switch. If you disable this switch, only you can see the radio."
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:22
-#: ../../user_documentation/radios/create_radio.md:42
+#: ../../user/radios/create.md:22
+#: ../../user/radios/create.md:42
 msgid "Select {guilabel}`Artist` or {guilabel}`Tag` from the {guilabel}`Select a filter` dropdown."
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:23
-#: ../../user_documentation/radios/create_radio.md:43
+#: ../../user/radios/create.md:23
+#: ../../user/radios/create.md:43
 msgid "Select {guilabel}`Add filter` to add the filter to your radio."
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:24
-#: ../../user_documentation/radios/create_radio.md:44
+#: ../../user/radios/create.md:24
+#: ../../user/radios/create.md:44
 msgid "Configure your filter:"
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:25
-#: ../../user_documentation/radios/create_radio.md:45
+#: ../../user/radios/create.md:25
+#: ../../user/radios/create.md:45
 msgid "Enable the {guilabel}`Exclude` switch to exclude results from your selection in the radio. Disable this switch to include results from your selection in the radio."
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:26
-#: ../../user_documentation/radios/create_radio.md:46
+#: ../../user/radios/create.md:26
+#: ../../user/radios/create.md:46
 msgid "Choose your **Artists** or **Tags** in the {guilabel}`Config` dropdown menu."
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:27
-#: ../../user_documentation/radios/create_radio.md:47
+#: ../../user/radios/create.md:27
+#: ../../user/radios/create.md:47
 msgid "The {guilabel}`Candidates` column shows the number of tracks included. Select the {guilabel}`{count} tracks matching filter` option to view some of these tracks."
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:28
-#: ../../user_documentation/radios/create_radio.md:48
+#: ../../user/radios/create.md:28
+#: ../../user/radios/create.md:48
 msgid "Check the tracks under the {guilabel}`{count} tracks matching combined filters` section."
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:29
-#: ../../user_documentation/radios/create_radio.md:49
+#: ../../user/radios/create.md:29
+#: ../../user/radios/create.md:49
 msgid "Select {guilabel}`Save` to save your radio."
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:0
+#: ../../user/radios/create.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:36
+#: ../../user/radios/create.md:36
 msgid "Select the hamburger menu ({fa}`bars`) to open the menu bar."
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:37
+#: ../../user/radios/create.md:37
 msgid "Select {menuselection}`Explore --> Radios` or {menuselection}`My Library --> Radios`. The {guilabel}`Browsing radios` screen opens."
 msgstr ""
 
-#: ../../user_documentation/radios/create_radio.md:53
+#: ../../user/radios/create.md:53
 msgid "You're done! You can now play your radio."
 msgstr ""
diff --git a/docs/locales/gettext/user/radios/delete.pot b/docs/locales/gettext/user/radios/delete.pot
index d604d3ce0..d08ef3be3 100644
--- a/docs/locales/gettext/user/radios/delete.pot
+++ b/docs/locales/gettext/user/radios/delete.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,53 +16,53 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/radios/delete_radio.md:1
+#: ../../user/radios/delete.md:1
 msgid "Delete a radio"
 msgstr ""
 
-#: ../../user_documentation/radios/delete_radio.md:4
+#: ../../user/radios/delete.md:4
 msgid "Users who have access to your radio won't be able to access it when you delete it. This action is irreversible."
 msgstr ""
 
-#: ../../user_documentation/radios/delete_radio.md:7
+#: ../../user/radios/delete.md:7
 msgid "If you no longer want a radio, you can delete it. To do this:"
 msgstr ""
 
-#: ../../user_documentation/radios/delete_radio.md:0
+#: ../../user/radios/delete.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/radios/delete_radio.md:15
+#: ../../user/radios/delete.md:15
 msgid "Select {guilabel}`Radios` in the sidebar. The {guilabel}`Browsing radios` screen opens."
 msgstr ""
 
-#: ../../user_documentation/radios/delete_radio.md:16
-#: ../../user_documentation/radios/delete_radio.md:27
+#: ../../user/radios/delete.md:16
+#: ../../user/radios/delete.md:27
 msgid "Select your radio under the {guilabel}`User radios` section. The radio details screen opens."
 msgstr ""
 
-#: ../../user_documentation/radios/delete_radio.md:17
-#: ../../user_documentation/radios/delete_radio.md:28
+#: ../../user/radios/delete.md:17
+#: ../../user/radios/delete.md:28
 msgid "Select {guilabel}`Delete`. A {guilabel}`Do you want to delete the radio` warning appears."
 msgstr ""
 
-#: ../../user_documentation/radios/delete_radio.md:18
-#: ../../user_documentation/radios/delete_radio.md:29
+#: ../../user/radios/delete.md:18
+#: ../../user/radios/delete.md:29
 msgid "Select {guilabel}`Delete radio`."
 msgstr ""
 
-#: ../../user_documentation/radios/delete_radio.md:0
+#: ../../user/radios/delete.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/radios/delete_radio.md:25
+#: ../../user/radios/delete.md:25
 msgid "Select the hamburger menu ({fa}`bars`) to open the menu bar."
 msgstr ""
 
-#: ../../user_documentation/radios/delete_radio.md:26
+#: ../../user/radios/delete.md:26
 msgid "Select {menuselection}`Explore --> Radios` or {menuselection}`My Library --> Radios`. The {guilabel}`Browsing radios` screen opens."
 msgstr ""
 
-#: ../../user_documentation/radios/delete_radio.md:33
-msgid "That's it! You've deleted your radio. You can [create a new one](create_radio.md) at any time."
+#: ../../user/radios/delete.md:33
+msgid "That's it! You've deleted your radio. You can [create a new one](create.md) at any time."
 msgstr ""
diff --git a/docs/locales/gettext/user/radios/edit.pot b/docs/locales/gettext/user/radios/edit.pot
index 3285c1a85..0a35a110a 100644
--- a/docs/locales/gettext/user/radios/edit.pot
+++ b/docs/locales/gettext/user/radios/edit.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,69 +16,69 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/radios/edit_radio.md:1
+#: ../../user/radios/edit.md:1
 msgid "Edit a radio"
 msgstr ""
 
-#: ../../user_documentation/radios/edit_radio.md:3
+#: ../../user/radios/edit.md:3
 msgid "You can edit a radio at any time to change its details, its filters, or both. To do this:"
 msgstr ""
 
-#: ../../user_documentation/radios/edit_radio.md:0
+#: ../../user/radios/edit.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/radios/edit_radio.md:11
+#: ../../user/radios/edit.md:11
 msgid "Select {guilabel}`Radios` in the sidebar. The {guilabel}`Browsing radios` screen opens."
 msgstr ""
 
-#: ../../user_documentation/radios/edit_radio.md:12
-#: ../../user_documentation/radios/edit_radio.md:27
+#: ../../user/radios/edit.md:12
+#: ../../user/radios/edit.md:27
 msgid "Find your radio under the {guilabel}`User radios` section. Select {guilabel}`Edit`. The {guilabel}`Builder` screen opens."
 msgstr ""
 
-#: ../../user_documentation/radios/edit_radio.md:13
-#: ../../user_documentation/radios/edit_radio.md:28
+#: ../../user/radios/edit.md:13
+#: ../../user/radios/edit.md:28
 msgid "Edit any of the following:"
 msgstr ""
 
-#: ../../user_documentation/radios/edit_radio.md:14
-#: ../../user_documentation/radios/edit_radio.md:29
+#: ../../user/radios/edit.md:14
+#: ../../user/radios/edit.md:29
 msgid "{guilabel}`Radio name`."
 msgstr ""
 
-#: ../../user_documentation/radios/edit_radio.md:15
-#: ../../user_documentation/radios/edit_radio.md:30
+#: ../../user/radios/edit.md:15
+#: ../../user/radios/edit.md:30
 msgid "{guilabel}`Description`."
 msgstr ""
 
-#: ../../user_documentation/radios/edit_radio.md:16
-#: ../../user_documentation/radios/edit_radio.md:31
+#: ../../user/radios/edit.md:16
+#: ../../user/radios/edit.md:31
 msgid "{guilabel}`Display publicly`."
 msgstr ""
 
-#: ../../user_documentation/radios/edit_radio.md:17
-#: ../../user_documentation/radios/edit_radio.md:32
+#: ../../user/radios/edit.md:17
+#: ../../user/radios/edit.md:32
 msgid "Select {guilabel}`Add filter` to add new filters. Select {guilabel}`Remove` to remove existing filters."
 msgstr ""
 
-#: ../../user_documentation/radios/edit_radio.md:18
-#: ../../user_documentation/radios/edit_radio.md:33
+#: ../../user/radios/edit.md:18
+#: ../../user/radios/edit.md:33
 msgid "Select {guilabel}`Save` to save your radio."
 msgstr ""
 
-#: ../../user_documentation/radios/edit_radio.md:0
+#: ../../user/radios/edit.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/radios/edit_radio.md:25
+#: ../../user/radios/edit.md:25
 msgid "Select the hamburger menu ({fa}`bars`) to open the menu bar."
 msgstr ""
 
-#: ../../user_documentation/radios/edit_radio.md:26
+#: ../../user/radios/edit.md:26
 msgid "Select {menuselection}`Explore --> Radios` or {menuselection}`My Library --> Radios`. The {guilabel}`Browsing radios` screen opens."
 msgstr ""
 
-#: ../../user_documentation/radios/edit_radio.md:37
+#: ../../user/radios/edit.md:37
 msgid "That's it! You've updated your radio's details."
 msgstr ""
diff --git a/docs/locales/gettext/user/radios/index.pot b/docs/locales/gettext/user/radios/index.pot
index 3c8f63ed2..f6c0477c1 100644
--- a/docs/locales/gettext/user/radios/index.pot
+++ b/docs/locales/gettext/user/radios/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,38 +16,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/radios/index.md:13
+#: ../../user/radios/index.md:13
 msgid "Manage your radios"
 msgstr ""
 
-#: ../../user_documentation/radios/index.md:1
+#: ../../user/radios/index.md:1
 msgid "Radios"
 msgstr ""
 
-#: ../../user_documentation/radios/index.md:3
+#: ../../user/radios/index.md:3
 msgid "Radios are a great way to discover new music or rediscover old favorites. A radio builds a dynamic playlist of content based on selected criteria. Create genre and artist radios, or tune in to one of Funkwhale's built-in radios."
 msgstr ""
 
-#: ../../user_documentation/radios/index.md:5
+#: ../../user/radios/index.md:5
 msgid "Funkwhale offers the following radios out of the box:"
 msgstr ""
 
-#: ../../user_documentation/radios/index.md:7
+#: ../../user/radios/index.md:7
 msgid "**Your content** – listen to content from [libraries](../libraries/index.md) you own."
 msgstr ""
 
-#: ../../user_documentation/radios/index.md:8
+#: ../../user/radios/index.md:8
 msgid "**Favorites** – listen to tracks from your [favorites](../favorites/index.md) list."
 msgstr ""
 
-#: ../../user_documentation/radios/index.md:9
+#: ../../user/radios/index.md:9
 msgid "**Random** – discover something new by letting Funkwhale choose tracks at random."
 msgstr ""
 
-#: ../../user_documentation/radios/index.md:10
+#: ../../user/radios/index.md:10
 msgid "**Recently Added** – listen to the latest content added to your {term}`pod`."
 msgstr ""
 
-#: ../../user_documentation/radios/index.md:11
+#: ../../user/radios/index.md:11
 msgid "**Less listened** – check out tracks you've not heard, or things you haven't given as much attention."
 msgstr ""
diff --git a/docs/locales/gettext/user/radios/listen.pot b/docs/locales/gettext/user/radios/listen.pot
index b7667e69e..5a892b517 100644
--- a/docs/locales/gettext/user/radios/listen.pot
+++ b/docs/locales/gettext/user/radios/listen.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,113 +16,113 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/radios/listen_radio.md:1
+#: ../../user/radios/listen.md:1
 msgid "Listen to a radio"
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:4
-msgid "You can only listen to content in libraries you have access to. For more information, see [Follow a library](../libraries/follow_library)."
+#: ../../user/radios/listen.md:4
+msgid "You can only listen to content in libraries you have access to. For more information, see [Follow a library](../libraries/follow)."
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:7
+#: ../../user/radios/listen.md:7
 msgid "You can listen to your radios or public radios created by other users of your {term}`pod`."
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:13
+#: ../../user/radios/listen.md:13
 msgid "Listen to your radios"
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:15
+#: ../../user/radios/listen.md:15
 msgid "To listen to radios you created:"
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:0
+#: ../../user/radios/listen.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:23
+#: ../../user/radios/listen.md:23
 msgid "Select {menuselection}`My Library --> Radios` in the sidebar. The {guilabel}`Browsing radios` screen opens."
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:24
-#: ../../user_documentation/radios/listen_radio.md:34
+#: ../../user/radios/listen.md:24
+#: ../../user/radios/listen.md:34
 msgid "Use the filters in the {guilabel}`User radios` section to search for your radio."
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:25
-#: ../../user_documentation/radios/listen_radio.md:35
+#: ../../user/radios/listen.md:25
+#: ../../user/radios/listen.md:35
 msgid "Select {guilabel}`Play radio` on your radio to start playing the content."
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:0
+#: ../../user/radios/listen.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:32
-#: ../../user_documentation/radios/listen_radio.md:60
+#: ../../user/radios/listen.md:32
+#: ../../user/radios/listen.md:60
 msgid "Select the hamburger menu ({fa}`bars`) to open the menu bar."
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:33
+#: ../../user/radios/listen.md:33
 msgid "Select {menuselection}`My Library --> Radios`. The {guilabel}`Browsing radios` screen opens."
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:39
+#: ../../user/radios/listen.md:39
 msgid "You're done! Your radio starts playing."
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:41
+#: ../../user/radios/listen.md:41
 msgid "Listen to public radios from your pod"
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:43
+#: ../../user/radios/listen.md:43
 msgid "To listen to public radios other users created:"
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:51
+#: ../../user/radios/listen.md:51
 msgid "Select {menuselection}`Explore --> Radios` in the sidebar. The {guilabel}`Browsing radios` screen opens."
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:52
-#: ../../user_documentation/radios/listen_radio.md:62
+#: ../../user/radios/listen.md:52
+#: ../../user/radios/listen.md:62
 msgid "Use the filters in the {guilabel}`User radios` section to search for a radio."
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:53
-#: ../../user_documentation/radios/listen_radio.md:63
+#: ../../user/radios/listen.md:53
+#: ../../user/radios/listen.md:63
 msgid "Select {guilabel}`Play radio` on the selected radio to start playing the content."
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:61
+#: ../../user/radios/listen.md:61
 msgid "Select {menuselection}`Explore --> Radios`. The {guilabel}`Browsing radios` screen opens."
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:67
+#: ../../user/radios/listen.md:67
 msgid "That's it! The radio starts playing."
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:69
+#: ../../user/radios/listen.md:69
 msgid "Stop a radio"
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:71
+#: ../../user/radios/listen.md:71
 msgid "Radios continue to play until there is no more content matching their criteria. You can stop radios whenever you want. To do this:"
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:79
-#: ../../user_documentation/radios/listen_radio.md:88
+#: ../../user/radios/listen.md:79
+#: ../../user/radios/listen.md:88
 msgid "Select the up arrow ({fa}`caret-up`) on the queue menu to expand the [queue](../queue/index.md)."
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:80
-#: ../../user_documentation/radios/listen_radio.md:89
+#: ../../user/radios/listen.md:80
+#: ../../user/radios/listen.md:89
 msgid "Select {guilabel}`Stop Radio` at the bottom of the queue."
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:87
+#: ../../user/radios/listen.md:87
 msgid "Select the player bar at the bottom of the screen to expand the player."
 msgstr ""
 
-#: ../../user_documentation/radios/listen_radio.md:93
+#: ../../user/radios/listen.md:93
 msgid "That's it! The radio stops playing. The radio's content remains in the queue."
 msgstr ""
diff --git a/docs/locales/gettext/user/reports/account.pot b/docs/locales/gettext/user/reports/account.pot
index 446d4d40c..5ca035477 100644
--- a/docs/locales/gettext/user/reports/account.pot
+++ b/docs/locales/gettext/user/reports/account.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,58 +16,58 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/reports/report_account.md:1
+#: ../../user/reports/account.md:1
 msgid "Report an account"
 msgstr ""
 
-#: ../../user_documentation/reports/report_account.md:3
+#: ../../user/reports/account.md:3
 msgid "You can report a user account if the user is breaking the {term}`pod's <Pod>` rules. To do this:"
 msgstr ""
 
-#: ../../user_documentation/reports/report_account.md:5
+#: ../../user/reports/account.md:5
 msgid "Select the user's username to go to their profile page."
 msgstr ""
 
-#: ../../user_documentation/reports/report_account.md:6
+#: ../../user/reports/account.md:6
 msgid "Select the kebab menu ({fa}`ellipsis-v`) to open the options menu."
 msgstr ""
 
-#: ../../user_documentation/reports/report_account.md:7
+#: ../../user/reports/account.md:7
 msgid "Select {guilabel}`Report {username}`. A {guilabel}`Do you want to report this object?` menu appears."
 msgstr ""
 
-#: ../../user_documentation/reports/report_account.md:8
+#: ../../user/reports/account.md:8
 msgid "Select a {guilabel}`Category`. Choose one of the following:"
 msgstr ""
 
-#: ../../user_documentation/reports/report_account.md:9
+#: ../../user/reports/account.md:9
 msgid "**Takedown request** – request removal of copyrighted material."
 msgstr ""
 
-#: ../../user_documentation/reports/report_account.md:10
+#: ../../user/reports/account.md:10
 msgid "**Illegal content** – report an account that features illegal content."
 msgstr ""
 
-#: ../../user_documentation/reports/report_account.md:11
+#: ../../user/reports/account.md:11
 msgid "**Offensive content** – report an account that features offensive or abusive content."
 msgstr ""
 
-#: ../../user_documentation/reports/report_account.md:12
+#: ../../user/reports/account.md:12
 msgid "**Other** – submit details of your report in the {guilabel}`Message` field."
 msgstr ""
 
-#: ../../user_documentation/reports/report_account.md:13
+#: ../../user/reports/account.md:13
 msgid "**If you are not logged in** – enter your {guilabel}`Email`. Pod moderators use this address to contact you."
 msgstr ""
 
-#: ../../user_documentation/reports/report_account.md:14
+#: ../../user/reports/account.md:14
 msgid "Enter details of your report in the {guilabel}`Message` field. Provide as much detail as possible here to help the moderators action the report."
 msgstr ""
 
-#: ../../user_documentation/reports/report_account.md:15
+#: ../../user/reports/account.md:15
 msgid "Select {guilabel}`Submit report` to send your report to the pod moderators."
 msgstr ""
 
-#: ../../user_documentation/reports/report_account.md:17
+#: ../../user/reports/account.md:17
 msgid "That's it! The pod's moderators can now action the report or contact you for clarification."
 msgstr ""
diff --git a/docs/locales/gettext/user/reports/album.pot b/docs/locales/gettext/user/reports/album.pot
index b23613bd9..e3a1dcce5 100644
--- a/docs/locales/gettext/user/reports/album.pot
+++ b/docs/locales/gettext/user/reports/album.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,62 +16,62 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/reports/report_album.md:1
+#: ../../user/reports/album.md:1
 msgid "Report an album"
 msgstr ""
 
-#: ../../user_documentation/reports/report_album.md:3
+#: ../../user/reports/album.md:3
 msgid "If an album violates a {term}`pod's <Pod>` rules or the law, you can report it. To do this:"
 msgstr ""
 
-#: ../../user_documentation/reports/report_album.md:5
+#: ../../user/reports/album.md:5
 msgid "Go to the album details page."
 msgstr ""
 
-#: ../../user_documentation/reports/report_album.md:6
+#: ../../user/reports/album.md:6
 msgid "Select the kebab menu ({fa}`ellipsis-v`) to open the options menu."
 msgstr ""
 
-#: ../../user_documentation/reports/report_album.md:7
+#: ../../user/reports/album.md:7
 msgid "Select {guilabel}`Report this album`. A {guilabel}`Do you want to report this object?` menu appears."
 msgstr ""
 
-#: ../../user_documentation/reports/report_album.md:8
+#: ../../user/reports/album.md:8
 msgid "Select a {guilabel}`Category`. Choose one of the following:"
 msgstr ""
 
-#: ../../user_documentation/reports/report_album.md:9
+#: ../../user/reports/album.md:9
 msgid "**Takedown request** – request removal of copyrighted material."
 msgstr ""
 
-#: ../../user_documentation/reports/report_album.md:10
+#: ../../user/reports/album.md:10
 msgid "**Illegal content** – report an album that features illegal content."
 msgstr ""
 
-#: ../../user_documentation/reports/report_album.md:11
+#: ../../user/reports/album.md:11
 msgid "**Offensive content** – report an album that features offensive or abusive content."
 msgstr ""
 
-#: ../../user_documentation/reports/report_album.md:12
+#: ../../user/reports/album.md:12
 msgid "**Invalid metadata** – report that an album features invalid metadata."
 msgstr ""
 
-#: ../../user_documentation/reports/report_album.md:13
+#: ../../user/reports/album.md:13
 msgid "**Other** – submit details of your report in the {guilabel}`Message` field."
 msgstr ""
 
-#: ../../user_documentation/reports/report_album.md:14
+#: ../../user/reports/album.md:14
 msgid "**If you are not logged in** – enter your {guilabel}`Email`. Pod moderators use this address to contact you."
 msgstr ""
 
-#: ../../user_documentation/reports/report_album.md:15
+#: ../../user/reports/album.md:15
 msgid "Enter details of your report in the {guilabel}`Message` field. Provide as much detail as possible here to help the moderators action the report."
 msgstr ""
 
-#: ../../user_documentation/reports/report_album.md:16
+#: ../../user/reports/album.md:16
 msgid "Select {guilabel}`Submit report` to send your report to the pod moderators."
 msgstr ""
 
-#: ../../user_documentation/reports/report_album.md:18
+#: ../../user/reports/album.md:18
 msgid "That's it! The pod's moderators can now action the report or contact you for clarification."
 msgstr ""
diff --git a/docs/locales/gettext/user/reports/artist.pot b/docs/locales/gettext/user/reports/artist.pot
index 248ba8edc..b198db322 100644
--- a/docs/locales/gettext/user/reports/artist.pot
+++ b/docs/locales/gettext/user/reports/artist.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,62 +16,62 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/reports/report_artist.md:1
+#: ../../user/reports/artist.md:1
 msgid "Report an artist"
 msgstr ""
 
-#: ../../user_documentation/reports/report_artist.md:3
+#: ../../user/reports/artist.md:3
 msgid "If an artist's content violates a {term}`pod's <Pod>` rules or the law, you can report it. To do this:"
 msgstr ""
 
-#: ../../user_documentation/reports/report_artist.md:5
+#: ../../user/reports/artist.md:5
 msgid "Go to the artist details page."
 msgstr ""
 
-#: ../../user_documentation/reports/report_artist.md:6
+#: ../../user/reports/artist.md:6
 msgid "Select {guilabel}`More…` to open the options menu."
 msgstr ""
 
-#: ../../user_documentation/reports/report_artist.md:7
+#: ../../user/reports/artist.md:7
 msgid "Select {guilabel}`Report this artist`. A {guilabel}`Do you want to report this object?` menu appears."
 msgstr ""
 
-#: ../../user_documentation/reports/report_artist.md:8
+#: ../../user/reports/artist.md:8
 msgid "Select a {guilabel}`Category`. Choose one of the following:"
 msgstr ""
 
-#: ../../user_documentation/reports/report_artist.md:9
+#: ../../user/reports/artist.md:9
 msgid "**Takedown request** – request removal of copyrighted material."
 msgstr ""
 
-#: ../../user_documentation/reports/report_artist.md:10
+#: ../../user/reports/artist.md:10
 msgid "**Illegal content** – report an artist that features illegal content."
 msgstr ""
 
-#: ../../user_documentation/reports/report_artist.md:11
+#: ../../user/reports/artist.md:11
 msgid "**Offensive content** – report an artist that features offensive or abusive content."
 msgstr ""
 
-#: ../../user_documentation/reports/report_artist.md:12
+#: ../../user/reports/artist.md:12
 msgid "**Invalid metadata** – report that an artist's content features invalid metadata."
 msgstr ""
 
-#: ../../user_documentation/reports/report_artist.md:13
+#: ../../user/reports/artist.md:13
 msgid "**Other** – submit details of your report in the {guilabel}`Message` field."
 msgstr ""
 
-#: ../../user_documentation/reports/report_artist.md:14
+#: ../../user/reports/artist.md:14
 msgid "**If you are not logged in** – enter your {guilabel}`Email`. Pod moderators use this address to contact you."
 msgstr ""
 
-#: ../../user_documentation/reports/report_artist.md:15
+#: ../../user/reports/artist.md:15
 msgid "Enter details of your report in the {guilabel}`Message` field. Provide as much detail as possible here to help the moderators action the report."
 msgstr ""
 
-#: ../../user_documentation/reports/report_artist.md:16
+#: ../../user/reports/artist.md:16
 msgid "Select {guilabel}`Submit report` to send your report to the pod moderators."
 msgstr ""
 
-#: ../../user_documentation/reports/report_artist.md:18
+#: ../../user/reports/artist.md:18
 msgid "That's it! The pod's moderators can now action the report or contact you for clarification."
 msgstr ""
diff --git a/docs/locales/gettext/user/reports/channel.pot b/docs/locales/gettext/user/reports/channel.pot
index 7b99029cd..4d08131ae 100644
--- a/docs/locales/gettext/user/reports/channel.pot
+++ b/docs/locales/gettext/user/reports/channel.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,62 +16,62 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/reports/report_channel.md:1
+#: ../../user/reports/channel.md:1
 msgid "Report a channel"
 msgstr ""
 
-#: ../../user_documentation/reports/report_channel.md:3
+#: ../../user/reports/channel.md:3
 msgid "If a channel's content violates a {term}`pod's <Pod>` rules or the law, you can report it. To do this:"
 msgstr ""
 
-#: ../../user_documentation/reports/report_channel.md:5
+#: ../../user/reports/channel.md:5
 msgid "Go to the channel's details page."
 msgstr ""
 
-#: ../../user_documentation/reports/report_channel.md:6
+#: ../../user/reports/channel.md:6
 msgid "Select the kebab menu ({fa}`ellipsis-v`) to open the options menu."
 msgstr ""
 
-#: ../../user_documentation/reports/report_channel.md:7
+#: ../../user/reports/channel.md:7
 msgid "Select {guilabel}`Report this channel`. A {guilabel}`Do you want to report this object?` menu appears."
 msgstr ""
 
-#: ../../user_documentation/reports/report_channel.md:8
+#: ../../user/reports/channel.md:8
 msgid "Select a {guilabel}`Category`. Choose one of the following:"
 msgstr ""
 
-#: ../../user_documentation/reports/report_channel.md:9
+#: ../../user/reports/channel.md:9
 msgid "**Takedown request** – request removal of copyrighted material."
 msgstr ""
 
-#: ../../user_documentation/reports/report_channel.md:10
+#: ../../user/reports/channel.md:10
 msgid "**Illegal content** – report a channel that features illegal content."
 msgstr ""
 
-#: ../../user_documentation/reports/report_channel.md:11
+#: ../../user/reports/channel.md:11
 msgid "**Offensive content** – report a channel that features offensive or abusive content."
 msgstr ""
 
-#: ../../user_documentation/reports/report_channel.md:12
+#: ../../user/reports/channel.md:12
 msgid "**Invalid metadata** – report that a channel's content features invalid metadata."
 msgstr ""
 
-#: ../../user_documentation/reports/report_channel.md:13
+#: ../../user/reports/channel.md:13
 msgid "**Other** – submit details of your report in the {guilabel}`Message` field."
 msgstr ""
 
-#: ../../user_documentation/reports/report_channel.md:14
+#: ../../user/reports/channel.md:14
 msgid "**If you are not logged in** – enter your {guilabel}`Email`. Pod moderators use this address to contact you."
 msgstr ""
 
-#: ../../user_documentation/reports/report_channel.md:15
+#: ../../user/reports/channel.md:15
 msgid "Enter details of your report in the {guilabel}`Message` field. Provide as much detail as possible here to help the moderators action the report."
 msgstr ""
 
-#: ../../user_documentation/reports/report_channel.md:16
+#: ../../user/reports/channel.md:16
 msgid "Select {guilabel}`Submit report` to send your report to the pod moderators."
 msgstr ""
 
-#: ../../user_documentation/reports/report_channel.md:18
+#: ../../user/reports/channel.md:18
 msgid "That's it! The pod's moderators can now action the report or contact you for clarification."
 msgstr ""
diff --git a/docs/locales/gettext/user/reports/index.pot b/docs/locales/gettext/user/reports/index.pot
index e3f3bf1fd..1a18f62b1 100644
--- a/docs/locales/gettext/user/reports/index.pot
+++ b/docs/locales/gettext/user/reports/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,18 +16,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/reports/index.md:9
+#: ../../user/reports/index.md:9
 msgid "Submit reports"
 msgstr ""
 
-#: ../../user_documentation/reports/index.md:1
+#: ../../user/reports/index.md:1
 msgid "Reporting"
 msgstr ""
 
-#: ../../user_documentation/reports/index.md:4
+#: ../../user/reports/index.md:4
 msgid "{term}`Pod <Pod>` admins and moderators are responsible for handling reports. Pod admins can choose to allow anonymous (logged out) users to send reports. If you cannot send reports anonymously, contact the pod admin."
 msgstr ""
 
-#: ../../user_documentation/reports/index.md:7
+#: ../../user/reports/index.md:7
 msgid "Funkwhale provides tools for reporting all content and accounts. You can report content for being objectionable or illegal. You can also report stolen content. Check out the guides in this section to see how to send a report."
 msgstr ""
diff --git a/docs/locales/gettext/user/reports/library.pot b/docs/locales/gettext/user/reports/library.pot
index 38b6560f6..67b1bc75e 100644
--- a/docs/locales/gettext/user/reports/library.pot
+++ b/docs/locales/gettext/user/reports/library.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,62 +16,62 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/reports/report_library.md:1
+#: ../../user/reports/library.md:1
 msgid "Report a library"
 msgstr ""
 
-#: ../../user_documentation/reports/report_library.md:3
+#: ../../user/reports/library.md:3
 msgid "If a channel's content violates a {term}`pod's <Pod>` rules or the law, you can report it. To do this:"
 msgstr ""
 
-#: ../../user_documentation/reports/report_library.md:5
+#: ../../user/reports/library.md:5
 msgid "Go to the library's details page."
 msgstr ""
 
-#: ../../user_documentation/reports/report_library.md:6
+#: ../../user/reports/library.md:6
 msgid "Select the kebab menu ({fa}`ellipsis-v`) to open the options menu."
 msgstr ""
 
-#: ../../user_documentation/reports/report_library.md:7
+#: ../../user/reports/library.md:7
 msgid "Select {guilabel}`Report this library`. A {guilabel}`Do you want to report this object?` menu appears."
 msgstr ""
 
-#: ../../user_documentation/reports/report_library.md:8
+#: ../../user/reports/library.md:8
 msgid "Select a {guilabel}`Category`. Choose one of the following:"
 msgstr ""
 
-#: ../../user_documentation/reports/report_library.md:9
+#: ../../user/reports/library.md:9
 msgid "**Takedown request** – request removal of copyrighted material."
 msgstr ""
 
-#: ../../user_documentation/reports/report_library.md:10
+#: ../../user/reports/library.md:10
 msgid "**Illegal content** – report a library that features illegal content."
 msgstr ""
 
-#: ../../user_documentation/reports/report_library.md:11
+#: ../../user/reports/library.md:11
 msgid "**Offensive content** – report a library that features offensive or abusive content."
 msgstr ""
 
-#: ../../user_documentation/reports/report_library.md:12
+#: ../../user/reports/library.md:12
 msgid "**Invalid metadata** – report that a library's content features invalid metadata."
 msgstr ""
 
-#: ../../user_documentation/reports/report_library.md:13
+#: ../../user/reports/library.md:13
 msgid "**Other** – submit details of your report in the {guilabel}`Message` field."
 msgstr ""
 
-#: ../../user_documentation/reports/report_library.md:14
+#: ../../user/reports/library.md:14
 msgid "**If you are not logged in** – enter your {guilabel}`Email`. Pod moderators use this address to contact you."
 msgstr ""
 
-#: ../../user_documentation/reports/report_library.md:15
+#: ../../user/reports/library.md:15
 msgid "Enter details of your report in the {guilabel}`Message` field. Provide as much detail as possible here to help the moderators action the report."
 msgstr ""
 
-#: ../../user_documentation/reports/report_library.md:16
+#: ../../user/reports/library.md:16
 msgid "Select {guilabel}`Submit report` to send your report to the pod moderators."
 msgstr ""
 
-#: ../../user_documentation/reports/report_library.md:18
+#: ../../user/reports/library.md:18
 msgid "That's it! The pod's moderators can now action the report or contact you for clarification."
 msgstr ""
diff --git a/docs/locales/gettext/user/reports/playlist.pot b/docs/locales/gettext/user/reports/playlist.pot
index 38d433212..cd195a66f 100644
--- a/docs/locales/gettext/user/reports/playlist.pot
+++ b/docs/locales/gettext/user/reports/playlist.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,94 +16,94 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/reports/report_playlist.md:1
+#: ../../user/reports/playlist.md:1
 msgid "Report a playlist"
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:3
+#: ../../user/reports/playlist.md:3
 msgid "If a playlist's content violates a {term}`pod's <Pod>` rules or the law, you can report it. To do this:"
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:0
+#: ../../user/reports/playlist.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:11
+#: ../../user/reports/playlist.md:11
 msgid "Select {menuselection}`Explore --> Playlists` in the sidebar. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:12
-#: ../../user_documentation/reports/report_playlist.md:32
+#: ../../user/reports/playlist.md:12
+#: ../../user/reports/playlist.md:32
 msgid "Use the filters to search for a playlist."
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:13
-#: ../../user_documentation/reports/report_playlist.md:33
+#: ../../user/reports/playlist.md:13
+#: ../../user/reports/playlist.md:33
 msgid "Select the three dot menu ({fa}`ellipsis-h`) to open the options menu."
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:14
-#: ../../user_documentation/reports/report_playlist.md:34
+#: ../../user/reports/playlist.md:14
+#: ../../user/reports/playlist.md:34
 msgid "Select {guilabel}`Report this playlist`. A {guilabel}`Do you want to report this object?` menu appears."
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:15
-#: ../../user_documentation/reports/report_playlist.md:35
+#: ../../user/reports/playlist.md:15
+#: ../../user/reports/playlist.md:35
 msgid "Select a {guilabel}`Category`. Choose one of the following:"
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:16
-#: ../../user_documentation/reports/report_playlist.md:36
+#: ../../user/reports/playlist.md:16
+#: ../../user/reports/playlist.md:36
 msgid "**Takedown request** – request removal of copyrighted material."
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:17
-#: ../../user_documentation/reports/report_playlist.md:37
+#: ../../user/reports/playlist.md:17
+#: ../../user/reports/playlist.md:37
 msgid "**Illegal content** – report a playlist that features illegal content."
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:18
-#: ../../user_documentation/reports/report_playlist.md:38
+#: ../../user/reports/playlist.md:18
+#: ../../user/reports/playlist.md:38
 msgid "**Offensive content** – report a playlist that features offensive or abusive content."
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:19
-#: ../../user_documentation/reports/report_playlist.md:39
+#: ../../user/reports/playlist.md:19
+#: ../../user/reports/playlist.md:39
 msgid "**Invalid metadata** – report that a playlist's content features invalid metadata."
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:20
-#: ../../user_documentation/reports/report_playlist.md:40
+#: ../../user/reports/playlist.md:20
+#: ../../user/reports/playlist.md:40
 msgid "**Other** – submit details of your report in the {guilabel}`Message` field."
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:21
-#: ../../user_documentation/reports/report_playlist.md:41
+#: ../../user/reports/playlist.md:21
+#: ../../user/reports/playlist.md:41
 msgid "**If you are not logged in** – enter your {guilabel}`Email`. Pod moderators use this address to contact you."
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:22
-#: ../../user_documentation/reports/report_playlist.md:42
+#: ../../user/reports/playlist.md:22
+#: ../../user/reports/playlist.md:42
 msgid "Enter details of your report in the {guilabel}`Message` field. Provide as much detail as possible here to help the moderators action the report."
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:23
-#: ../../user_documentation/reports/report_playlist.md:43
+#: ../../user/reports/playlist.md:23
+#: ../../user/reports/playlist.md:43
 msgid "Select {guilabel}`Submit report` to send your report to the pod moderators."
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:0
+#: ../../user/reports/playlist.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:30
+#: ../../user/reports/playlist.md:30
 msgid "Select the hamburger menu ({fa}`bars`) to open the menu bar."
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:31
+#: ../../user/reports/playlist.md:31
 msgid "Select {menuselection}`Explore --> Playlists`. The {guilabel}`Browsing playlists` screen opens."
 msgstr ""
 
-#: ../../user_documentation/reports/report_playlist.md:47
+#: ../../user/reports/playlist.md:47
 msgid "That's it! The pod's moderators can now action the report or contact you for clarification."
 msgstr ""
diff --git a/docs/locales/gettext/user/reports/track.pot b/docs/locales/gettext/user/reports/track.pot
index 1688dbead..35480accc 100644
--- a/docs/locales/gettext/user/reports/track.pot
+++ b/docs/locales/gettext/user/reports/track.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,62 +16,62 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/reports/report_track.md:1
+#: ../../user/reports/track.md:1
 msgid "Report a track"
 msgstr ""
 
-#: ../../user_documentation/reports/report_track.md:3
+#: ../../user/reports/track.md:3
 msgid "If a track violates a {term}`pod's <Pod>` rules or the law, you can report it. To do this:"
 msgstr ""
 
-#: ../../user_documentation/reports/report_track.md:5
+#: ../../user/reports/track.md:5
 msgid "Go to the track details page or locate the track in a track table."
 msgstr ""
 
-#: ../../user_documentation/reports/report_track.md:6
+#: ../../user/reports/track.md:6
 msgid "Select the kebab menu ({fa}`ellipsis-v`) to open the options menu."
 msgstr ""
 
-#: ../../user_documentation/reports/report_track.md:7
+#: ../../user/reports/track.md:7
 msgid "Select {guilabel}`Report this track`. A {guilabel}`Do you want to report this object?` menu appears."
 msgstr ""
 
-#: ../../user_documentation/reports/report_track.md:8
+#: ../../user/reports/track.md:8
 msgid "Select a {guilabel}`Category`. Choose one of the following:"
 msgstr ""
 
-#: ../../user_documentation/reports/report_track.md:9
+#: ../../user/reports/track.md:9
 msgid "**Takedown request** – request removal of copyrighted material."
 msgstr ""
 
-#: ../../user_documentation/reports/report_track.md:10
+#: ../../user/reports/track.md:10
 msgid "**Illegal content** – report a track that features illegal content."
 msgstr ""
 
-#: ../../user_documentation/reports/report_track.md:11
+#: ../../user/reports/track.md:11
 msgid "**Offensive content** – report a track that features offensive or abusive content."
 msgstr ""
 
-#: ../../user_documentation/reports/report_track.md:12
+#: ../../user/reports/track.md:12
 msgid "**Invalid metadata** – report that a track features invalid metadata."
 msgstr ""
 
-#: ../../user_documentation/reports/report_track.md:13
+#: ../../user/reports/track.md:13
 msgid "**Other** – submit details of your report in the {guilabel}`Message` field."
 msgstr ""
 
-#: ../../user_documentation/reports/report_track.md:14
+#: ../../user/reports/track.md:14
 msgid "**If you are not logged in** – enter your {guilabel}`Email`. Pod moderators use this address to contact you."
 msgstr ""
 
-#: ../../user_documentation/reports/report_track.md:15
+#: ../../user/reports/track.md:15
 msgid "Enter details of your report in the {guilabel}`Message` field. Provide as much detail as possible here to help the moderators action the report."
 msgstr ""
 
-#: ../../user_documentation/reports/report_track.md:16
+#: ../../user/reports/track.md:16
 msgid "Select {guilabel}`Submit report` to send your report to the pod moderators."
 msgstr ""
 
-#: ../../user_documentation/reports/report_track.md:18
+#: ../../user/reports/track.md:18
 msgid "That's it! The pod's moderators can now action the report or contact you for clarification."
 msgstr ""
diff --git a/docs/locales/gettext/user/subsonic/disable.pot b/docs/locales/gettext/user/subsonic/disable.pot
index 7d87507a8..7a67ee184 100644
--- a/docs/locales/gettext/user/subsonic/disable.pot
+++ b/docs/locales/gettext/user/subsonic/disable.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,60 +16,60 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/subsonic/disable_subsonic.md:1
+#: ../../user/subsonic/disable.md:1
 msgid "Disable Subsonic access"
 msgstr ""
 
-#: ../../user_documentation/subsonic/disable_subsonic.md:3
+#: ../../user/subsonic/disable.md:3
 msgid "If you don't want to use Subsonic any more, you can disable access. This stops any Subsonic apps being able to log in to your account. To do this:"
 msgstr ""
 
-#: ../../user_documentation/subsonic/disable_subsonic.md:0
+#: ../../user/subsonic/disable.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/subsonic/disable_subsonic.md:11
-#: ../../user_documentation/subsonic/disable_subsonic.md:24
+#: ../../user/subsonic/disable.md:11
+#: ../../user/subsonic/disable.md:24
 msgid "Log in to your account."
 msgstr ""
 
-#: ../../user_documentation/subsonic/disable_subsonic.md:12
+#: ../../user/subsonic/disable.md:12
 msgid "Select the cog icon ({fa}`cog`) or your avatar to expand the user menu."
 msgstr ""
 
-#: ../../user_documentation/subsonic/disable_subsonic.md:13
-#: ../../user_documentation/subsonic/disable_subsonic.md:26
+#: ../../user/subsonic/disable.md:13
+#: ../../user/subsonic/disable.md:26
 msgid "Select {guilabel}`Settings`."
 msgstr ""
 
-#: ../../user_documentation/subsonic/disable_subsonic.md:14
-#: ../../user_documentation/subsonic/disable_subsonic.md:27
+#: ../../user/subsonic/disable.md:14
+#: ../../user/subsonic/disable.md:27
 msgid "Scroll to the {guilabel}`Subsonic API password` section."
 msgstr ""
 
-#: ../../user_documentation/subsonic/disable_subsonic.md:15
-#: ../../user_documentation/subsonic/disable_subsonic.md:28
+#: ../../user/subsonic/disable.md:15
+#: ../../user/subsonic/disable.md:28
 msgid "Select {guilabel}`Disable Subsonic access`."
 msgstr ""
 
-#: ../../user_documentation/subsonic/disable_subsonic.md:16
-#: ../../user_documentation/subsonic/disable_subsonic.md:29
+#: ../../user/subsonic/disable.md:16
+#: ../../user/subsonic/disable.md:29
 msgid "Select {guilabel}`Disable access` in the warning message that appears."
 msgstr ""
 
-#: ../../user_documentation/subsonic/disable_subsonic.md:17
-#: ../../user_documentation/subsonic/disable_subsonic.md:30
+#: ../../user/subsonic/disable.md:17
+#: ../../user/subsonic/disable.md:30
 msgid "The Subsonic password field shows {guilabel}`Access disabled`."
 msgstr ""
 
-#: ../../user_documentation/subsonic/disable_subsonic.md:0
+#: ../../user/subsonic/disable.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/subsonic/disable_subsonic.md:25
+#: ../../user/subsonic/disable.md:25
 msgid "Select the cog icon ({fa}`cog`) or your avatar to open the {guilabel}`Options` menu."
 msgstr ""
 
-#: ../../user_documentation/subsonic/disable_subsonic.md:34
-msgid "You're done! Subsonic apps can no longer access your account. You can re-enable the API at any time by [requesting a new password](./subsonic_password.md)."
+#: ../../user/subsonic/disable.md:34
+msgid "You're done! Subsonic apps can no longer access your account. You can re-enable the API at any time by [requesting a new password](password/request.md)."
 msgstr ""
diff --git a/docs/locales/gettext/user/subsonic/index.pot b/docs/locales/gettext/user/subsonic/index.pot
index 41234b6c1..c97794a4c 100644
--- a/docs/locales/gettext/user/subsonic/index.pot
+++ b/docs/locales/gettext/user/subsonic/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,18 +16,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/subsonic/index.md:9
+#: ../../user/subsonic/index.md:9
 msgid "Manage your Subsonic access"
 msgstr ""
 
-#: ../../user_documentation/subsonic/index.md:1
+#: ../../user/subsonic/index.md:1
 msgid "Subsonic access"
 msgstr ""
 
-#: ../../user_documentation/subsonic/index.md:4
+#: ../../user/subsonic/index.md:4
 msgid "{term}`Pod` admins can choose to disable access to the Subsonic API. If the Subsonic password option isn't available, contact your pod admin."
 msgstr ""
 
-#: ../../user_documentation/subsonic/index.md:7
+#: ../../user/subsonic/index.md:7
 msgid "Funkwhale supports a subset of the [Subsonic API](http://www.subsonic.org/pages/index.jsp). This enables you to use Subsonic apps to stream your Funkwhale content. Check out the guides in this section to manage your Subsonic access."
 msgstr ""
diff --git a/docs/locales/gettext/user/subsonic/password/request.pot b/docs/locales/gettext/user/subsonic/password/request.pot
index eb33e83b3..2d8b78bd5 100644
--- a/docs/locales/gettext/user/subsonic/password/request.pot
+++ b/docs/locales/gettext/user/subsonic/password/request.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,55 +16,55 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/subsonic/subsonic_password.md:1
+#: ../../user/subsonic/password/request.md:1
 msgid "Request your Subsonic password"
 msgstr ""
 
-#: ../../user_documentation/subsonic/subsonic_password.md:3
+#: ../../user/subsonic/password/request.md:3
 msgid "To access the Subsonic API, you need to request a Subsonic password. To do this:"
 msgstr ""
 
-#: ../../user_documentation/subsonic/subsonic_password.md:0
+#: ../../user/subsonic/password/request.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/subsonic/subsonic_password.md:11
-#: ../../user_documentation/subsonic/subsonic_password.md:23
+#: ../../user/subsonic/password/request.md:11
+#: ../../user/subsonic/password/request.md:23
 msgid "Log in to your account."
 msgstr ""
 
-#: ../../user_documentation/subsonic/subsonic_password.md:12
+#: ../../user/subsonic/password/request.md:12
 msgid "Select the cog icon ({fa}`cog`) or your avatar to expand the user menu."
 msgstr ""
 
-#: ../../user_documentation/subsonic/subsonic_password.md:13
-#: ../../user_documentation/subsonic/subsonic_password.md:25
+#: ../../user/subsonic/password/request.md:13
+#: ../../user/subsonic/password/request.md:25
 msgid "Select {guilabel}`Settings`."
 msgstr ""
 
-#: ../../user_documentation/subsonic/subsonic_password.md:14
-#: ../../user_documentation/subsonic/subsonic_password.md:26
+#: ../../user/subsonic/password/request.md:14
+#: ../../user/subsonic/password/request.md:26
 msgid "Scroll to the {guilabel}`Subsonic API password` section."
 msgstr ""
 
-#: ../../user_documentation/subsonic/subsonic_password.md:15
-#: ../../user_documentation/subsonic/subsonic_password.md:27
+#: ../../user/subsonic/password/request.md:15
+#: ../../user/subsonic/password/request.md:27
 msgid "Select {guilabel}`Request a password`. The server generates your password for you."
 msgstr ""
 
-#: ../../user_documentation/subsonic/subsonic_password.md:16
-#: ../../user_documentation/subsonic/subsonic_password.md:28
+#: ../../user/subsonic/password/request.md:16
+#: ../../user/subsonic/password/request.md:28
 msgid "Select the {guilabel}`copy` icon next to the password field to copy your password."
 msgstr ""
 
-#: ../../user_documentation/subsonic/subsonic_password.md:0
+#: ../../user/subsonic/password/request.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/subsonic/subsonic_password.md:24
+#: ../../user/subsonic/password/request.md:24
 msgid "Select the cog icon ({fa}`cog`) or your avatar to open the {guilabel}`Options` menu."
 msgstr ""
 
-#: ../../user_documentation/subsonic/subsonic_password.md:32
+#: ../../user/subsonic/password/request.md:32
 msgid "Congratulations! You've got your Subsonic password. You can now enter this in your Subsonic app to start listening to Funkwhale content."
 msgstr ""
diff --git a/docs/locales/gettext/user/subsonic/password/reset.pot b/docs/locales/gettext/user/subsonic/password/reset.pot
index 11ed9f3fb..7eba96934 100644
--- a/docs/locales/gettext/user/subsonic/password/reset.pot
+++ b/docs/locales/gettext/user/subsonic/password/reset.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: funkwhale 1.3.0-rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 14:05+0100\n"
+"POT-Creation-Date: 2023-03-01 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,64 +16,64 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../user_documentation/subsonic/reset_subsonic.md:1
+#: ../../user/subsonic/password/reset.md:1
 msgid "Reset your Subsonic password"
 msgstr ""
 
-#: ../../user_documentation/subsonic/reset_subsonic.md:4
+#: ../../user/subsonic/password/reset.md:4
 msgid "Changing your Subsonic password logs you out of any Subsonic apps you are using. You need to log back in using your new password."
 msgstr ""
 
-#: ../../user_documentation/subsonic/reset_subsonic.md:7
+#: ../../user/subsonic/password/reset.md:7
 msgid "You can reset your Subsonic password at any time. To do this:"
 msgstr ""
 
-#: ../../user_documentation/subsonic/reset_subsonic.md:0
+#: ../../user/subsonic/password/reset.md:0
 msgid "Desktop"
 msgstr ""
 
-#: ../../user_documentation/subsonic/reset_subsonic.md:15
-#: ../../user_documentation/subsonic/reset_subsonic.md:28
+#: ../../user/subsonic/password/reset.md:15
+#: ../../user/subsonic/password/reset.md:28
 msgid "Log in to your account."
 msgstr ""
 
-#: ../../user_documentation/subsonic/reset_subsonic.md:16
+#: ../../user/subsonic/password/reset.md:16
 msgid "Select the cog icon ({fa}`cog`) or your avatar to expand the user menu."
 msgstr ""
 
-#: ../../user_documentation/subsonic/reset_subsonic.md:17
-#: ../../user_documentation/subsonic/reset_subsonic.md:30
+#: ../../user/subsonic/password/reset.md:17
+#: ../../user/subsonic/password/reset.md:30
 msgid "Select {guilabel}`Settings`."
 msgstr ""
 
-#: ../../user_documentation/subsonic/reset_subsonic.md:18
-#: ../../user_documentation/subsonic/reset_subsonic.md:31
+#: ../../user/subsonic/password/reset.md:18
+#: ../../user/subsonic/password/reset.md:31
 msgid "Scroll to the {guilabel}`Subsonic API password` section."
 msgstr ""
 
-#: ../../user_documentation/subsonic/reset_subsonic.md:19
-#: ../../user_documentation/subsonic/reset_subsonic.md:32
+#: ../../user/subsonic/password/reset.md:19
+#: ../../user/subsonic/password/reset.md:32
 msgid "Select {guilabel}`Request a new password`."
 msgstr ""
 
-#: ../../user_documentation/subsonic/reset_subsonic.md:20
-#: ../../user_documentation/subsonic/reset_subsonic.md:33
+#: ../../user/subsonic/password/reset.md:20
+#: ../../user/subsonic/password/reset.md:33
 msgid "Select {guilabel}`Request a new password` in the warning message that appears. The server generates a new password for you."
 msgstr ""
 
-#: ../../user_documentation/subsonic/reset_subsonic.md:21
-#: ../../user_documentation/subsonic/reset_subsonic.md:34
+#: ../../user/subsonic/password/reset.md:21
+#: ../../user/subsonic/password/reset.md:34
 msgid "Select the {guilabel}`copy` icon next to the password field to copy your password."
 msgstr ""
 
-#: ../../user_documentation/subsonic/reset_subsonic.md:0
+#: ../../user/subsonic/password/reset.md:0
 msgid "Mobile"
 msgstr ""
 
-#: ../../user_documentation/subsonic/reset_subsonic.md:29
+#: ../../user/subsonic/password/reset.md:29
 msgid "Select the cog icon ({fa}`cog`) or your avatar to open the {guilabel}`Options` menu."
 msgstr ""
 
-#: ../../user_documentation/subsonic/reset_subsonic.md:38
+#: ../../user/subsonic/password/reset.md:38
 msgid "That's it! Your new password is ready to use."
 msgstr ""