X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fdescription.exs;h=6c931c152e137dedfdb051bbce760a36ade18d75;hb=0a5e7924542415ec2c28680b50d38909350aedeb;hp=3c5febf0539915289fa089d599b5de4c18b4e683;hpb=1630ecaa20894c6e18b83ce1a830184d577150c3;p=akkoma

diff --git a/config/description.exs b/config/description.exs
index 3c5febf05..6c931c152 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -23,7 +23,7 @@ config :pleroma, :config_description, [
         key: :uploader,
         type: :module,
         description: "Module which will be used for uploads",
-        suggestions: [Pleroma.Uploaders.Local, Pleroma.Uploaders.MDII, Pleroma.Uploaders.S3]
+        suggestions: [Pleroma.Uploaders.Local, Pleroma.Uploaders.S3]
       },
       %{
         key: :filters,
@@ -515,6 +515,7 @@ config :pleroma, :config_description, [
       },
       %{
         key: :email,
+        label: "Admin Email Address",
         type: :string,
         description: "Email used to reach an Administrator/Moderator of the instance",
         suggestions: [
@@ -523,8 +524,9 @@ config :pleroma, :config_description, [
       },
       %{
         key: :notify_email,
+        label: "Sender Email Address",
         type: :string,
-        description: "Email used for notifications",
+        description: "Envelope FROM address for mail sent via Pleroma",
         suggestions: [
           "notify@example.com"
         ]
@@ -654,6 +656,7 @@ config :pleroma, :config_description, [
       },
       %{
         key: :federation_incoming_replies_max_depth,
+        label: "Fed. incoming replies max depth",
         type: :integer,
         description:
           "Max. depth of reply-to activities fetching on incoming federation, to prevent out-of-memory situations while" <>
@@ -664,6 +667,7 @@ config :pleroma, :config_description, [
       },
       %{
         key: :federation_reachability_timeout_days,
+        label: "Fed. reachability timeout days",
         type: :integer,
         description:
           "Timeout (in days) of each external federation target being unreachable prior to pausing federating to it",
@@ -1822,7 +1826,7 @@ config :pleroma, :config_description, [
       %{
         key: :private_key,
         type: :string,
-        description: "VAPID private keyn",
+        description: "VAPID private key",
         suggestions: ["Private key"]
       }
     ]
@@ -2511,7 +2515,6 @@ config :pleroma, :config_description, [
           "Emojis are ordered in groups (tags). This is an array of key-value pairs where the key is the groupname" <>
             " and the value the location or array of locations. * can be used as a wildcard",
         suggestions: [
-          # Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
           Custom: ["/emoji/*.png", "/emoji/**/*.png"]
         ]
       },
@@ -2525,6 +2528,7 @@ config :pleroma, :config_description, [
       },
       %{
         key: :shared_pack_cache_seconds_per_file,
+        label: "Shared pack cache s/file",
         type: :integer,
         descpiption:
           "When an emoji pack is shared, the archive is created and cached in memory" <>
@@ -2772,25 +2776,6 @@ config :pleroma, :config_description, [
       }
     ]
   },
-  %{
-    group: :pleroma,
-    key: Pleroma.Uploaders.MDII,
-    description:
-      "Uploader for https://github.com/hakaba-hitoyo/minimal-digital-image-infrastructure",
-    type: :group,
-    children: [
-      %{
-        key: :cgi,
-        type: :string,
-        suggestions: ["https://mdii.sakura.ne.jp/mdii-post.cgi"]
-      },
-      %{
-        key: :files,
-        type: :string,
-        suggestions: ["https://mdii.sakura.ne.jp"]
-      }
-    ]
-  },
   %{
     group: :pleroma,
     key: :http,
@@ -2811,8 +2796,8 @@ config :pleroma, :config_description, [
       %{
         key: :user_agent,
         type: [:string, :atom],
-        desctiption:
-          "what user agent should we use? (default: `:default`), must be string or `:default`",
+        description:
+          "What user agent to use. Must be a string or an atom `:default`. Default value is `:default`",
         suggestions: ["Pleroma", :default]
       },
       %{