summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-10-06 17:36:29 -0500
committerMark Felder <feld@FreeBSD.org>2020-10-06 17:36:29 -0500
commitb90eda3d8bfa1faf5bdabce9539b601476abed94 (patch)
treee9d9c7a9bb39e5f6a9069a9174d63b8a9e881860
parente08eb4aba07ce843f3f1149b8c70fb6b4d855c44 (diff)
Improve description yet again
-rw-r--r--config/description.exs2
-rw-r--r--docs/configuration/cheatsheet.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/description.exs b/config/description.exs
index 71cb5d913..c6916ad14 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -3270,7 +3270,7 @@ config :pleroma, :config_description, [
key: :proxies,
type: {:list, :string},
description:
- "A list of upstream proxy IP subnets in CIDR notation. Defaults to `[]`. IPv4 entries without a bitmask will be assumed to be /32 and IPv6 /128."
+ "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,
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index 7f1dc0fe6..ea7dfec98 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -427,7 +427,7 @@ Available options:
* `enabled` - Enable/disable the plug. Defaults to `false`.
* `headers` - A list of strings naming the HTTP headers to use when deriving the true client IP address. Defaults to `["x-forwarded-for"]`.
-* `proxies` - A list of upstream proxy IP subnets in CIDR notation. Defaults to `[]`. IPv4 entries without a bitmask will be assumed to be /32 and IPv6 /128.
+* `proxies` - 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.
* `reserved` - 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"]`.