diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/change-url.po b/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/change-url.po
index c02db6c4d..b2b26db2d 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/change-url.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/change-url.po
@@ -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"
@@ -17,90 +17,96 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_docs/backup.md)."
+"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
+#: ../../administrator/configuration/change-url.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md
+#: ../../administrator/configuration/change-url.md
 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
+#: ../../administrator/configuration/change-url.md
 msgid "Nginx"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md
+#: ../../administrator/configuration/change-url.md
 msgid "Apache"
 msgstr ""
 
+#~ msgid ""
+#~ "Running `fix_federation_ids` with the "
+#~ "`--no-dry-run` flag is irreversible. "
+#~ "Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/env-file.po b/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/env-file.po
index d384e5036..854b3f4c7 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/env-file.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/env-file.po
@@ -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"
@@ -17,49 +17,49 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/configuration/env-file.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md
+#: ../../administrator/configuration/env-file.md
 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 ""
 
@@ -73,7 +73,7 @@ msgid ""
 "``https``."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:53
+#: ../../administrator/configuration/env-file.md:53
 msgid "Database and redis configuration"
 msgstr ""
 
@@ -141,7 +141,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 ""
 
@@ -178,17 +178,15 @@ msgid ""
 " 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 ""
 
@@ -254,17 +252,17 @@ 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 ""
 
@@ -336,7 +334,7 @@ msgid ""
 " 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 ""
 
@@ -379,7 +377,7 @@ msgid ""
 "this directory."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:148
+#: ../../administrator/configuration/env-file.md:148
 msgid "API configuration"
 msgstr ""
 
@@ -402,7 +400,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."
@@ -434,7 +432,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 ""
 
@@ -448,7 +446,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 ""
 
@@ -477,7 +475,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 ""
 
@@ -506,7 +504,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 ""
 
@@ -515,7 +513,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 ""
 
@@ -571,7 +569,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 ""
 
@@ -581,11 +579,11 @@ msgid ""
 "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 ""
 
@@ -633,3 +631,8 @@ msgid ""
 "defaults to sys.getdefaultencoding(). errors defaults to 'strict'."
 msgstr ""
 
+#~ msgid ""
+#~ "See {doc}`/administrator_documentation/configuration_docs/ldap`"
+#~ " for more information."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/instance-settings.po b/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/instance-settings.po
index b2bc23ef2..659e4b6c9 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/instance-settings.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/instance-settings.po
@@ -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"
@@ -17,181 +17,181 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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 "
@@ -199,235 +199,241 @@ msgid ""
 " 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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 ""
 
+#~ msgid "{doc}`../../moderator_documentation/content/library_visibility`."
+#~ msgstr ""
+
+#~ msgid "{doc}`../../moderator_documentation/reports/handle_users`"
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/mrf.po b/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/mrf.po
index 7b08fa2de..aa813b12c 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/mrf.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/mrf.po
@@ -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"
@@ -17,97 +17,97 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_documentation/index.md)."
+"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 "
@@ -115,46 +115,58 @@ msgid ""
 "{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
+#: ../../administrator/configuration/mrf.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md
+#: ../../administrator/configuration/mrf.md
 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 ""
 
+#~ 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)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/rate-limiting.po b/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/rate-limiting.po
index 4bd899ee7..71a20499a 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/rate-limiting.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/configuration/rate-limiting.po
@@ -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"
@@ -17,327 +17,336 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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 "
+"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 ""
 
+#~ 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 ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/django/delete-content.po b/docs/locales/en_GB/LC_MESSAGES/administrator/django/delete-content.po
index 4798d631a..800300cca 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/django/delete-content.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/django/delete-content.po
@@ -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"
@@ -17,166 +17,173 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/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 "
+"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 ""
 
+#~ msgid ""
+#~ "Deleting content using the Django "
+#~ "dashboard isn't recommended. Use an "
+#~ "object's [moderation "
+#~ "page](../../moderator_documentation/content/delete_content.md) "
+#~ "where possible."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/import.po b/docs/locales/en_GB/LC_MESSAGES/administrator/import.po
index 023abcdfb..05d5a3660 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/import.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/import.po
@@ -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"
@@ -17,171 +17,168 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_documentation/libraries/tag_music.md). We recommend "
-"using [Musicbrainz Picard](https://picard.musicbrainz.org/) for tagging."
+"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
+#: ../../administrator/import.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md
+#: ../../administrator/import.md
 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
+#: ../../administrator/import.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 "
+"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 "
@@ -189,21 +186,20 @@ msgid ""
 "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 "
@@ -212,77 +208,76 @@ msgid ""
 "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
+#: ../../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_docs/env_file.md#in-place-import-"
-"configuration) for more information."
+"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
+#: ../../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_docs/env_file.md#in-place-import-"
-"configuration) for more information."
+"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"
@@ -291,112 +286,148 @@ msgid ""
 "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
+#: ../../administrator/import.md
 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 ""
 
+#~ 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."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/index.po b/docs/locales/en_GB/LC_MESSAGES/administrator/index.po
index e31c8e8cf..9c6a81f69 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/index.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/index.po
@@ -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"
@@ -17,59 +17,97 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_docs/index.md). Choose the installation method that "
-"works for you!"
+"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
+#: ../../administrator/index.md:15
 msgid ""
 "Once you've installed Funkwhale, you can use [the guides in this "
-"section](configuration_docs/index.md) to configure it."
+"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
+#: ../../administrator/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)."
+"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
+#: ../../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_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."
+"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 ""
 
+#~ 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!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you've installed Funkwhale, you can"
+#~ " use [the guides in this "
+#~ "section](configuration_docs/index.md) to configure "
+#~ "it."
+#~ msgstr ""
+
+#~ 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)."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/installation/migrate.po b/docs/locales/en_GB/LC_MESSAGES/administrator/installation/migrate.po
index 2c4dc5cde..31a0e1dca 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/installation/migrate.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/installation/migrate.po
@@ -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"
@@ -17,212 +17,212 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/installation/migrate.md
 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
+#: ../../administrator/installation/migrate.md:17
 msgid ""
-"Make sure you [back up your data](../upgrade_docs/backup.md) before "
+"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
+#: ../../administrator/installation/migrate.md
 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
+#: ../../administrator/installation/migrate.md
 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 "
@@ -230,17 +230,24 @@ msgid ""
 "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 ""
 
+#~ msgid ""
+#~ "Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md) before proceeding. "
+#~ "This ensures you don't lose anything "
+#~ "during the migration."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/manage-script/create-library.po b/docs/locales/en_GB/LC_MESSAGES/administrator/manage-script/create-library.po
index d899c02a1..634e34d92 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/manage-script/create-library.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/manage-script/create-library.po
@@ -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"
@@ -17,118 +17,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/manage-script/create-library.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md
+#: ../../administrator/manage-script/create-library.md
 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 ""
 
+#~ msgid ""
+#~ "The [privacy "
+#~ "level](../../user_documentation/libraries/create_library.md) of"
+#~ " the library"
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/manage-script/database.po b/docs/locales/en_GB/LC_MESSAGES/administrator/manage-script/database.po
index 50ea62511..3f95b3ea5 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/manage-script/database.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/manage-script/database.po
@@ -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"
@@ -17,18 +17,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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"
@@ -36,14 +36,13 @@ msgid ""
 "deletes the database object."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/database.md:8
+#: ../../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_docs/backup.md)."
+"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 "
@@ -51,11 +50,18 @@ msgid ""
 "pruning action."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/database.md
+#: ../../administrator/manage-script/database.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/database.md
+#: ../../administrator/manage-script/database.md
 msgid "Docker"
 msgstr ""
 
+#~ msgid ""
+#~ "Running `check_inplace_files` with the "
+#~ "`--no-dry-run` flag is irreversible. "
+#~ "Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/manage-script/library.po b/docs/locales/en_GB/LC_MESSAGES/administrator/manage-script/library.po
index 852e4a009..94a816cd7 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/manage-script/library.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/manage-script/library.po
@@ -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"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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, "
@@ -29,13 +29,13 @@ msgid ""
 "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 "
@@ -45,63 +45,69 @@ msgid ""
 "perform the pruning action."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:10
+#: ../../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_docs/backup.md)."
+"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
+#: ../../administrator/manage-script/library.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md
+#: ../../administrator/manage-script/library.md
 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 ""
 
+#~ msgid ""
+#~ "Running `prune_library` commands with the "
+#~ "`--no-dry-run` flag is irreversible. "
+#~ "Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/troubleshooting/backend.po b/docs/locales/en_GB/LC_MESSAGES/administrator/troubleshooting/backend.po
index 0d68f7ada..68ecf4387 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/troubleshooting/backend.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/troubleshooting/backend.po
@@ -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"
@@ -17,84 +17,84 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/troubleshooting/backend.md
 msgid "Nginx"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md
+#: ../../administrator/troubleshooting/backend.md
 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
+#: ../../administrator/troubleshooting/backend.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md
+#: ../../administrator/troubleshooting/backend.md
 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` "
@@ -102,140 +102,154 @@ msgid ""
 "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
+#: ../../administrator/troubleshooting/backend.md
 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
+#: ../../administrator/troubleshooting/backend.md:109
 msgid ""
 "Make sure your files are [tagged "
-"correctly](../../user_documentation/libraries/tag_music.md)."
+"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
+#: ../../administrator/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."
+"out the [get help](help.md) guide for information about where to ask your"
+" question and what details to provide."
 msgstr ""
 
+#~ msgid ""
+#~ "Make sure your files are [tagged "
+#~ "correctly](../../user_documentation/libraries/tag_music.md)."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/troubleshooting/frontend.po b/docs/locales/en_GB/LC_MESSAGES/administrator/troubleshooting/frontend.po
index cb75bc56a..bdb6fc125 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/troubleshooting/frontend.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/troubleshooting/frontend.po
@@ -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"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -41,133 +41,142 @@ msgid ""
 "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
+#: ../../administrator/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."
+"out the [get help](help.md) guide for information about where to ask your"
+" question and what details to provide."
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/uninstall/debian.po b/docs/locales/en_GB/LC_MESSAGES/administrator/uninstall/debian.po
index 794c48eff..f2a8d577e 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/uninstall/debian.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/uninstall/debian.po
@@ -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"
@@ -17,144 +17,163 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/uninstall/debian.md:6
 msgid ""
 "Removing Funkwhale data is __irreversible__. Make sure you [back up your "
-"data](../upgrade_docs/backup.md)."
+"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
+#: ../../administrator/uninstall/debian.md
 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
+#: ../../administrator/uninstall/debian.md
 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
+#: ../../administrator/uninstall/debian.md:95
 msgid ""
 "This action is __irreversible__. Make sure you have [backed up your "
-"data](../upgrade_docs/backup.md) before proceeding."
+"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
+#: ../../administrator/uninstall/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."
+"[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
+#: ../../administrator/uninstall/debian.md
 msgid "Apt"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md
+#: ../../administrator/uninstall/debian.md
 msgid "Python"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:170
+#: ../../administrator/uninstall/debian.md:170
 msgid "Uninstall any dependencies you don't need."
 msgstr ""
 
+#~ msgid ""
+#~ "Removing Funkwhale data is __irreversible__."
+#~ " Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This action is __irreversible__. Make "
+#~ "sure you have [backed up your "
+#~ "data](../upgrade_docs/backup.md) before proceeding."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This action deletes the `/srv/funkwhale/` "
+#~ "directory. Make sure you have [backed"
+#~ " up any data](../upgrade_docs/backup.md) you "
+#~ "want to keep."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/uninstall/docker.po b/docs/locales/en_GB/LC_MESSAGES/administrator/uninstall/docker.po
index 4ee09b8c9..29a244b87 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/uninstall/docker.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/uninstall/docker.po
@@ -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"
@@ -17,96 +17,108 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/uninstall/docker.md:6
 msgid ""
 "Removing Funkwhale data is __irreversible__. Make sure you [back up your "
-"data](../upgrade_docs/backup.md)."
+"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
+#: ../../administrator/uninstall/docker.md
 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
+#: ../../administrator/uninstall/docker.md
 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
+#: ../../administrator/uninstall/docker.md:77
 msgid ""
 "This action is __irreversible__. Make sure you have [backed up your "
-"data](../upgrade_docs/backup.md) before proceeding."
+"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 ""
 
+#~ msgid ""
+#~ "Removing Funkwhale data is __irreversible__."
+#~ " Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This action is __irreversible__. Make "
+#~ "sure you have [backed up your "
+#~ "data](../upgrade_docs/backup.md) before proceeding."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/uninstall/quick-install.po b/docs/locales/en_GB/LC_MESSAGES/administrator/uninstall/quick-install.po
index 5b875a203..b8a091349 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/uninstall/quick-install.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/uninstall/quick-install.po
@@ -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"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -29,136 +29,155 @@ msgid ""
 " instructions in this guide."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:6
+#: ../../administrator/uninstall/quick-install.md:6
 msgid ""
 "Removing Funkwhale data is __irreversible__. Make sure you [back up your "
-"data](../upgrade_docs/backup.md)."
+"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
+#: ../../administrator/uninstall/quick-install.md
 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
+#: ../../administrator/uninstall/quick-install.md
 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
+#: ../../administrator/uninstall/quick-install.md:95
 msgid ""
 "This action is __irreversible__. Make sure you have [backed up your "
-"data](../upgrade_docs/backup.md) before proceeding."
+"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
+#: ../../administrator/uninstall/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."
+"[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
+#: ../../administrator/uninstall/quick-install.md
 msgid "Apt"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md
+#: ../../administrator/uninstall/quick-install.md
 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 ""
 
+#~ msgid ""
+#~ "Removing Funkwhale data is __irreversible__."
+#~ " Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This action is __irreversible__. Make "
+#~ "sure you have [backed up your "
+#~ "data](../upgrade_docs/backup.md) before proceeding."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This action deletes the `/srv/funkwhale/` "
+#~ "directory. Make sure you have [backed"
+#~ " up any data](../upgrade_docs/backup.md) you "
+#~ "want to keep."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/upgrade/debian.po b/docs/locales/en_GB/LC_MESSAGES/administrator/upgrade/debian.po
index 365c65c6a..1e41df85b 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/upgrade/debian.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/upgrade/debian.po
@@ -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"
@@ -17,83 +17,102 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/upgrade/debian.md:3
 msgid ""
 "If you installed Funkwhale following the [Debian "
-"guide](../installation_docs/debian.md), follow these steps to upgrade."
+"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
+#: ../../administrator/upgrade/debian.md:33
 msgid ""
-"Follow the [Download Funkwhale](../installation_docs/debian.md#3"
-"-download-funkwhale) instructions in the installation guide."
+"Follow the [Download Funkwhale](../installation/debian.md#3-download-"
+"funkwhale) instructions in the installation guide."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:35
+#: ../../administrator/upgrade/debian.md:35
 msgid ""
-"Follow the [Install the Funkwhale API](../installation_docs/debian.md#4"
+"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 ""
 
+#~ msgid ""
+#~ "If you installed Funkwhale following the"
+#~ " [Debian guide](../installation_docs/debian.md), follow"
+#~ " these steps to upgrade."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Follow the [Download "
+#~ "Funkwhale](../installation_docs/debian.md#3-download-funkwhale)"
+#~ " instructions in the installation guide."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Follow the [Install the Funkwhale "
+#~ "API](../installation_docs/debian.md#4-install-the-"
+#~ "funkwhale-api) instructions in the "
+#~ "installation guide."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/upgrade/docker.po b/docs/locales/en_GB/LC_MESSAGES/administrator/upgrade/docker.po
index e16e21076..f1afab3c8 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/upgrade/docker.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/upgrade/docker.po
@@ -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"
@@ -17,82 +17,82 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/upgrade/docker.md:3
 msgid ""
 "If you installed Funkwhale following the [Docker "
-"guide](../installation_docs/docker.md), follow these steps to upgrade."
+"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. "
@@ -101,46 +101,46 @@ msgid ""
 "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"
@@ -148,3 +148,9 @@ msgid ""
 "everything is working."
 msgstr ""
 
+#~ msgid ""
+#~ "If you installed Funkwhale following the"
+#~ " [Docker guide](../installation_docs/docker.md), follow"
+#~ " these steps to upgrade."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/administrator/upgrade/quick-install.po b/docs/locales/en_GB/LC_MESSAGES/administrator/upgrade/quick-install.po
index d2c0a14c6..b66e4d141 100644
--- a/docs/locales/en_GB/LC_MESSAGES/administrator/upgrade/quick-install.po
+++ b/docs/locales/en_GB/LC_MESSAGES/administrator/upgrade/quick-install.po
@@ -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"
@@ -17,18 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/upgrade/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:"
+"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 ""
 
+#~ 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:"
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/contributor/documentation.po b/docs/locales/en_GB/LC_MESSAGES/contributor/documentation.po
index 81d318fb1..c31cd000b 100644
--- a/docs/locales/en_GB/LC_MESSAGES/contributor/documentation.po
+++ b/docs/locales/en_GB/LC_MESSAGES/contributor/documentation.po
@@ -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"
@@ -17,52 +17,52 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -71,17 +71,17 @@ msgid ""
 " 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 "
@@ -91,33 +91,33 @@ msgid ""
 "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 "
@@ -126,104 +126,107 @@ msgid ""
 "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 ""
 
+#~ msgid ""
+#~ "Add a [changelog "
+#~ "fragment](../developer_documentation/workflows/changelog.md)"
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/contributor/index.po b/docs/locales/en_GB/LC_MESSAGES/contributor/index.po
index 9b93dd8b5..09f70b3ce 100644
--- a/docs/locales/en_GB/LC_MESSAGES/contributor/index.po
+++ b/docs/locales/en_GB/LC_MESSAGES/contributor/index.po
@@ -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"
@@ -17,18 +17,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\n"
 
-#: ../../contributor_documentation/index.md:1
+#: ../../contributor/index.md:1
 msgid "Get started"
 msgstr ""
 
-#: ../../contributor_documentation/index.md:4
+#: ../../contributor/index.md:4
 msgid ""
 "Are you a software developer? Check out our [developer "
-"documentation](../developer_documentation/index.md) to contribute to our "
-"codebase."
+"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"
@@ -36,22 +35,22 @@ msgid ""
 "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"
@@ -59,3 +58,10 @@ msgid ""
 "translations in your language."
 msgstr ""
 
+#~ msgid ""
+#~ "Are you a software developer? Check "
+#~ "out our [developer "
+#~ "documentation](../developer_documentation/index.md) to "
+#~ "contribute to our codebase."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/moderator/allow-listing/index.po b/docs/locales/en_GB/LC_MESSAGES/moderator/allow-listing/index.po
index 83776d667..5c3cdeb3a 100644
--- a/docs/locales/en_GB/LC_MESSAGES/moderator/allow-listing/index.po
+++ b/docs/locales/en_GB/LC_MESSAGES/moderator/allow-listing/index.po
@@ -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"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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,"
@@ -33,10 +33,19 @@ msgid ""
 "pods on your allow-list can interact with your pod."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/index.md:5
+#: ../../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_domain.md) to remove this content."
+"content](../domains/purge.md) to remove this content."
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/moderator/domains/add.po b/docs/locales/en_GB/LC_MESSAGES/moderator/domains/add.po
index 0c738b955..58a41aa4b 100644
--- a/docs/locales/en_GB/LC_MESSAGES/moderator/domains/add.po
+++ b/docs/locales/en_GB/LC_MESSAGES/moderator/domains/add.po
@@ -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"
@@ -17,88 +17,91 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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](add_rule.md) to it."
+"[add moderation rules](rules/add.md) to it."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_domain.md
+#: ../../moderator/domains/add.md
 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
+#: ../../moderator/domains/add.md
 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
+#: ../../moderator/domains/add.md
 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 ""
 
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/moderator/index.po b/docs/locales/en_GB/LC_MESSAGES/moderator/index.po
index 9bc5d0675..b2a7872cf 100644
--- a/docs/locales/en_GB/LC_MESSAGES/moderator/index.po
+++ b/docs/locales/en_GB/LC_MESSAGES/moderator/index.po
@@ -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"
@@ -17,40 +17,40 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -59,23 +59,23 @@ msgid ""
 "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
+#: ../../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."
+"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"
@@ -84,37 +84,65 @@ msgid ""
 "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
+#: ../../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 "
+"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
+#: ../../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."
+"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 ""
 
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/en_GB/LC_MESSAGES/moderator/reports/content.po b/docs/locales/en_GB/LC_MESSAGES/moderator/reports/content.po
index b2572a144..c0d9ef58a 100644
--- a/docs/locales/en_GB/LC_MESSAGES/moderator/reports/content.po
+++ b/docs/locales/en_GB/LC_MESSAGES/moderator/reports/content.po
@@ -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"
@@ -17,158 +17,150 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../moderator/reports/content.md
 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
+#: ../../moderator/reports/content.md
 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
+#: ../../moderator/reports/content.md
 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
+#: ../../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](internal_notes.md) to keep a "
-"record of your changes."
+"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 ""
 
+#~ msgid "[Search for the report](search_reports.md)."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/moderator/reports/notes.po b/docs/locales/en_GB/LC_MESSAGES/moderator/reports/notes.po
index 41be0a0b1..6a9ce1db1 100644
--- a/docs/locales/en_GB/LC_MESSAGES/moderator/reports/notes.po
+++ b/docs/locales/en_GB/LC_MESSAGES/moderator/reports/notes.po
@@ -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"
@@ -17,119 +17,110 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../moderator/reports/notes.md
 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
+#: ../../moderator/reports/notes.md
 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
+#: ../../moderator/reports/notes.md
 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 ""
 
+#~ msgid "[Search for the report](search_reports.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/moderator/reports/search.po b/docs/locales/en_GB/LC_MESSAGES/moderator/reports/search.po
index acb66da34..5c48c2f43 100644
--- a/docs/locales/en_GB/LC_MESSAGES/moderator/reports/search.po
+++ b/docs/locales/en_GB/LC_MESSAGES/moderator/reports/search.po
@@ -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"
@@ -17,94 +17,94 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../moderator/reports/search.md
 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
+#: ../../moderator/reports/search.md
 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
+#: ../../moderator/reports/search.md
 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
+#: ../../moderator/reports/search.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."
+"[user](users.md) or [content](content.md). You can also update the "
+"[internal notes](notes.md) on the report."
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/moderator/reports/users.po b/docs/locales/en_GB/LC_MESSAGES/moderator/reports/users.po
index 96b592606..cf8832a9c 100644
--- a/docs/locales/en_GB/LC_MESSAGES/moderator/reports/users.po
+++ b/docs/locales/en_GB/LC_MESSAGES/moderator/reports/users.po
@@ -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"
@@ -17,96 +17,111 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../moderator/reports/users.md
 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
+#: ../../moderator/reports/users.md
 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
+#: ../../moderator/reports/users.md:23 ../../moderator/reports/users.md:33
 msgid ""
-"[Search for the report](search_reports.md) and select {guilabel}`Open in "
+"[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
+#: ../../moderator/reports/users.md
 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
+#: ../../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](internal_notes.md) to keep a record of your changes."
+"notes](notes.md) to keep a record of your changes."
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/moderator/reports/view.po b/docs/locales/en_GB/LC_MESSAGES/moderator/reports/view.po
index 5bbc8c8dc..fd11321cd 100644
--- a/docs/locales/en_GB/LC_MESSAGES/moderator/reports/view.po
+++ b/docs/locales/en_GB/LC_MESSAGES/moderator/reports/view.po
@@ -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"
@@ -17,144 +17,146 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../moderator/reports/view.md
 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
+#: ../../moderator/reports/view.md
 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
+#: ../../moderator/reports/view.md
 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
+#: ../../moderator/reports/view.md:48
 msgid ""
-"Use the tools on this page the handle the reported "
-"[content](handle_content.md) or [user](handle_users.md)."
+"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 ""
 
+#~ msgid ""
+#~ "Use the tools on this page the "
+#~ "handle the reported [content](handle_content.md) "
+#~ "or [user](handle_users.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/user/accounts/delete.po b/docs/locales/en_GB/LC_MESSAGES/user/accounts/delete.po
index 70c261f6f..974e45f51 100644
--- a/docs/locales/en_GB/LC_MESSAGES/user/accounts/delete.po
+++ b/docs/locales/en_GB/LC_MESSAGES/user/accounts/delete.po
@@ -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"
@@ -17,53 +17,53 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -71,61 +71,61 @@ msgid ""
 "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
+#: ../../user/accounts/delete.md
 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
+#: ../../user/accounts/delete.md
 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
+#: ../../user/accounts/delete.md:50
 msgid ""
 "That's it! You've deleted your account. You can [create another "
-"account](create_account.md) at any time."
+"account](create.md) at any time."
 msgstr ""
 
+#~ msgid ""
+#~ "That's it! You've deleted your account."
+#~ " You can [create another "
+#~ "account](create_account.md) at any time."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/user/channels/artist/delete.po b/docs/locales/en_GB/LC_MESSAGES/user/channels/artist/delete.po
index 8ac200bc2..a291ed7d2 100644
--- a/docs/locales/en_GB/LC_MESSAGES/user/channels/artist/delete.po
+++ b/docs/locales/en_GB/LC_MESSAGES/user/channels/artist/delete.po
@@ -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"
@@ -17,150 +17,164 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/channels/artist/delete.md
 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
+#: ../../user/channels/artist/delete.md
 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
+#: ../../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_artist.md)."
+"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
+#: ../../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_artist.md)."
+"You can add them again by [uploading it to your channel](upload.md)."
 msgstr ""
 
+#~ msgid ""
+#~ "That's it! You've deleted your track."
+#~ " You can add it again by "
+#~ "[uploading it to your "
+#~ "channel](upload_artist.md)."
+#~ msgstr ""
+
+#~ 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)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/user/channels/artist/upload.po b/docs/locales/en_GB/LC_MESSAGES/user/channels/artist/upload.po
index 4c70969b4..948fa8608 100644
--- a/docs/locales/en_GB/LC_MESSAGES/user/channels/artist/upload.po
+++ b/docs/locales/en_GB/LC_MESSAGES/user/channels/artist/upload.po
@@ -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"
@@ -17,328 +17,337 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/channels/artist/upload.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 "
+"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
+#: ../../user/channels/artist/upload.md
 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
+#: ../../user/channels/artist/upload.md
 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 ""
 
+#~ 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>`."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/user/channels/create.po b/docs/locales/en_GB/LC_MESSAGES/user/channels/create.po
index ea62e10f4..00a578db2 100644
--- a/docs/locales/en_GB/LC_MESSAGES/user/channels/create.po
+++ b/docs/locales/en_GB/LC_MESSAGES/user/channels/create.po
@@ -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"
@@ -17,109 +17,93 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/channels/create.md
 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 "
@@ -127,10 +111,8 @@ msgid ""
 "{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"
@@ -138,80 +120,83 @@ msgid ""
 " 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
+#: ../../user/channels/create.md
 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
+#: ../../user/channels/create.md:56
 msgid ""
 "That's it! You've created your artist channel. You can now [add some "
-"music to it](upload_artist.md)."
+"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
+#: ../../user/channels/create.md:109
 msgid ""
 "You're done! You've created your podcast channel. Now you can [add some "
-"episodes to it](upload_podcast.md)."
+"episodes to it](podcast/upload.md)."
 msgstr ""
 
+#~ msgid ""
+#~ "That's it! You've created your artist"
+#~ " channel. You can now [add some "
+#~ "music to it](upload_artist.md)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're done! You've created your podcast"
+#~ " channel. Now you can [add some "
+#~ "episodes to it](upload_podcast.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/user/channels/podcast/delete.po b/docs/locales/en_GB/LC_MESSAGES/user/channels/podcast/delete.po
index 871faac92..63fce5e0c 100644
--- a/docs/locales/en_GB/LC_MESSAGES/user/channels/podcast/delete.po
+++ b/docs/locales/en_GB/LC_MESSAGES/user/channels/podcast/delete.po
@@ -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"
@@ -17,150 +17,164 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/channels/podcast/delete.md
 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
+#: ../../user/channels/podcast/delete.md
 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
+#: ../../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_podcast.md)."
+"[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
+#: ../../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_podcast.md)."
+" You can add them again by [uploading it to your channel](upload.md)."
 msgstr ""
 
+#~ msgid ""
+#~ "That's it! You've deleted your episode."
+#~ " You can add it again by "
+#~ "[uploading it to your "
+#~ "channel](upload_podcast.md)."
+#~ msgstr ""
+
+#~ 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)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/user/channels/podcast/upload.po b/docs/locales/en_GB/LC_MESSAGES/user/channels/podcast/upload.po
index 1fa96371c..4209908b9 100644
--- a/docs/locales/en_GB/LC_MESSAGES/user/channels/podcast/upload.po
+++ b/docs/locales/en_GB/LC_MESSAGES/user/channels/podcast/upload.po
@@ -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"
@@ -17,327 +17,336 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/channels/podcast/upload.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 "
+"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
+#: ../../user/channels/podcast/upload.md
 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
+#: ../../user/channels/podcast/upload.md
 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 ""
 
+#~ 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>`."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/user/libraries/content/edit.po b/docs/locales/en_GB/LC_MESSAGES/user/libraries/content/edit.po
index f6faff90d..ba075b563 100644
--- a/docs/locales/en_GB/LC_MESSAGES/user/libraries/content/edit.po
+++ b/docs/locales/en_GB/LC_MESSAGES/user/libraries/content/edit.po
@@ -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"
@@ -17,272 +17,279 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_music.md)."
+"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
+#: ../../user/libraries/content/edit.md
 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
+#: ../../user/libraries/content/edit.md
 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 ""
 
+#~ msgid ""
+#~ "You can edit library content after "
+#~ "you have uploaded it. This is "
+#~ "helpful if the content isn't "
+#~ "[tagged](./tag_music.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/user/libraries/content/tag.po b/docs/locales/en_GB/LC_MESSAGES/user/libraries/content/tag.po
index 8af1dd0d4..519bdf44f 100644
--- a/docs/locales/en_GB/LC_MESSAGES/user/libraries/content/tag.po
+++ b/docs/locales/en_GB/LC_MESSAGES/user/libraries/content/tag.po
@@ -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"
@@ -17,18 +17,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -36,317 +36,323 @@ msgid ""
 "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
+#: ../../user/libraries/content/tag.md
 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
+#: ../../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_content.md)"
+" 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 ""
 
+#~ msgid ""
+#~ "That's it! You've added ID3 tags "
+#~ "to your files. You can now [add"
+#~ " these to a library](upload_content.md)"
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/user/libraries/content/upload.po b/docs/locales/en_GB/LC_MESSAGES/user/libraries/content/upload.po
index 737fa4aa2..29894974a 100644
--- a/docs/locales/en_GB/LC_MESSAGES/user/libraries/content/upload.po
+++ b/docs/locales/en_GB/LC_MESSAGES/user/libraries/content/upload.po
@@ -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"
@@ -17,90 +17,100 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/libraries/content/upload.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)."
+"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
+#: ../../user/libraries/content/upload.md
 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 ""
 
+#~ 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)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/user/playlists/content/add.po b/docs/locales/en_GB/LC_MESSAGES/user/playlists/content/add.po
index e65722381..95d3f6105 100644
--- a/docs/locales/en_GB/LC_MESSAGES/user/playlists/content/add.po
+++ b/docs/locales/en_GB/LC_MESSAGES/user/playlists/content/add.po
@@ -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"
@@ -17,167 +17,173 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/playlists/content/add.md
 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
+#: ../../user/playlists/content/add.md
 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
+#: ../../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:"
+"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 ""
 
+#~ msgid ""
+#~ "You can add all content that is"
+#~ " currently in your [player "
+#~ "queue](../queue/index.md). To do this:"
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/user/playlists/create.po b/docs/locales/en_GB/LC_MESSAGES/user/playlists/create.po
index e89b86beb..22820bc5b 100644
--- a/docs/locales/en_GB/LC_MESSAGES/user/playlists/create.po
+++ b/docs/locales/en_GB/LC_MESSAGES/user/playlists/create.po
@@ -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"
@@ -17,98 +17,96 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/playlists/create.md
 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
+#: ../../user/playlists/create.md
 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
+#: ../../user/playlists/create.md:41
 msgid ""
 "Congratulations! You've created your playlist. Now you can [add some "
-"content to it](add_content.md)."
+"content to it](content/add.md)."
 msgstr ""
 
+#~ msgid ""
+#~ "Congratulations! You've created your playlist."
+#~ " Now you can [add some content "
+#~ "to it](add_content.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/user/playlists/listen.po b/docs/locales/en_GB/LC_MESSAGES/user/playlists/listen.po
index 5a326a280..6f8f43b46 100644
--- a/docs/locales/en_GB/LC_MESSAGES/user/playlists/listen.po
+++ b/docs/locales/en_GB/LC_MESSAGES/user/playlists/listen.po
@@ -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"
@@ -17,108 +17,110 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_library)."
+"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
+#: ../../user/playlists/listen.md
 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
+#: ../../user/playlists/listen.md
 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 ""
 
+#~ msgid ""
+#~ "You can only listen to content in"
+#~ " libraries you have access to. For"
+#~ " more information, see [Follow a "
+#~ "library](../libraries/follow_library)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/user/plugins/scrobbler.po b/docs/locales/en_GB/LC_MESSAGES/user/plugins/scrobbler.po
index d4732cd98..194870d57 100644
--- a/docs/locales/en_GB/LC_MESSAGES/user/plugins/scrobbler.po
+++ b/docs/locales/en_GB/LC_MESSAGES/user/plugins/scrobbler.po
@@ -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"
@@ -17,18 +17,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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"
@@ -36,91 +36,87 @@ msgid ""
 "enables you to keep a record of your listens."
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:10
+#: ../../user/plugins/scrobbler.md:10
 msgid ""
 "Using ListenBrainz or Maloja? Check out the "
-"[ListenBrainz](listenbrainz_plugin) and [Maloja](maloja_plugin) plugins!"
+"[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
+#: ../../user/plugins/scrobbler.md
 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 ""
 
+#~ msgid ""
+#~ "Using ListenBrainz or Maloja? Check out"
+#~ " the [ListenBrainz](listenbrainz_plugin) and "
+#~ "[Maloja](maloja_plugin) plugins!"
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/user/radios/delete.po b/docs/locales/en_GB/LC_MESSAGES/user/radios/delete.po
index d39b51660..136c59e8e 100644
--- a/docs/locales/en_GB/LC_MESSAGES/user/radios/delete.po
+++ b/docs/locales/en_GB/LC_MESSAGES/user/radios/delete.po
@@ -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"
@@ -17,66 +17,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/radios/delete.md
 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
+#: ../../user/radios/delete.md
 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
+#: ../../user/radios/delete.md:33
 msgid ""
 "That's it! You've deleted your radio. You can [create a new "
-"one](create_radio.md) at any time."
+"one](create.md) at any time."
 msgstr ""
 
+#~ msgid ""
+#~ "That's it! You've deleted your radio."
+#~ " You can [create a new "
+#~ "one](create_radio.md) at any time."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/user/radios/listen.po b/docs/locales/en_GB/LC_MESSAGES/user/radios/listen.po
index 602d19bf9..d57d7df36 100644
--- a/docs/locales/en_GB/LC_MESSAGES/user/radios/listen.po
+++ b/docs/locales/en_GB/LC_MESSAGES/user/radios/listen.po
@@ -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"
@@ -17,138 +17,138 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_library)."
+"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
+#: ../../user/radios/listen.md
 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
+#: ../../user/radios/listen.md
 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 ""
 
+#~ msgid ""
+#~ "You can only listen to content in"
+#~ " libraries you have access to. For"
+#~ " more information, see [Follow a "
+#~ "library](../libraries/follow_library)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_GB/LC_MESSAGES/user/subsonic/disable.po b/docs/locales/en_GB/LC_MESSAGES/user/subsonic/disable.po
index b42d91e77..4e5c3a9a8 100644
--- a/docs/locales/en_GB/LC_MESSAGES/user/subsonic/disable.po
+++ b/docs/locales/en_GB/LC_MESSAGES/user/subsonic/disable.po
@@ -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"
@@ -17,68 +17,70 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/subsonic/disable.md
 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
+#: ../../user/subsonic/disable.md
 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
+#: ../../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](./subsonic_password.md)."
+"password](password/request.md)."
 msgstr ""
 
+#~ 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)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/configuration/change-url.po b/docs/locales/en_US/LC_MESSAGES/administrator/configuration/change-url.po
index c02db6c4d..b2b26db2d 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/configuration/change-url.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/configuration/change-url.po
@@ -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"
@@ -17,90 +17,96 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_docs/backup.md)."
+"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
+#: ../../administrator/configuration/change-url.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md
+#: ../../administrator/configuration/change-url.md
 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
+#: ../../administrator/configuration/change-url.md
 msgid "Nginx"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md
+#: ../../administrator/configuration/change-url.md
 msgid "Apache"
 msgstr ""
 
+#~ msgid ""
+#~ "Running `fix_federation_ids` with the "
+#~ "`--no-dry-run` flag is irreversible. "
+#~ "Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/configuration/env-file.po b/docs/locales/en_US/LC_MESSAGES/administrator/configuration/env-file.po
index d384e5036..854b3f4c7 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/configuration/env-file.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/configuration/env-file.po
@@ -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"
@@ -17,49 +17,49 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/configuration/env-file.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md
+#: ../../administrator/configuration/env-file.md
 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 ""
 
@@ -73,7 +73,7 @@ msgid ""
 "``https``."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:53
+#: ../../administrator/configuration/env-file.md:53
 msgid "Database and redis configuration"
 msgstr ""
 
@@ -141,7 +141,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 ""
 
@@ -178,17 +178,15 @@ msgid ""
 " 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 ""
 
@@ -254,17 +252,17 @@ 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 ""
 
@@ -336,7 +334,7 @@ msgid ""
 " 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 ""
 
@@ -379,7 +377,7 @@ msgid ""
 "this directory."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:148
+#: ../../administrator/configuration/env-file.md:148
 msgid "API configuration"
 msgstr ""
 
@@ -402,7 +400,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."
@@ -434,7 +432,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 ""
 
@@ -448,7 +446,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 ""
 
@@ -477,7 +475,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 ""
 
@@ -506,7 +504,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 ""
 
@@ -515,7 +513,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 ""
 
@@ -571,7 +569,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 ""
 
@@ -581,11 +579,11 @@ msgid ""
 "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 ""
 
@@ -633,3 +631,8 @@ msgid ""
 "defaults to sys.getdefaultencoding(). errors defaults to 'strict'."
 msgstr ""
 
+#~ msgid ""
+#~ "See {doc}`/administrator_documentation/configuration_docs/ldap`"
+#~ " for more information."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/configuration/instance-settings.po b/docs/locales/en_US/LC_MESSAGES/administrator/configuration/instance-settings.po
index b2bc23ef2..659e4b6c9 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/configuration/instance-settings.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/configuration/instance-settings.po
@@ -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"
@@ -17,181 +17,181 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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 "
@@ -199,235 +199,241 @@ msgid ""
 " 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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 ""
 
+#~ msgid "{doc}`../../moderator_documentation/content/library_visibility`."
+#~ msgstr ""
+
+#~ msgid "{doc}`../../moderator_documentation/reports/handle_users`"
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/configuration/mrf.po b/docs/locales/en_US/LC_MESSAGES/administrator/configuration/mrf.po
index 7b08fa2de..aa813b12c 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/configuration/mrf.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/configuration/mrf.po
@@ -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"
@@ -17,97 +17,97 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_documentation/index.md)."
+"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 "
@@ -115,46 +115,58 @@ msgid ""
 "{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
+#: ../../administrator/configuration/mrf.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md
+#: ../../administrator/configuration/mrf.md
 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 ""
 
+#~ 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)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/configuration/rate-limiting.po b/docs/locales/en_US/LC_MESSAGES/administrator/configuration/rate-limiting.po
index 4bd899ee7..71a20499a 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/configuration/rate-limiting.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/configuration/rate-limiting.po
@@ -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"
@@ -17,327 +17,336 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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 "
+"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 ""
 
+#~ 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 ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/django/delete-content.po b/docs/locales/en_US/LC_MESSAGES/administrator/django/delete-content.po
index 4798d631a..800300cca 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/django/delete-content.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/django/delete-content.po
@@ -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"
@@ -17,166 +17,173 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/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 "
+"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 ""
 
+#~ msgid ""
+#~ "Deleting content using the Django "
+#~ "dashboard isn't recommended. Use an "
+#~ "object's [moderation "
+#~ "page](../../moderator_documentation/content/delete_content.md) "
+#~ "where possible."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/import.po b/docs/locales/en_US/LC_MESSAGES/administrator/import.po
index 023abcdfb..05d5a3660 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/import.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/import.po
@@ -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"
@@ -17,171 +17,168 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_documentation/libraries/tag_music.md). We recommend "
-"using [Musicbrainz Picard](https://picard.musicbrainz.org/) for tagging."
+"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
+#: ../../administrator/import.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md
+#: ../../administrator/import.md
 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
+#: ../../administrator/import.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 "
+"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 "
@@ -189,21 +186,20 @@ msgid ""
 "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 "
@@ -212,77 +208,76 @@ msgid ""
 "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
+#: ../../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_docs/env_file.md#in-place-import-"
-"configuration) for more information."
+"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
+#: ../../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_docs/env_file.md#in-place-import-"
-"configuration) for more information."
+"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"
@@ -291,112 +286,148 @@ msgid ""
 "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
+#: ../../administrator/import.md
 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 ""
 
+#~ 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."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/index.po b/docs/locales/en_US/LC_MESSAGES/administrator/index.po
index e31c8e8cf..9c6a81f69 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/index.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/index.po
@@ -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"
@@ -17,59 +17,97 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_docs/index.md). Choose the installation method that "
-"works for you!"
+"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
+#: ../../administrator/index.md:15
 msgid ""
 "Once you've installed Funkwhale, you can use [the guides in this "
-"section](configuration_docs/index.md) to configure it."
+"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
+#: ../../administrator/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)."
+"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
+#: ../../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_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."
+"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 ""
 
+#~ 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!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you've installed Funkwhale, you can"
+#~ " use [the guides in this "
+#~ "section](configuration_docs/index.md) to configure "
+#~ "it."
+#~ msgstr ""
+
+#~ 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)."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/installation/migrate.po b/docs/locales/en_US/LC_MESSAGES/administrator/installation/migrate.po
index 2c4dc5cde..31a0e1dca 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/installation/migrate.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/installation/migrate.po
@@ -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"
@@ -17,212 +17,212 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/installation/migrate.md
 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
+#: ../../administrator/installation/migrate.md:17
 msgid ""
-"Make sure you [back up your data](../upgrade_docs/backup.md) before "
+"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
+#: ../../administrator/installation/migrate.md
 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
+#: ../../administrator/installation/migrate.md
 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 "
@@ -230,17 +230,24 @@ msgid ""
 "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 ""
 
+#~ msgid ""
+#~ "Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md) before proceeding. "
+#~ "This ensures you don't lose anything "
+#~ "during the migration."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/manage-script/create-library.po b/docs/locales/en_US/LC_MESSAGES/administrator/manage-script/create-library.po
index d899c02a1..634e34d92 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/manage-script/create-library.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/manage-script/create-library.po
@@ -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"
@@ -17,118 +17,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/manage-script/create-library.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md
+#: ../../administrator/manage-script/create-library.md
 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 ""
 
+#~ msgid ""
+#~ "The [privacy "
+#~ "level](../../user_documentation/libraries/create_library.md) of"
+#~ " the library"
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/manage-script/database.po b/docs/locales/en_US/LC_MESSAGES/administrator/manage-script/database.po
index 50ea62511..3f95b3ea5 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/manage-script/database.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/manage-script/database.po
@@ -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"
@@ -17,18 +17,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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"
@@ -36,14 +36,13 @@ msgid ""
 "deletes the database object."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/database.md:8
+#: ../../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_docs/backup.md)."
+"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 "
@@ -51,11 +50,18 @@ msgid ""
 "pruning action."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/database.md
+#: ../../administrator/manage-script/database.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/database.md
+#: ../../administrator/manage-script/database.md
 msgid "Docker"
 msgstr ""
 
+#~ msgid ""
+#~ "Running `check_inplace_files` with the "
+#~ "`--no-dry-run` flag is irreversible. "
+#~ "Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/manage-script/library.po b/docs/locales/en_US/LC_MESSAGES/administrator/manage-script/library.po
index 852e4a009..94a816cd7 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/manage-script/library.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/manage-script/library.po
@@ -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"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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, "
@@ -29,13 +29,13 @@ msgid ""
 "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 "
@@ -45,63 +45,69 @@ msgid ""
 "perform the pruning action."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:10
+#: ../../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_docs/backup.md)."
+"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
+#: ../../administrator/manage-script/library.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md
+#: ../../administrator/manage-script/library.md
 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 ""
 
+#~ msgid ""
+#~ "Running `prune_library` commands with the "
+#~ "`--no-dry-run` flag is irreversible. "
+#~ "Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/troubleshooting/backend.po b/docs/locales/en_US/LC_MESSAGES/administrator/troubleshooting/backend.po
index 0d68f7ada..68ecf4387 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/troubleshooting/backend.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/troubleshooting/backend.po
@@ -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"
@@ -17,84 +17,84 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/troubleshooting/backend.md
 msgid "Nginx"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md
+#: ../../administrator/troubleshooting/backend.md
 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
+#: ../../administrator/troubleshooting/backend.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md
+#: ../../administrator/troubleshooting/backend.md
 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` "
@@ -102,140 +102,154 @@ msgid ""
 "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
+#: ../../administrator/troubleshooting/backend.md
 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
+#: ../../administrator/troubleshooting/backend.md:109
 msgid ""
 "Make sure your files are [tagged "
-"correctly](../../user_documentation/libraries/tag_music.md)."
+"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
+#: ../../administrator/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."
+"out the [get help](help.md) guide for information about where to ask your"
+" question and what details to provide."
 msgstr ""
 
+#~ msgid ""
+#~ "Make sure your files are [tagged "
+#~ "correctly](../../user_documentation/libraries/tag_music.md)."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/troubleshooting/frontend.po b/docs/locales/en_US/LC_MESSAGES/administrator/troubleshooting/frontend.po
index cb75bc56a..bdb6fc125 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/troubleshooting/frontend.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/troubleshooting/frontend.po
@@ -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"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -41,133 +41,142 @@ msgid ""
 "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
+#: ../../administrator/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."
+"out the [get help](help.md) guide for information about where to ask your"
+" question and what details to provide."
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/uninstall/debian.po b/docs/locales/en_US/LC_MESSAGES/administrator/uninstall/debian.po
index 794c48eff..f2a8d577e 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/uninstall/debian.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/uninstall/debian.po
@@ -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"
@@ -17,144 +17,163 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/uninstall/debian.md:6
 msgid ""
 "Removing Funkwhale data is __irreversible__. Make sure you [back up your "
-"data](../upgrade_docs/backup.md)."
+"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
+#: ../../administrator/uninstall/debian.md
 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
+#: ../../administrator/uninstall/debian.md
 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
+#: ../../administrator/uninstall/debian.md:95
 msgid ""
 "This action is __irreversible__. Make sure you have [backed up your "
-"data](../upgrade_docs/backup.md) before proceeding."
+"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
+#: ../../administrator/uninstall/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."
+"[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
+#: ../../administrator/uninstall/debian.md
 msgid "Apt"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md
+#: ../../administrator/uninstall/debian.md
 msgid "Python"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:170
+#: ../../administrator/uninstall/debian.md:170
 msgid "Uninstall any dependencies you don't need."
 msgstr ""
 
+#~ msgid ""
+#~ "Removing Funkwhale data is __irreversible__."
+#~ " Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This action is __irreversible__. Make "
+#~ "sure you have [backed up your "
+#~ "data](../upgrade_docs/backup.md) before proceeding."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This action deletes the `/srv/funkwhale/` "
+#~ "directory. Make sure you have [backed"
+#~ " up any data](../upgrade_docs/backup.md) you "
+#~ "want to keep."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/uninstall/docker.po b/docs/locales/en_US/LC_MESSAGES/administrator/uninstall/docker.po
index 4ee09b8c9..29a244b87 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/uninstall/docker.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/uninstall/docker.po
@@ -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"
@@ -17,96 +17,108 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/uninstall/docker.md:6
 msgid ""
 "Removing Funkwhale data is __irreversible__. Make sure you [back up your "
-"data](../upgrade_docs/backup.md)."
+"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
+#: ../../administrator/uninstall/docker.md
 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
+#: ../../administrator/uninstall/docker.md
 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
+#: ../../administrator/uninstall/docker.md:77
 msgid ""
 "This action is __irreversible__. Make sure you have [backed up your "
-"data](../upgrade_docs/backup.md) before proceeding."
+"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 ""
 
+#~ msgid ""
+#~ "Removing Funkwhale data is __irreversible__."
+#~ " Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This action is __irreversible__. Make "
+#~ "sure you have [backed up your "
+#~ "data](../upgrade_docs/backup.md) before proceeding."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/uninstall/quick-install.po b/docs/locales/en_US/LC_MESSAGES/administrator/uninstall/quick-install.po
index 5b875a203..b8a091349 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/uninstall/quick-install.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/uninstall/quick-install.po
@@ -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"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -29,136 +29,155 @@ msgid ""
 " instructions in this guide."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:6
+#: ../../administrator/uninstall/quick-install.md:6
 msgid ""
 "Removing Funkwhale data is __irreversible__. Make sure you [back up your "
-"data](../upgrade_docs/backup.md)."
+"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
+#: ../../administrator/uninstall/quick-install.md
 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
+#: ../../administrator/uninstall/quick-install.md
 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
+#: ../../administrator/uninstall/quick-install.md:95
 msgid ""
 "This action is __irreversible__. Make sure you have [backed up your "
-"data](../upgrade_docs/backup.md) before proceeding."
+"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
+#: ../../administrator/uninstall/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."
+"[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
+#: ../../administrator/uninstall/quick-install.md
 msgid "Apt"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md
+#: ../../administrator/uninstall/quick-install.md
 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 ""
 
+#~ msgid ""
+#~ "Removing Funkwhale data is __irreversible__."
+#~ " Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This action is __irreversible__. Make "
+#~ "sure you have [backed up your "
+#~ "data](../upgrade_docs/backup.md) before proceeding."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This action deletes the `/srv/funkwhale/` "
+#~ "directory. Make sure you have [backed"
+#~ " up any data](../upgrade_docs/backup.md) you "
+#~ "want to keep."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/upgrade/debian.po b/docs/locales/en_US/LC_MESSAGES/administrator/upgrade/debian.po
index 365c65c6a..1e41df85b 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/upgrade/debian.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/upgrade/debian.po
@@ -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"
@@ -17,83 +17,102 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/upgrade/debian.md:3
 msgid ""
 "If you installed Funkwhale following the [Debian "
-"guide](../installation_docs/debian.md), follow these steps to upgrade."
+"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
+#: ../../administrator/upgrade/debian.md:33
 msgid ""
-"Follow the [Download Funkwhale](../installation_docs/debian.md#3"
-"-download-funkwhale) instructions in the installation guide."
+"Follow the [Download Funkwhale](../installation/debian.md#3-download-"
+"funkwhale) instructions in the installation guide."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:35
+#: ../../administrator/upgrade/debian.md:35
 msgid ""
-"Follow the [Install the Funkwhale API](../installation_docs/debian.md#4"
+"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 ""
 
+#~ msgid ""
+#~ "If you installed Funkwhale following the"
+#~ " [Debian guide](../installation_docs/debian.md), follow"
+#~ " these steps to upgrade."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Follow the [Download "
+#~ "Funkwhale](../installation_docs/debian.md#3-download-funkwhale)"
+#~ " instructions in the installation guide."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Follow the [Install the Funkwhale "
+#~ "API](../installation_docs/debian.md#4-install-the-"
+#~ "funkwhale-api) instructions in the "
+#~ "installation guide."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/upgrade/docker.po b/docs/locales/en_US/LC_MESSAGES/administrator/upgrade/docker.po
index e16e21076..f1afab3c8 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/upgrade/docker.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/upgrade/docker.po
@@ -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"
@@ -17,82 +17,82 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/upgrade/docker.md:3
 msgid ""
 "If you installed Funkwhale following the [Docker "
-"guide](../installation_docs/docker.md), follow these steps to upgrade."
+"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. "
@@ -101,46 +101,46 @@ msgid ""
 "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"
@@ -148,3 +148,9 @@ msgid ""
 "everything is working."
 msgstr ""
 
+#~ msgid ""
+#~ "If you installed Funkwhale following the"
+#~ " [Docker guide](../installation_docs/docker.md), follow"
+#~ " these steps to upgrade."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/administrator/upgrade/quick-install.po b/docs/locales/en_US/LC_MESSAGES/administrator/upgrade/quick-install.po
index d2c0a14c6..b66e4d141 100644
--- a/docs/locales/en_US/LC_MESSAGES/administrator/upgrade/quick-install.po
+++ b/docs/locales/en_US/LC_MESSAGES/administrator/upgrade/quick-install.po
@@ -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"
@@ -17,18 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/upgrade/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:"
+"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 ""
 
+#~ 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:"
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/contributor/documentation.po b/docs/locales/en_US/LC_MESSAGES/contributor/documentation.po
index 81d318fb1..c31cd000b 100644
--- a/docs/locales/en_US/LC_MESSAGES/contributor/documentation.po
+++ b/docs/locales/en_US/LC_MESSAGES/contributor/documentation.po
@@ -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"
@@ -17,52 +17,52 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -71,17 +71,17 @@ msgid ""
 " 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 "
@@ -91,33 +91,33 @@ msgid ""
 "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 "
@@ -126,104 +126,107 @@ msgid ""
 "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 ""
 
+#~ msgid ""
+#~ "Add a [changelog "
+#~ "fragment](../developer_documentation/workflows/changelog.md)"
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/contributor/index.po b/docs/locales/en_US/LC_MESSAGES/contributor/index.po
index 9b93dd8b5..09f70b3ce 100644
--- a/docs/locales/en_US/LC_MESSAGES/contributor/index.po
+++ b/docs/locales/en_US/LC_MESSAGES/contributor/index.po
@@ -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"
@@ -17,18 +17,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\n"
 
-#: ../../contributor_documentation/index.md:1
+#: ../../contributor/index.md:1
 msgid "Get started"
 msgstr ""
 
-#: ../../contributor_documentation/index.md:4
+#: ../../contributor/index.md:4
 msgid ""
 "Are you a software developer? Check out our [developer "
-"documentation](../developer_documentation/index.md) to contribute to our "
-"codebase."
+"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"
@@ -36,22 +35,22 @@ msgid ""
 "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"
@@ -59,3 +58,10 @@ msgid ""
 "translations in your language."
 msgstr ""
 
+#~ msgid ""
+#~ "Are you a software developer? Check "
+#~ "out our [developer "
+#~ "documentation](../developer_documentation/index.md) to "
+#~ "contribute to our codebase."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/moderator/allow-listing/index.po b/docs/locales/en_US/LC_MESSAGES/moderator/allow-listing/index.po
index 83776d667..5c3cdeb3a 100644
--- a/docs/locales/en_US/LC_MESSAGES/moderator/allow-listing/index.po
+++ b/docs/locales/en_US/LC_MESSAGES/moderator/allow-listing/index.po
@@ -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"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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,"
@@ -33,10 +33,19 @@ msgid ""
 "pods on your allow-list can interact with your pod."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/index.md:5
+#: ../../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_domain.md) to remove this content."
+"content](../domains/purge.md) to remove this content."
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/moderator/domains/add.po b/docs/locales/en_US/LC_MESSAGES/moderator/domains/add.po
index 0c738b955..58a41aa4b 100644
--- a/docs/locales/en_US/LC_MESSAGES/moderator/domains/add.po
+++ b/docs/locales/en_US/LC_MESSAGES/moderator/domains/add.po
@@ -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"
@@ -17,88 +17,91 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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](add_rule.md) to it."
+"[add moderation rules](rules/add.md) to it."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_domain.md
+#: ../../moderator/domains/add.md
 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
+#: ../../moderator/domains/add.md
 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
+#: ../../moderator/domains/add.md
 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 ""
 
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/moderator/index.po b/docs/locales/en_US/LC_MESSAGES/moderator/index.po
index 9bc5d0675..b2a7872cf 100644
--- a/docs/locales/en_US/LC_MESSAGES/moderator/index.po
+++ b/docs/locales/en_US/LC_MESSAGES/moderator/index.po
@@ -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"
@@ -17,40 +17,40 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -59,23 +59,23 @@ msgid ""
 "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
+#: ../../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."
+"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"
@@ -84,37 +84,65 @@ msgid ""
 "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
+#: ../../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 "
+"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
+#: ../../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."
+"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 ""
 
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/en_US/LC_MESSAGES/moderator/reports/content.po b/docs/locales/en_US/LC_MESSAGES/moderator/reports/content.po
index b2572a144..c0d9ef58a 100644
--- a/docs/locales/en_US/LC_MESSAGES/moderator/reports/content.po
+++ b/docs/locales/en_US/LC_MESSAGES/moderator/reports/content.po
@@ -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"
@@ -17,158 +17,150 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../moderator/reports/content.md
 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
+#: ../../moderator/reports/content.md
 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
+#: ../../moderator/reports/content.md
 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
+#: ../../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](internal_notes.md) to keep a "
-"record of your changes."
+"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 ""
 
+#~ msgid "[Search for the report](search_reports.md)."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/moderator/reports/notes.po b/docs/locales/en_US/LC_MESSAGES/moderator/reports/notes.po
index 41be0a0b1..6a9ce1db1 100644
--- a/docs/locales/en_US/LC_MESSAGES/moderator/reports/notes.po
+++ b/docs/locales/en_US/LC_MESSAGES/moderator/reports/notes.po
@@ -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"
@@ -17,119 +17,110 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../moderator/reports/notes.md
 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
+#: ../../moderator/reports/notes.md
 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
+#: ../../moderator/reports/notes.md
 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 ""
 
+#~ msgid "[Search for the report](search_reports.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/moderator/reports/search.po b/docs/locales/en_US/LC_MESSAGES/moderator/reports/search.po
index acb66da34..5c48c2f43 100644
--- a/docs/locales/en_US/LC_MESSAGES/moderator/reports/search.po
+++ b/docs/locales/en_US/LC_MESSAGES/moderator/reports/search.po
@@ -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"
@@ -17,94 +17,94 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../moderator/reports/search.md
 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
+#: ../../moderator/reports/search.md
 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
+#: ../../moderator/reports/search.md
 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
+#: ../../moderator/reports/search.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."
+"[user](users.md) or [content](content.md). You can also update the "
+"[internal notes](notes.md) on the report."
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/moderator/reports/users.po b/docs/locales/en_US/LC_MESSAGES/moderator/reports/users.po
index 96b592606..cf8832a9c 100644
--- a/docs/locales/en_US/LC_MESSAGES/moderator/reports/users.po
+++ b/docs/locales/en_US/LC_MESSAGES/moderator/reports/users.po
@@ -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"
@@ -17,96 +17,111 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../moderator/reports/users.md
 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
+#: ../../moderator/reports/users.md
 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
+#: ../../moderator/reports/users.md:23 ../../moderator/reports/users.md:33
 msgid ""
-"[Search for the report](search_reports.md) and select {guilabel}`Open in "
+"[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
+#: ../../moderator/reports/users.md
 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
+#: ../../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](internal_notes.md) to keep a record of your changes."
+"notes](notes.md) to keep a record of your changes."
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/moderator/reports/view.po b/docs/locales/en_US/LC_MESSAGES/moderator/reports/view.po
index 5bbc8c8dc..fd11321cd 100644
--- a/docs/locales/en_US/LC_MESSAGES/moderator/reports/view.po
+++ b/docs/locales/en_US/LC_MESSAGES/moderator/reports/view.po
@@ -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"
@@ -17,144 +17,146 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../moderator/reports/view.md
 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
+#: ../../moderator/reports/view.md
 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
+#: ../../moderator/reports/view.md
 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
+#: ../../moderator/reports/view.md:48
 msgid ""
-"Use the tools on this page the handle the reported "
-"[content](handle_content.md) or [user](handle_users.md)."
+"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 ""
 
+#~ msgid ""
+#~ "Use the tools on this page the "
+#~ "handle the reported [content](handle_content.md) "
+#~ "or [user](handle_users.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/user/accounts/delete.po b/docs/locales/en_US/LC_MESSAGES/user/accounts/delete.po
index 70c261f6f..974e45f51 100644
--- a/docs/locales/en_US/LC_MESSAGES/user/accounts/delete.po
+++ b/docs/locales/en_US/LC_MESSAGES/user/accounts/delete.po
@@ -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"
@@ -17,53 +17,53 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -71,61 +71,61 @@ msgid ""
 "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
+#: ../../user/accounts/delete.md
 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
+#: ../../user/accounts/delete.md
 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
+#: ../../user/accounts/delete.md:50
 msgid ""
 "That's it! You've deleted your account. You can [create another "
-"account](create_account.md) at any time."
+"account](create.md) at any time."
 msgstr ""
 
+#~ msgid ""
+#~ "That's it! You've deleted your account."
+#~ " You can [create another "
+#~ "account](create_account.md) at any time."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/user/channels/artist/delete.po b/docs/locales/en_US/LC_MESSAGES/user/channels/artist/delete.po
index 8ac200bc2..a291ed7d2 100644
--- a/docs/locales/en_US/LC_MESSAGES/user/channels/artist/delete.po
+++ b/docs/locales/en_US/LC_MESSAGES/user/channels/artist/delete.po
@@ -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"
@@ -17,150 +17,164 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/channels/artist/delete.md
 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
+#: ../../user/channels/artist/delete.md
 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
+#: ../../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_artist.md)."
+"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
+#: ../../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_artist.md)."
+"You can add them again by [uploading it to your channel](upload.md)."
 msgstr ""
 
+#~ msgid ""
+#~ "That's it! You've deleted your track."
+#~ " You can add it again by "
+#~ "[uploading it to your "
+#~ "channel](upload_artist.md)."
+#~ msgstr ""
+
+#~ 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)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/user/channels/artist/upload.po b/docs/locales/en_US/LC_MESSAGES/user/channels/artist/upload.po
index 4c70969b4..948fa8608 100644
--- a/docs/locales/en_US/LC_MESSAGES/user/channels/artist/upload.po
+++ b/docs/locales/en_US/LC_MESSAGES/user/channels/artist/upload.po
@@ -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"
@@ -17,328 +17,337 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/channels/artist/upload.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 "
+"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
+#: ../../user/channels/artist/upload.md
 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
+#: ../../user/channels/artist/upload.md
 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 ""
 
+#~ 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>`."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/user/channels/create.po b/docs/locales/en_US/LC_MESSAGES/user/channels/create.po
index ea62e10f4..00a578db2 100644
--- a/docs/locales/en_US/LC_MESSAGES/user/channels/create.po
+++ b/docs/locales/en_US/LC_MESSAGES/user/channels/create.po
@@ -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"
@@ -17,109 +17,93 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/channels/create.md
 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 "
@@ -127,10 +111,8 @@ msgid ""
 "{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"
@@ -138,80 +120,83 @@ msgid ""
 " 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
+#: ../../user/channels/create.md
 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
+#: ../../user/channels/create.md:56
 msgid ""
 "That's it! You've created your artist channel. You can now [add some "
-"music to it](upload_artist.md)."
+"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
+#: ../../user/channels/create.md:109
 msgid ""
 "You're done! You've created your podcast channel. Now you can [add some "
-"episodes to it](upload_podcast.md)."
+"episodes to it](podcast/upload.md)."
 msgstr ""
 
+#~ msgid ""
+#~ "That's it! You've created your artist"
+#~ " channel. You can now [add some "
+#~ "music to it](upload_artist.md)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're done! You've created your podcast"
+#~ " channel. Now you can [add some "
+#~ "episodes to it](upload_podcast.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/user/channels/podcast/delete.po b/docs/locales/en_US/LC_MESSAGES/user/channels/podcast/delete.po
index 871faac92..63fce5e0c 100644
--- a/docs/locales/en_US/LC_MESSAGES/user/channels/podcast/delete.po
+++ b/docs/locales/en_US/LC_MESSAGES/user/channels/podcast/delete.po
@@ -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"
@@ -17,150 +17,164 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/channels/podcast/delete.md
 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
+#: ../../user/channels/podcast/delete.md
 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
+#: ../../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_podcast.md)."
+"[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
+#: ../../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_podcast.md)."
+" You can add them again by [uploading it to your channel](upload.md)."
 msgstr ""
 
+#~ msgid ""
+#~ "That's it! You've deleted your episode."
+#~ " You can add it again by "
+#~ "[uploading it to your "
+#~ "channel](upload_podcast.md)."
+#~ msgstr ""
+
+#~ 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)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/user/channels/podcast/upload.po b/docs/locales/en_US/LC_MESSAGES/user/channels/podcast/upload.po
index 1fa96371c..4209908b9 100644
--- a/docs/locales/en_US/LC_MESSAGES/user/channels/podcast/upload.po
+++ b/docs/locales/en_US/LC_MESSAGES/user/channels/podcast/upload.po
@@ -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"
@@ -17,327 +17,336 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/channels/podcast/upload.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 "
+"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
+#: ../../user/channels/podcast/upload.md
 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
+#: ../../user/channels/podcast/upload.md
 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 ""
 
+#~ 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>`."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/user/libraries/content/edit.po b/docs/locales/en_US/LC_MESSAGES/user/libraries/content/edit.po
index f6faff90d..ba075b563 100644
--- a/docs/locales/en_US/LC_MESSAGES/user/libraries/content/edit.po
+++ b/docs/locales/en_US/LC_MESSAGES/user/libraries/content/edit.po
@@ -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"
@@ -17,272 +17,279 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_music.md)."
+"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
+#: ../../user/libraries/content/edit.md
 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
+#: ../../user/libraries/content/edit.md
 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 ""
 
+#~ msgid ""
+#~ "You can edit library content after "
+#~ "you have uploaded it. This is "
+#~ "helpful if the content isn't "
+#~ "[tagged](./tag_music.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/user/libraries/content/tag.po b/docs/locales/en_US/LC_MESSAGES/user/libraries/content/tag.po
index 8af1dd0d4..519bdf44f 100644
--- a/docs/locales/en_US/LC_MESSAGES/user/libraries/content/tag.po
+++ b/docs/locales/en_US/LC_MESSAGES/user/libraries/content/tag.po
@@ -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"
@@ -17,18 +17,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -36,317 +36,323 @@ msgid ""
 "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
+#: ../../user/libraries/content/tag.md
 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
+#: ../../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_content.md)"
+" 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 ""
 
+#~ msgid ""
+#~ "That's it! You've added ID3 tags "
+#~ "to your files. You can now [add"
+#~ " these to a library](upload_content.md)"
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/user/libraries/content/upload.po b/docs/locales/en_US/LC_MESSAGES/user/libraries/content/upload.po
index 737fa4aa2..29894974a 100644
--- a/docs/locales/en_US/LC_MESSAGES/user/libraries/content/upload.po
+++ b/docs/locales/en_US/LC_MESSAGES/user/libraries/content/upload.po
@@ -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"
@@ -17,90 +17,100 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/libraries/content/upload.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)."
+"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
+#: ../../user/libraries/content/upload.md
 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 ""
 
+#~ 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)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/user/playlists/content/add.po b/docs/locales/en_US/LC_MESSAGES/user/playlists/content/add.po
index e65722381..95d3f6105 100644
--- a/docs/locales/en_US/LC_MESSAGES/user/playlists/content/add.po
+++ b/docs/locales/en_US/LC_MESSAGES/user/playlists/content/add.po
@@ -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"
@@ -17,167 +17,173 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/playlists/content/add.md
 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
+#: ../../user/playlists/content/add.md
 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
+#: ../../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:"
+"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 ""
 
+#~ msgid ""
+#~ "You can add all content that is"
+#~ " currently in your [player "
+#~ "queue](../queue/index.md). To do this:"
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/user/playlists/create.po b/docs/locales/en_US/LC_MESSAGES/user/playlists/create.po
index e89b86beb..22820bc5b 100644
--- a/docs/locales/en_US/LC_MESSAGES/user/playlists/create.po
+++ b/docs/locales/en_US/LC_MESSAGES/user/playlists/create.po
@@ -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"
@@ -17,98 +17,96 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/playlists/create.md
 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
+#: ../../user/playlists/create.md
 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
+#: ../../user/playlists/create.md:41
 msgid ""
 "Congratulations! You've created your playlist. Now you can [add some "
-"content to it](add_content.md)."
+"content to it](content/add.md)."
 msgstr ""
 
+#~ msgid ""
+#~ "Congratulations! You've created your playlist."
+#~ " Now you can [add some content "
+#~ "to it](add_content.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/user/playlists/listen.po b/docs/locales/en_US/LC_MESSAGES/user/playlists/listen.po
index 5a326a280..6f8f43b46 100644
--- a/docs/locales/en_US/LC_MESSAGES/user/playlists/listen.po
+++ b/docs/locales/en_US/LC_MESSAGES/user/playlists/listen.po
@@ -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"
@@ -17,108 +17,110 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_library)."
+"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
+#: ../../user/playlists/listen.md
 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
+#: ../../user/playlists/listen.md
 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 ""
 
+#~ msgid ""
+#~ "You can only listen to content in"
+#~ " libraries you have access to. For"
+#~ " more information, see [Follow a "
+#~ "library](../libraries/follow_library)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/user/plugins/scrobbler.po b/docs/locales/en_US/LC_MESSAGES/user/plugins/scrobbler.po
index d4732cd98..194870d57 100644
--- a/docs/locales/en_US/LC_MESSAGES/user/plugins/scrobbler.po
+++ b/docs/locales/en_US/LC_MESSAGES/user/plugins/scrobbler.po
@@ -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"
@@ -17,18 +17,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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"
@@ -36,91 +36,87 @@ msgid ""
 "enables you to keep a record of your listens."
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:10
+#: ../../user/plugins/scrobbler.md:10
 msgid ""
 "Using ListenBrainz or Maloja? Check out the "
-"[ListenBrainz](listenbrainz_plugin) and [Maloja](maloja_plugin) plugins!"
+"[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
+#: ../../user/plugins/scrobbler.md
 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 ""
 
+#~ msgid ""
+#~ "Using ListenBrainz or Maloja? Check out"
+#~ " the [ListenBrainz](listenbrainz_plugin) and "
+#~ "[Maloja](maloja_plugin) plugins!"
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/user/radios/delete.po b/docs/locales/en_US/LC_MESSAGES/user/radios/delete.po
index d39b51660..136c59e8e 100644
--- a/docs/locales/en_US/LC_MESSAGES/user/radios/delete.po
+++ b/docs/locales/en_US/LC_MESSAGES/user/radios/delete.po
@@ -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"
@@ -17,66 +17,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/radios/delete.md
 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
+#: ../../user/radios/delete.md
 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
+#: ../../user/radios/delete.md:33
 msgid ""
 "That's it! You've deleted your radio. You can [create a new "
-"one](create_radio.md) at any time."
+"one](create.md) at any time."
 msgstr ""
 
+#~ msgid ""
+#~ "That's it! You've deleted your radio."
+#~ " You can [create a new "
+#~ "one](create_radio.md) at any time."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/user/radios/listen.po b/docs/locales/en_US/LC_MESSAGES/user/radios/listen.po
index 602d19bf9..d57d7df36 100644
--- a/docs/locales/en_US/LC_MESSAGES/user/radios/listen.po
+++ b/docs/locales/en_US/LC_MESSAGES/user/radios/listen.po
@@ -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"
@@ -17,138 +17,138 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_library)."
+"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
+#: ../../user/radios/listen.md
 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
+#: ../../user/radios/listen.md
 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 ""
 
+#~ msgid ""
+#~ "You can only listen to content in"
+#~ " libraries you have access to. For"
+#~ " more information, see [Follow a "
+#~ "library](../libraries/follow_library)."
+#~ msgstr ""
+
diff --git a/docs/locales/en_US/LC_MESSAGES/user/subsonic/disable.po b/docs/locales/en_US/LC_MESSAGES/user/subsonic/disable.po
index b42d91e77..4e5c3a9a8 100644
--- a/docs/locales/en_US/LC_MESSAGES/user/subsonic/disable.po
+++ b/docs/locales/en_US/LC_MESSAGES/user/subsonic/disable.po
@@ -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"
@@ -17,68 +17,70 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/subsonic/disable.md
 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
+#: ../../user/subsonic/disable.md
 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
+#: ../../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](./subsonic_password.md)."
+"password](password/request.md)."
 msgstr ""
 
+#~ 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)."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/configuration/change-url.po b/docs/locales/fr/LC_MESSAGES/administrator/configuration/change-url.po
index c02db6c4d..b2b26db2d 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/configuration/change-url.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/configuration/change-url.po
@@ -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"
@@ -17,90 +17,96 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_docs/backup.md)."
+"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
+#: ../../administrator/configuration/change-url.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md
+#: ../../administrator/configuration/change-url.md
 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
+#: ../../administrator/configuration/change-url.md
 msgid "Nginx"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/change_url.md
+#: ../../administrator/configuration/change-url.md
 msgid "Apache"
 msgstr ""
 
+#~ msgid ""
+#~ "Running `fix_federation_ids` with the "
+#~ "`--no-dry-run` flag is irreversible. "
+#~ "Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/configuration/env-file.po b/docs/locales/fr/LC_MESSAGES/administrator/configuration/env-file.po
index d384e5036..854b3f4c7 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/configuration/env-file.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/configuration/env-file.po
@@ -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"
@@ -17,49 +17,49 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/configuration/env-file.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md
+#: ../../administrator/configuration/env-file.md
 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 ""
 
@@ -73,7 +73,7 @@ msgid ""
 "``https``."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:53
+#: ../../administrator/configuration/env-file.md:53
 msgid "Database and redis configuration"
 msgstr ""
 
@@ -141,7 +141,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 ""
 
@@ -178,17 +178,15 @@ msgid ""
 " 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 ""
 
@@ -254,17 +252,17 @@ 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 ""
 
@@ -336,7 +334,7 @@ msgid ""
 " 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 ""
 
@@ -379,7 +377,7 @@ msgid ""
 "this directory."
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/env_file.md:148
+#: ../../administrator/configuration/env-file.md:148
 msgid "API configuration"
 msgstr ""
 
@@ -402,7 +400,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."
@@ -434,7 +432,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 ""
 
@@ -448,7 +446,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 ""
 
@@ -477,7 +475,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 ""
 
@@ -506,7 +504,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 ""
 
@@ -515,7 +513,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 ""
 
@@ -571,7 +569,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 ""
 
@@ -581,11 +579,11 @@ msgid ""
 "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 ""
 
@@ -633,3 +631,8 @@ msgid ""
 "defaults to sys.getdefaultencoding(). errors defaults to 'strict'."
 msgstr ""
 
+#~ msgid ""
+#~ "See {doc}`/administrator_documentation/configuration_docs/ldap`"
+#~ " for more information."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/configuration/instance-settings.po b/docs/locales/fr/LC_MESSAGES/administrator/configuration/instance-settings.po
index b2bc23ef2..659e4b6c9 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/configuration/instance-settings.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/configuration/instance-settings.po
@@ -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"
@@ -17,181 +17,181 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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 "
@@ -199,235 +199,241 @@ msgid ""
 " 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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
+#: ../../administrator/configuration/instance-settings.md
 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 ""
 
+#~ msgid "{doc}`../../moderator_documentation/content/library_visibility`."
+#~ msgstr ""
+
+#~ msgid "{doc}`../../moderator_documentation/reports/handle_users`"
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/configuration/mrf.po b/docs/locales/fr/LC_MESSAGES/administrator/configuration/mrf.po
index 7b08fa2de..aa813b12c 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/configuration/mrf.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/configuration/mrf.po
@@ -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"
@@ -17,97 +17,97 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_documentation/index.md)."
+"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 "
@@ -115,46 +115,58 @@ msgid ""
 "{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
+#: ../../administrator/configuration/mrf.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/configuration_docs/mrf.md
+#: ../../administrator/configuration/mrf.md
 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 ""
 
+#~ 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)."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/configuration/rate-limiting.po b/docs/locales/fr/LC_MESSAGES/administrator/configuration/rate-limiting.po
index 4bd899ee7..71a20499a 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/configuration/rate-limiting.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/configuration/rate-limiting.po
@@ -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"
@@ -17,327 +17,336 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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 "
+"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 ""
 
+#~ 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 ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/django/delete-content.po b/docs/locales/fr/LC_MESSAGES/administrator/django/delete-content.po
index 4798d631a..800300cca 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/django/delete-content.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/django/delete-content.po
@@ -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"
@@ -17,166 +17,173 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/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 "
+"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 ""
 
+#~ msgid ""
+#~ "Deleting content using the Django "
+#~ "dashboard isn't recommended. Use an "
+#~ "object's [moderation "
+#~ "page](../../moderator_documentation/content/delete_content.md) "
+#~ "where possible."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/import.po b/docs/locales/fr/LC_MESSAGES/administrator/import.po
index 023abcdfb..05d5a3660 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/import.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/import.po
@@ -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"
@@ -17,171 +17,168 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_documentation/libraries/tag_music.md). We recommend "
-"using [Musicbrainz Picard](https://picard.musicbrainz.org/) for tagging."
+"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
+#: ../../administrator/import.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/import_docs/index.md
+#: ../../administrator/import.md
 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
+#: ../../administrator/import.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 "
+"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 "
@@ -189,21 +186,20 @@ msgid ""
 "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 "
@@ -212,77 +208,76 @@ msgid ""
 "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
+#: ../../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_docs/env_file.md#in-place-import-"
-"configuration) for more information."
+"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
+#: ../../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_docs/env_file.md#in-place-import-"
-"configuration) for more information."
+"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"
@@ -291,112 +286,148 @@ msgid ""
 "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
+#: ../../administrator/import.md
 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 ""
 
+#~ 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."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/index.po b/docs/locales/fr/LC_MESSAGES/administrator/index.po
index e31c8e8cf..9c6a81f69 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/index.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/index.po
@@ -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"
@@ -17,59 +17,97 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_docs/index.md). Choose the installation method that "
-"works for you!"
+"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
+#: ../../administrator/index.md:15
 msgid ""
 "Once you've installed Funkwhale, you can use [the guides in this "
-"section](configuration_docs/index.md) to configure it."
+"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
+#: ../../administrator/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)."
+"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
+#: ../../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_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."
+"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 ""
 
+#~ 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!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Once you've installed Funkwhale, you can"
+#~ " use [the guides in this "
+#~ "section](configuration_docs/index.md) to configure "
+#~ "it."
+#~ msgstr ""
+
+#~ 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)."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/installation/migrate.po b/docs/locales/fr/LC_MESSAGES/administrator/installation/migrate.po
index 2c4dc5cde..31a0e1dca 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/installation/migrate.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/installation/migrate.po
@@ -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"
@@ -17,212 +17,212 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/installation/migrate.md
 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
+#: ../../administrator/installation/migrate.md:17
 msgid ""
-"Make sure you [back up your data](../upgrade_docs/backup.md) before "
+"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
+#: ../../administrator/installation/migrate.md
 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
+#: ../../administrator/installation/migrate.md
 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 "
@@ -230,17 +230,24 @@ msgid ""
 "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 ""
 
+#~ msgid ""
+#~ "Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md) before proceeding. "
+#~ "This ensures you don't lose anything "
+#~ "during the migration."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/manage-script/create-library.po b/docs/locales/fr/LC_MESSAGES/administrator/manage-script/create-library.po
index d899c02a1..634e34d92 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/manage-script/create-library.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/manage-script/create-library.po
@@ -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"
@@ -17,118 +17,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/manage-script/create-library.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/create_library.md
+#: ../../administrator/manage-script/create-library.md
 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 ""
 
+#~ msgid ""
+#~ "The [privacy "
+#~ "level](../../user_documentation/libraries/create_library.md) of"
+#~ " the library"
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/manage-script/database.po b/docs/locales/fr/LC_MESSAGES/administrator/manage-script/database.po
index 50ea62511..3f95b3ea5 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/manage-script/database.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/manage-script/database.po
@@ -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"
@@ -17,18 +17,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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"
@@ -36,14 +36,13 @@ msgid ""
 "deletes the database object."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/database.md:8
+#: ../../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_docs/backup.md)."
+"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 "
@@ -51,11 +50,18 @@ msgid ""
 "pruning action."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/database.md
+#: ../../administrator/manage-script/database.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/database.md
+#: ../../administrator/manage-script/database.md
 msgid "Docker"
 msgstr ""
 
+#~ msgid ""
+#~ "Running `check_inplace_files` with the "
+#~ "`--no-dry-run` flag is irreversible. "
+#~ "Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/manage-script/library.po b/docs/locales/fr/LC_MESSAGES/administrator/manage-script/library.po
index 852e4a009..94a816cd7 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/manage-script/library.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/manage-script/library.po
@@ -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"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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, "
@@ -29,13 +29,13 @@ msgid ""
 "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 "
@@ -45,63 +45,69 @@ msgid ""
 "perform the pruning action."
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md:10
+#: ../../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_docs/backup.md)."
+"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
+#: ../../administrator/manage-script/library.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/manage_script/library.md
+#: ../../administrator/manage-script/library.md
 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 ""
 
+#~ msgid ""
+#~ "Running `prune_library` commands with the "
+#~ "`--no-dry-run` flag is irreversible. "
+#~ "Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/troubleshooting/backend.po b/docs/locales/fr/LC_MESSAGES/administrator/troubleshooting/backend.po
index 0d68f7ada..68ecf4387 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/troubleshooting/backend.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/troubleshooting/backend.po
@@ -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"
@@ -17,84 +17,84 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/troubleshooting/backend.md
 msgid "Nginx"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md
+#: ../../administrator/troubleshooting/backend.md
 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
+#: ../../administrator/troubleshooting/backend.md
 msgid "Debian"
 msgstr ""
 
-#: ../../administrator_documentation/troubleshooting/backend.md
+#: ../../administrator/troubleshooting/backend.md
 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` "
@@ -102,140 +102,154 @@ msgid ""
 "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
+#: ../../administrator/troubleshooting/backend.md
 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
+#: ../../administrator/troubleshooting/backend.md:109
 msgid ""
 "Make sure your files are [tagged "
-"correctly](../../user_documentation/libraries/tag_music.md)."
+"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
+#: ../../administrator/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."
+"out the [get help](help.md) guide for information about where to ask your"
+" question and what details to provide."
 msgstr ""
 
+#~ msgid ""
+#~ "Make sure your files are [tagged "
+#~ "correctly](../../user_documentation/libraries/tag_music.md)."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/troubleshooting/frontend.po b/docs/locales/fr/LC_MESSAGES/administrator/troubleshooting/frontend.po
index cb75bc56a..bdb6fc125 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/troubleshooting/frontend.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/troubleshooting/frontend.po
@@ -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"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -41,133 +41,142 @@ msgid ""
 "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
+#: ../../administrator/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."
+"out the [get help](help.md) guide for information about where to ask your"
+" question and what details to provide."
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/uninstall/debian.po b/docs/locales/fr/LC_MESSAGES/administrator/uninstall/debian.po
index 794c48eff..f2a8d577e 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/uninstall/debian.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/uninstall/debian.po
@@ -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"
@@ -17,144 +17,163 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/uninstall/debian.md:6
 msgid ""
 "Removing Funkwhale data is __irreversible__. Make sure you [back up your "
-"data](../upgrade_docs/backup.md)."
+"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
+#: ../../administrator/uninstall/debian.md
 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
+#: ../../administrator/uninstall/debian.md
 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
+#: ../../administrator/uninstall/debian.md:95
 msgid ""
 "This action is __irreversible__. Make sure you have [backed up your "
-"data](../upgrade_docs/backup.md) before proceeding."
+"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
+#: ../../administrator/uninstall/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."
+"[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
+#: ../../administrator/uninstall/debian.md
 msgid "Apt"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md
+#: ../../administrator/uninstall/debian.md
 msgid "Python"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/debian.md:170
+#: ../../administrator/uninstall/debian.md:170
 msgid "Uninstall any dependencies you don't need."
 msgstr ""
 
+#~ msgid ""
+#~ "Removing Funkwhale data is __irreversible__."
+#~ " Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This action is __irreversible__. Make "
+#~ "sure you have [backed up your "
+#~ "data](../upgrade_docs/backup.md) before proceeding."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This action deletes the `/srv/funkwhale/` "
+#~ "directory. Make sure you have [backed"
+#~ " up any data](../upgrade_docs/backup.md) you "
+#~ "want to keep."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/uninstall/docker.po b/docs/locales/fr/LC_MESSAGES/administrator/uninstall/docker.po
index 4ee09b8c9..29a244b87 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/uninstall/docker.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/uninstall/docker.po
@@ -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"
@@ -17,96 +17,108 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/uninstall/docker.md:6
 msgid ""
 "Removing Funkwhale data is __irreversible__. Make sure you [back up your "
-"data](../upgrade_docs/backup.md)."
+"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
+#: ../../administrator/uninstall/docker.md
 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
+#: ../../administrator/uninstall/docker.md
 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
+#: ../../administrator/uninstall/docker.md:77
 msgid ""
 "This action is __irreversible__. Make sure you have [backed up your "
-"data](../upgrade_docs/backup.md) before proceeding."
+"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 ""
 
+#~ msgid ""
+#~ "Removing Funkwhale data is __irreversible__."
+#~ " Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This action is __irreversible__. Make "
+#~ "sure you have [backed up your "
+#~ "data](../upgrade_docs/backup.md) before proceeding."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/uninstall/quick-install.po b/docs/locales/fr/LC_MESSAGES/administrator/uninstall/quick-install.po
index 5b875a203..b8a091349 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/uninstall/quick-install.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/uninstall/quick-install.po
@@ -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"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -29,136 +29,155 @@ msgid ""
 " instructions in this guide."
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md:6
+#: ../../administrator/uninstall/quick-install.md:6
 msgid ""
 "Removing Funkwhale data is __irreversible__. Make sure you [back up your "
-"data](../upgrade_docs/backup.md)."
+"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
+#: ../../administrator/uninstall/quick-install.md
 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
+#: ../../administrator/uninstall/quick-install.md
 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
+#: ../../administrator/uninstall/quick-install.md:95
 msgid ""
 "This action is __irreversible__. Make sure you have [backed up your "
-"data](../upgrade_docs/backup.md) before proceeding."
+"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
+#: ../../administrator/uninstall/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."
+"[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
+#: ../../administrator/uninstall/quick-install.md
 msgid "Apt"
 msgstr ""
 
-#: ../../administrator_documentation/uninstall_docs/quick_install.md
+#: ../../administrator/uninstall/quick-install.md
 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 ""
 
+#~ msgid ""
+#~ "Removing Funkwhale data is __irreversible__."
+#~ " Make sure you [back up your "
+#~ "data](../upgrade_docs/backup.md)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This action is __irreversible__. Make "
+#~ "sure you have [backed up your "
+#~ "data](../upgrade_docs/backup.md) before proceeding."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This action deletes the `/srv/funkwhale/` "
+#~ "directory. Make sure you have [backed"
+#~ " up any data](../upgrade_docs/backup.md) you "
+#~ "want to keep."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/upgrade/debian.po b/docs/locales/fr/LC_MESSAGES/administrator/upgrade/debian.po
index 365c65c6a..1e41df85b 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/upgrade/debian.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/upgrade/debian.po
@@ -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"
@@ -17,83 +17,102 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/upgrade/debian.md:3
 msgid ""
 "If you installed Funkwhale following the [Debian "
-"guide](../installation_docs/debian.md), follow these steps to upgrade."
+"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
+#: ../../administrator/upgrade/debian.md:33
 msgid ""
-"Follow the [Download Funkwhale](../installation_docs/debian.md#3"
-"-download-funkwhale) instructions in the installation guide."
+"Follow the [Download Funkwhale](../installation/debian.md#3-download-"
+"funkwhale) instructions in the installation guide."
 msgstr ""
 
-#: ../../administrator_documentation/upgrade_docs/debian.md:35
+#: ../../administrator/upgrade/debian.md:35
 msgid ""
-"Follow the [Install the Funkwhale API](../installation_docs/debian.md#4"
+"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 ""
 
+#~ msgid ""
+#~ "If you installed Funkwhale following the"
+#~ " [Debian guide](../installation_docs/debian.md), follow"
+#~ " these steps to upgrade."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Follow the [Download "
+#~ "Funkwhale](../installation_docs/debian.md#3-download-funkwhale)"
+#~ " instructions in the installation guide."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Follow the [Install the Funkwhale "
+#~ "API](../installation_docs/debian.md#4-install-the-"
+#~ "funkwhale-api) instructions in the "
+#~ "installation guide."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/upgrade/docker.po b/docs/locales/fr/LC_MESSAGES/administrator/upgrade/docker.po
index e16e21076..f1afab3c8 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/upgrade/docker.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/upgrade/docker.po
@@ -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"
@@ -17,82 +17,82 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/upgrade/docker.md:3
 msgid ""
 "If you installed Funkwhale following the [Docker "
-"guide](../installation_docs/docker.md), follow these steps to upgrade."
+"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. "
@@ -101,46 +101,46 @@ msgid ""
 "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"
@@ -148,3 +148,9 @@ msgid ""
 "everything is working."
 msgstr ""
 
+#~ msgid ""
+#~ "If you installed Funkwhale following the"
+#~ " [Docker guide](../installation_docs/docker.md), follow"
+#~ " these steps to upgrade."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/administrator/upgrade/quick-install.po b/docs/locales/fr/LC_MESSAGES/administrator/upgrade/quick-install.po
index d2c0a14c6..b66e4d141 100644
--- a/docs/locales/fr/LC_MESSAGES/administrator/upgrade/quick-install.po
+++ b/docs/locales/fr/LC_MESSAGES/administrator/upgrade/quick-install.po
@@ -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"
@@ -17,18 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../administrator/upgrade/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:"
+"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 ""
 
+#~ 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:"
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/contributor/documentation.po b/docs/locales/fr/LC_MESSAGES/contributor/documentation.po
index 81d318fb1..c31cd000b 100644
--- a/docs/locales/fr/LC_MESSAGES/contributor/documentation.po
+++ b/docs/locales/fr/LC_MESSAGES/contributor/documentation.po
@@ -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"
@@ -17,52 +17,52 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -71,17 +71,17 @@ msgid ""
 " 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 "
@@ -91,33 +91,33 @@ msgid ""
 "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 "
@@ -126,104 +126,107 @@ msgid ""
 "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 ""
 
+#~ msgid ""
+#~ "Add a [changelog "
+#~ "fragment](../developer_documentation/workflows/changelog.md)"
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/contributor/index.po b/docs/locales/fr/LC_MESSAGES/contributor/index.po
index 9b93dd8b5..09f70b3ce 100644
--- a/docs/locales/fr/LC_MESSAGES/contributor/index.po
+++ b/docs/locales/fr/LC_MESSAGES/contributor/index.po
@@ -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"
@@ -17,18 +17,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\n"
 
-#: ../../contributor_documentation/index.md:1
+#: ../../contributor/index.md:1
 msgid "Get started"
 msgstr ""
 
-#: ../../contributor_documentation/index.md:4
+#: ../../contributor/index.md:4
 msgid ""
 "Are you a software developer? Check out our [developer "
-"documentation](../developer_documentation/index.md) to contribute to our "
-"codebase."
+"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"
@@ -36,22 +35,22 @@ msgid ""
 "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"
@@ -59,3 +58,10 @@ msgid ""
 "translations in your language."
 msgstr ""
 
+#~ msgid ""
+#~ "Are you a software developer? Check "
+#~ "out our [developer "
+#~ "documentation](../developer_documentation/index.md) to "
+#~ "contribute to our codebase."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/moderator/allow-listing/index.po b/docs/locales/fr/LC_MESSAGES/moderator/allow-listing/index.po
index 83776d667..5c3cdeb3a 100644
--- a/docs/locales/fr/LC_MESSAGES/moderator/allow-listing/index.po
+++ b/docs/locales/fr/LC_MESSAGES/moderator/allow-listing/index.po
@@ -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"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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,"
@@ -33,10 +33,19 @@ msgid ""
 "pods on your allow-list can interact with your pod."
 msgstr ""
 
-#: ../../moderator_documentation/allow_listing/index.md:5
+#: ../../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_domain.md) to remove this content."
+"content](../domains/purge.md) to remove this content."
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/moderator/domains/add.po b/docs/locales/fr/LC_MESSAGES/moderator/domains/add.po
index 0c738b955..58a41aa4b 100644
--- a/docs/locales/fr/LC_MESSAGES/moderator/domains/add.po
+++ b/docs/locales/fr/LC_MESSAGES/moderator/domains/add.po
@@ -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"
@@ -17,88 +17,91 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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](add_rule.md) to it."
+"[add moderation rules](rules/add.md) to it."
 msgstr ""
 
-#: ../../moderator_documentation/domains/add_domain.md
+#: ../../moderator/domains/add.md
 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
+#: ../../moderator/domains/add.md
 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
+#: ../../moderator/domains/add.md
 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 ""
 
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/moderator/index.po b/docs/locales/fr/LC_MESSAGES/moderator/index.po
index 9bc5d0675..b2a7872cf 100644
--- a/docs/locales/fr/LC_MESSAGES/moderator/index.po
+++ b/docs/locales/fr/LC_MESSAGES/moderator/index.po
@@ -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"
@@ -17,40 +17,40 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -59,23 +59,23 @@ msgid ""
 "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
+#: ../../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."
+"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"
@@ -84,37 +84,65 @@ msgid ""
 "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
+#: ../../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 "
+"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
+#: ../../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."
+"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 ""
 
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/fr/LC_MESSAGES/moderator/reports/content.po b/docs/locales/fr/LC_MESSAGES/moderator/reports/content.po
index b2572a144..c0d9ef58a 100644
--- a/docs/locales/fr/LC_MESSAGES/moderator/reports/content.po
+++ b/docs/locales/fr/LC_MESSAGES/moderator/reports/content.po
@@ -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"
@@ -17,158 +17,150 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../moderator/reports/content.md
 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
+#: ../../moderator/reports/content.md
 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
+#: ../../moderator/reports/content.md
 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
+#: ../../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](internal_notes.md) to keep a "
-"record of your changes."
+"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 ""
 
+#~ msgid "[Search for the report](search_reports.md)."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/moderator/reports/notes.po b/docs/locales/fr/LC_MESSAGES/moderator/reports/notes.po
index 41be0a0b1..6a9ce1db1 100644
--- a/docs/locales/fr/LC_MESSAGES/moderator/reports/notes.po
+++ b/docs/locales/fr/LC_MESSAGES/moderator/reports/notes.po
@@ -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"
@@ -17,119 +17,110 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../moderator/reports/notes.md
 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
+#: ../../moderator/reports/notes.md
 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
+#: ../../moderator/reports/notes.md
 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 ""
 
+#~ msgid "[Search for the report](search_reports.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/moderator/reports/search.po b/docs/locales/fr/LC_MESSAGES/moderator/reports/search.po
index acb66da34..5c48c2f43 100644
--- a/docs/locales/fr/LC_MESSAGES/moderator/reports/search.po
+++ b/docs/locales/fr/LC_MESSAGES/moderator/reports/search.po
@@ -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"
@@ -17,94 +17,94 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../moderator/reports/search.md
 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
+#: ../../moderator/reports/search.md
 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
+#: ../../moderator/reports/search.md
 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
+#: ../../moderator/reports/search.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."
+"[user](users.md) or [content](content.md). You can also update the "
+"[internal notes](notes.md) on the report."
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/moderator/reports/users.po b/docs/locales/fr/LC_MESSAGES/moderator/reports/users.po
index 96b592606..cf8832a9c 100644
--- a/docs/locales/fr/LC_MESSAGES/moderator/reports/users.po
+++ b/docs/locales/fr/LC_MESSAGES/moderator/reports/users.po
@@ -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"
@@ -17,96 +17,111 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../moderator/reports/users.md
 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
+#: ../../moderator/reports/users.md
 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
+#: ../../moderator/reports/users.md:23 ../../moderator/reports/users.md:33
 msgid ""
-"[Search for the report](search_reports.md) and select {guilabel}`Open in "
+"[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
+#: ../../moderator/reports/users.md
 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
+#: ../../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](internal_notes.md) to keep a record of your changes."
+"notes](notes.md) to keep a record of your changes."
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/moderator/reports/view.po b/docs/locales/fr/LC_MESSAGES/moderator/reports/view.po
index 5bbc8c8dc..fd11321cd 100644
--- a/docs/locales/fr/LC_MESSAGES/moderator/reports/view.po
+++ b/docs/locales/fr/LC_MESSAGES/moderator/reports/view.po
@@ -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"
@@ -17,144 +17,146 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../moderator/reports/view.md
 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
+#: ../../moderator/reports/view.md
 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
+#: ../../moderator/reports/view.md
 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
+#: ../../moderator/reports/view.md:48
 msgid ""
-"Use the tools on this page the handle the reported "
-"[content](handle_content.md) or [user](handle_users.md)."
+"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 ""
 
+#~ msgid ""
+#~ "Use the tools on this page the "
+#~ "handle the reported [content](handle_content.md) "
+#~ "or [user](handle_users.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/user/accounts/delete.po b/docs/locales/fr/LC_MESSAGES/user/accounts/delete.po
index 70c261f6f..974e45f51 100644
--- a/docs/locales/fr/LC_MESSAGES/user/accounts/delete.po
+++ b/docs/locales/fr/LC_MESSAGES/user/accounts/delete.po
@@ -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"
@@ -17,53 +17,53 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -71,61 +71,61 @@ msgid ""
 "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
+#: ../../user/accounts/delete.md
 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
+#: ../../user/accounts/delete.md
 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
+#: ../../user/accounts/delete.md:50
 msgid ""
 "That's it! You've deleted your account. You can [create another "
-"account](create_account.md) at any time."
+"account](create.md) at any time."
 msgstr ""
 
+#~ msgid ""
+#~ "That's it! You've deleted your account."
+#~ " You can [create another "
+#~ "account](create_account.md) at any time."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/user/channels/artist/delete.po b/docs/locales/fr/LC_MESSAGES/user/channels/artist/delete.po
index 8ac200bc2..a291ed7d2 100644
--- a/docs/locales/fr/LC_MESSAGES/user/channels/artist/delete.po
+++ b/docs/locales/fr/LC_MESSAGES/user/channels/artist/delete.po
@@ -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"
@@ -17,150 +17,164 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/channels/artist/delete.md
 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
+#: ../../user/channels/artist/delete.md
 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
+#: ../../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_artist.md)."
+"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
+#: ../../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_artist.md)."
+"You can add them again by [uploading it to your channel](upload.md)."
 msgstr ""
 
+#~ msgid ""
+#~ "That's it! You've deleted your track."
+#~ " You can add it again by "
+#~ "[uploading it to your "
+#~ "channel](upload_artist.md)."
+#~ msgstr ""
+
+#~ 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)."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/user/channels/artist/upload.po b/docs/locales/fr/LC_MESSAGES/user/channels/artist/upload.po
index 4c70969b4..948fa8608 100644
--- a/docs/locales/fr/LC_MESSAGES/user/channels/artist/upload.po
+++ b/docs/locales/fr/LC_MESSAGES/user/channels/artist/upload.po
@@ -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"
@@ -17,328 +17,337 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/channels/artist/upload.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 "
+"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
+#: ../../user/channels/artist/upload.md
 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
+#: ../../user/channels/artist/upload.md
 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 ""
 
+#~ 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>`."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/user/channels/create.po b/docs/locales/fr/LC_MESSAGES/user/channels/create.po
index ea62e10f4..00a578db2 100644
--- a/docs/locales/fr/LC_MESSAGES/user/channels/create.po
+++ b/docs/locales/fr/LC_MESSAGES/user/channels/create.po
@@ -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"
@@ -17,109 +17,93 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/channels/create.md
 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 "
@@ -127,10 +111,8 @@ msgid ""
 "{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"
@@ -138,80 +120,83 @@ msgid ""
 " 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
+#: ../../user/channels/create.md
 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
+#: ../../user/channels/create.md:56
 msgid ""
 "That's it! You've created your artist channel. You can now [add some "
-"music to it](upload_artist.md)."
+"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
+#: ../../user/channels/create.md:109
 msgid ""
 "You're done! You've created your podcast channel. Now you can [add some "
-"episodes to it](upload_podcast.md)."
+"episodes to it](podcast/upload.md)."
 msgstr ""
 
+#~ msgid ""
+#~ "That's it! You've created your artist"
+#~ " channel. You can now [add some "
+#~ "music to it](upload_artist.md)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You're done! You've created your podcast"
+#~ " channel. Now you can [add some "
+#~ "episodes to it](upload_podcast.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/user/channels/podcast/delete.po b/docs/locales/fr/LC_MESSAGES/user/channels/podcast/delete.po
index 871faac92..63fce5e0c 100644
--- a/docs/locales/fr/LC_MESSAGES/user/channels/podcast/delete.po
+++ b/docs/locales/fr/LC_MESSAGES/user/channels/podcast/delete.po
@@ -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"
@@ -17,150 +17,164 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/channels/podcast/delete.md
 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
+#: ../../user/channels/podcast/delete.md
 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
+#: ../../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_podcast.md)."
+"[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
+#: ../../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_podcast.md)."
+" You can add them again by [uploading it to your channel](upload.md)."
 msgstr ""
 
+#~ msgid ""
+#~ "That's it! You've deleted your episode."
+#~ " You can add it again by "
+#~ "[uploading it to your "
+#~ "channel](upload_podcast.md)."
+#~ msgstr ""
+
+#~ 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)."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/user/channels/podcast/upload.po b/docs/locales/fr/LC_MESSAGES/user/channels/podcast/upload.po
index 1fa96371c..4209908b9 100644
--- a/docs/locales/fr/LC_MESSAGES/user/channels/podcast/upload.po
+++ b/docs/locales/fr/LC_MESSAGES/user/channels/podcast/upload.po
@@ -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"
@@ -17,327 +17,336 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/channels/podcast/upload.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 "
+"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
+#: ../../user/channels/podcast/upload.md
 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
+#: ../../user/channels/podcast/upload.md
 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 ""
 
+#~ 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>`."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/user/libraries/content/edit.po b/docs/locales/fr/LC_MESSAGES/user/libraries/content/edit.po
index f6faff90d..ba075b563 100644
--- a/docs/locales/fr/LC_MESSAGES/user/libraries/content/edit.po
+++ b/docs/locales/fr/LC_MESSAGES/user/libraries/content/edit.po
@@ -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"
@@ -17,272 +17,279 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_music.md)."
+"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
+#: ../../user/libraries/content/edit.md
 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
+#: ../../user/libraries/content/edit.md
 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 ""
 
+#~ msgid ""
+#~ "You can edit library content after "
+#~ "you have uploaded it. This is "
+#~ "helpful if the content isn't "
+#~ "[tagged](./tag_music.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/user/libraries/content/tag.po b/docs/locales/fr/LC_MESSAGES/user/libraries/content/tag.po
index 8af1dd0d4..519bdf44f 100644
--- a/docs/locales/fr/LC_MESSAGES/user/libraries/content/tag.po
+++ b/docs/locales/fr/LC_MESSAGES/user/libraries/content/tag.po
@@ -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"
@@ -17,18 +17,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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 "
@@ -36,317 +36,323 @@ msgid ""
 "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
+#: ../../user/libraries/content/tag.md
 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
+#: ../../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_content.md)"
+" 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 ""
 
+#~ msgid ""
+#~ "That's it! You've added ID3 tags "
+#~ "to your files. You can now [add"
+#~ " these to a library](upload_content.md)"
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/user/libraries/content/upload.po b/docs/locales/fr/LC_MESSAGES/user/libraries/content/upload.po
index 737fa4aa2..29894974a 100644
--- a/docs/locales/fr/LC_MESSAGES/user/libraries/content/upload.po
+++ b/docs/locales/fr/LC_MESSAGES/user/libraries/content/upload.po
@@ -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"
@@ -17,90 +17,100 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/libraries/content/upload.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)."
+"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
+#: ../../user/libraries/content/upload.md
 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 ""
 
+#~ 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)."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/user/playlists/content/add.po b/docs/locales/fr/LC_MESSAGES/user/playlists/content/add.po
index e65722381..95d3f6105 100644
--- a/docs/locales/fr/LC_MESSAGES/user/playlists/content/add.po
+++ b/docs/locales/fr/LC_MESSAGES/user/playlists/content/add.po
@@ -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"
@@ -17,167 +17,173 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/playlists/content/add.md
 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
+#: ../../user/playlists/content/add.md
 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
+#: ../../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:"
+"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 ""
 
+#~ msgid ""
+#~ "You can add all content that is"
+#~ " currently in your [player "
+#~ "queue](../queue/index.md). To do this:"
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/user/playlists/create.po b/docs/locales/fr/LC_MESSAGES/user/playlists/create.po
index e89b86beb..22820bc5b 100644
--- a/docs/locales/fr/LC_MESSAGES/user/playlists/create.po
+++ b/docs/locales/fr/LC_MESSAGES/user/playlists/create.po
@@ -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"
@@ -17,98 +17,96 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/playlists/create.md
 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
+#: ../../user/playlists/create.md
 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
+#: ../../user/playlists/create.md:41
 msgid ""
 "Congratulations! You've created your playlist. Now you can [add some "
-"content to it](add_content.md)."
+"content to it](content/add.md)."
 msgstr ""
 
+#~ msgid ""
+#~ "Congratulations! You've created your playlist."
+#~ " Now you can [add some content "
+#~ "to it](add_content.md)."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/user/playlists/listen.po b/docs/locales/fr/LC_MESSAGES/user/playlists/listen.po
index 5a326a280..6f8f43b46 100644
--- a/docs/locales/fr/LC_MESSAGES/user/playlists/listen.po
+++ b/docs/locales/fr/LC_MESSAGES/user/playlists/listen.po
@@ -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"
@@ -17,108 +17,110 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_library)."
+"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
+#: ../../user/playlists/listen.md
 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
+#: ../../user/playlists/listen.md
 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 ""
 
+#~ msgid ""
+#~ "You can only listen to content in"
+#~ " libraries you have access to. For"
+#~ " more information, see [Follow a "
+#~ "library](../libraries/follow_library)."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/user/plugins/scrobbler.po b/docs/locales/fr/LC_MESSAGES/user/plugins/scrobbler.po
index d4732cd98..194870d57 100644
--- a/docs/locales/fr/LC_MESSAGES/user/plugins/scrobbler.po
+++ b/docs/locales/fr/LC_MESSAGES/user/plugins/scrobbler.po
@@ -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"
@@ -17,18 +17,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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"
@@ -36,91 +36,87 @@ msgid ""
 "enables you to keep a record of your listens."
 msgstr ""
 
-#: ../../user_documentation/plugins/scrobbler_plugin.md:10
+#: ../../user/plugins/scrobbler.md:10
 msgid ""
 "Using ListenBrainz or Maloja? Check out the "
-"[ListenBrainz](listenbrainz_plugin) and [Maloja](maloja_plugin) plugins!"
+"[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
+#: ../../user/plugins/scrobbler.md
 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 ""
 
+#~ msgid ""
+#~ "Using ListenBrainz or Maloja? Check out"
+#~ " the [ListenBrainz](listenbrainz_plugin) and "
+#~ "[Maloja](maloja_plugin) plugins!"
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/user/radios/delete.po b/docs/locales/fr/LC_MESSAGES/user/radios/delete.po
index d39b51660..136c59e8e 100644
--- a/docs/locales/fr/LC_MESSAGES/user/radios/delete.po
+++ b/docs/locales/fr/LC_MESSAGES/user/radios/delete.po
@@ -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"
@@ -17,66 +17,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/radios/delete.md
 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
+#: ../../user/radios/delete.md
 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
+#: ../../user/radios/delete.md:33
 msgid ""
 "That's it! You've deleted your radio. You can [create a new "
-"one](create_radio.md) at any time."
+"one](create.md) at any time."
 msgstr ""
 
+#~ msgid ""
+#~ "That's it! You've deleted your radio."
+#~ " You can [create a new "
+#~ "one](create_radio.md) at any time."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/user/radios/listen.po b/docs/locales/fr/LC_MESSAGES/user/radios/listen.po
index 602d19bf9..d57d7df36 100644
--- a/docs/locales/fr/LC_MESSAGES/user/radios/listen.po
+++ b/docs/locales/fr/LC_MESSAGES/user/radios/listen.po
@@ -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"
@@ -17,138 +17,138 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../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_library)."
+"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
+#: ../../user/radios/listen.md
 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
+#: ../../user/radios/listen.md
 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 ""
 
+#~ msgid ""
+#~ "You can only listen to content in"
+#~ " libraries you have access to. For"
+#~ " more information, see [Follow a "
+#~ "library](../libraries/follow_library)."
+#~ msgstr ""
+
diff --git a/docs/locales/fr/LC_MESSAGES/user/subsonic/disable.po b/docs/locales/fr/LC_MESSAGES/user/subsonic/disable.po
index b42d91e77..4e5c3a9a8 100644
--- a/docs/locales/fr/LC_MESSAGES/user/subsonic/disable.po
+++ b/docs/locales/fr/LC_MESSAGES/user/subsonic/disable.po
@@ -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"
@@ -17,68 +17,70 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.11.0\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
+#: ../../user/subsonic/disable.md
 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
+#: ../../user/subsonic/disable.md
 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
+#: ../../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](./subsonic_password.md)."
+"password](password/request.md)."
 msgstr ""
 
+#~ 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)."
+#~ msgstr ""
+