X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fdescription.exs;h=3902b96323f9de47c940b1897c7433e8aeb737d0;hb=77b1ea68a7700ac4a78c7f2e0ea9f118441d23da;hp=be9cb0a169a96019de3a6265eb085f79f4aff272;hpb=7ac4d1e7ee831cbbda535c00b7dc9aca053183be;p=akkoma

diff --git a/config/description.exs b/config/description.exs
index be9cb0a16..3902b9632 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -44,7 +44,7 @@ frontend_options = [
   },
   %{
     key: "git",
-    label: "Git",
+    label: "Git Repository URL",
     type: :string,
     description: "URL of the git repository of the frontend"
   },
@@ -58,7 +58,7 @@ frontend_options = [
   },
   %{
     key: "build_dir",
-    label: "Build Dir",
+    label: "Build directory",
     type: :string,
     description: "The directory inside the zip file "
   }
@@ -3265,20 +3265,22 @@ config :pleroma, :config_description, [
       %{
         key: :headers,
         type: {:list, :string},
-        description:
-          "A list of strings naming the `req_headers` to use when deriving the `remote_ip`. Order does not matter. Default: `~w[forwarded x-forwarded-for x-client-ip x-real-ip]`."
+        description: """
+          A list of strings naming the HTTP headers to use when deriving the true client IP. Default: `["x-forwarded-for"]`.
+        """
       },
       %{
         key: :proxies,
         type: {:list, :string},
         description:
-          "A list of strings in [CIDR](https://en.wikipedia.org/wiki/CIDR) notation specifying the IPs of known proxies. Default: `[]`."
+          "A list of upstream proxy IP subnets in CIDR notation from which we will parse the content of `headers`. Defaults to `[]`. IPv4 entries without a bitmask will be assumed to be /32 and IPv6 /128."
       },
       %{
         key: :reserved,
         type: {:list, :string},
-        description:
-          "Defaults to [localhost](https://en.wikipedia.org/wiki/Localhost) and [private network](https://en.wikipedia.org/wiki/Private_network)."
+        description: """
+          A list of reserved IP subnets in CIDR notation which should be ignored if found in `headers`. Defaults to `["127.0.0.0/8", "::1/128", "fc00::/7", "10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"]`
+        """
       }
     ]
   },