Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'

[akkoma] / config / description.exs

diff --git a/config/description.exs b/config/description.exs
index 909693319484efa0aac8e0bc9011f754052cc28e..efea7c137728dd2cbf2a1d7674ce97792ded7a4b 100644 (file)
--- a/config/description.exs
+++ b/config/description.exs
@@ -637,12 +637,14 @@ config :pleroma, :config_description, [
       %{
         key: :registrations_open,
         type: :boolean,
-        description: "Enable registrations for anyone. Invitations require this setting to be disabled."
+        description:
+          "Enable registrations for anyone. Invitations require this setting to be disabled."
       },
       %{
         key: :invites_enabled,
         type: :boolean,
-        description: "Enable user invitations for admins (depends on `registrations_open` being disabled)."
+        description:
+          "Enable user invitations for admins (depends on `registrations_open` being disabled)."
       },
       %{
         key: :account_activation_required,
@@ -796,10 +798,9 @@ config :pleroma, :config_description, [
         ]
       },
       %{
-        key: :no_attachment_links,
+        key: :attachment_links,
         type: :boolean,
-        description:
-          "Enable to disable automatically adding attachment link text to statuses"
+        description: "Enable to automatically add attachment link text to statuses"
       },
       %{
         key: :welcome_message,