docs: explain the noproxy CIDR notation support

Follow-up to 1e9a538e05c0107c

Closes #9818

diff --git a/.github/scripts/spellcheck.words b/.github/scripts/spellcheck.words
index 23624e219380b117b380acff987066a4fa405ad2..d8836d1376d4075ebb2be48c6c5cbafa8bd9bb11 100644 (file)
--- a/.github/scripts/spellcheck.words
+++ b/.github/scripts/spellcheck.words
@@ -92,6 +92,7 @@ chmod
 chown
 ChromeOS
 CI's
+CIDR
 CIFS
 CLA
 CLAs

diff --git a/docs/cmdline-opts/noproxy.d b/docs/cmdline-opts/noproxy.d
index c28e897eb3d378e3ae1b37e25284b164302c4876..998f57071b86be165c8c4d6346c67885c52a8fd4 100644 (file)
--- a/docs/cmdline-opts/noproxy.d
+++ b/docs/cmdline-opts/noproxy.d
@@ -19,3 +19,8 @@ not www.notlocal.com.
 Since 7.53.0, This option overrides the environment variables that disable the
 proxy ('no_proxy' and 'NO_PROXY'). If there's an environment variable
 disabling a proxy, you can set the noproxy list to "" to override it.
+
+Since 7.86.0, IP addresses specified to this option can be provided using CIDR
+notation: an appended slash and number specifies the number of "network bits"
+out of the address to use in the comparison. For example "192.168.0.0/16"
+would match all addresses starting with "192.168".

diff --git a/docs/cmdline-opts/page-footer b/docs/cmdline-opts/page-footer
index c8a65be04f389b1aab82ba6b27fd31e49073f410..99459ba3d8198409b38e15825ca1fcf1089c535a 100644 (file)
--- a/docs/cmdline-opts/page-footer
+++ b/docs/cmdline-opts/page-footer
@@ -37,9 +37,10 @@ accesses the target URL through the proxy.
 The list of host names can also be include numerical IP addresses, and IPv6
 versions should then be given without enclosing brackets.
 
-IPv6 numerical addresses are compared as strings, so they will only match if
-the representations are the same: "::1" is the same as "::0:1" but they do not
-match.
+Since 7.86.0, IP addresses can be specified using CIDR notation: an appended
+slash and number specifies the number of "network bits" out of the address to
+use in the comparison. For example "192.168.0.0/16" would match all addresses
+starting with "192.168".
 .IP "APPDATA <dir>"
 On Windows, this variable is used when trying to find the home directory. If
 the primary home variable are all unset.

diff --git a/docs/libcurl/opts/CURLOPT_NOPROXY.3 b/docs/libcurl/opts/CURLOPT_NOPROXY.3
index 138f576379166f821d0c06a9f142a71f90ce2110..5e4c321304319dd58fb3a02159513d17dd11604d 100644 (file)
--- a/docs/libcurl/opts/CURLOPT_NOPROXY.3
+++ b/docs/libcurl/opts/CURLOPT_NOPROXY.3
@@ -53,6 +53,11 @@ brackets:
 
  "example.com,::1,localhost"
 
+Since 7.86.0, IP addresses specified to this option can be provided using CIDR
+notation: an appended slash and number specifies the number of "network bits"
+out of the address to use in the comparison. For example "192.168.0.0/16"
+would match all addresses starting with "192.168".
+
 The application does not have to keep the string around after setting this
 option.
 .SH "Environment variables"