From de3361fae2d385314193dba9fc4aeaa015616099 Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Fri, 17 Dec 2021 19:22:20 +0000 Subject: [PATCH] More proxy documentation updates a60648e34 ("Remove support for ftp_proxy", 2021-12-13) 9504a6ddd ("Document the curl_ca_bundle environment variable", 2021-12-13) --- doc/src/faq.rst | 2 +- doc/src/man/linkchecker.rst | 8 ++++++-- linkchecker | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/src/faq.rst b/doc/src/faq.rst index 5faccb3e..89adaab3 100644 --- a/doc/src/faq.rst +++ b/doc/src/faq.rst @@ -38,7 +38,7 @@ check your web pages by adding the following to your robots.txt file:: **Q: How can I tell LinkChecker which proxy to use?** A: LinkChecker works automatically with proxies. In a Unix or Windows -environment, set the http_proxy, https_proxy, ftp_proxy environment +environment, set the http_proxy or https_proxy environment variables to a URL that identifies the proxy server before starting LinkChecker. For example: diff --git a/doc/src/man/linkchecker.rst b/doc/src/man/linkchecker.rst index e0647511..1c635947 100644 --- a/doc/src/man/linkchecker.rst +++ b/doc/src/man/linkchecker.rst @@ -487,9 +487,13 @@ ENVIRONMENT specifies default HTTP proxy server -.. envvar:: ftp_proxy +.. envvar:: https_proxy - specifies default FTP proxy server + specifies default HTTPS proxy server + +.. envvar:: curl_ca_bundle + + an alternative certificate bundle to be used with an HTTPS proxy .. envvar:: no_proxy diff --git a/linkchecker b/linkchecker index 4b5207ac..13d59f41 100755 --- a/linkchecker +++ b/linkchecker @@ -81,7 +81,7 @@ Notes = _( ProxySupport = _( """PROXY SUPPORT -To use a proxy on Unix or Windows set $http_proxy, $https_proxy or $ftp_proxy +To use a proxy on Unix or Windows set $http_proxy or $https_proxy to the proxy URL. The URL should be of the form "http://[:@][:]". LinkChecker also detects manual proxy settings of Internet Explorer under