Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
danimtb committed Apr 30, 2018
2 parents fdc6b0e + 836de9b commit f09012b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions reference/config_files/conan.conf.rst
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,10 @@ proxies, but if you configured some exclusion rule it won't work:
[proxies]
# Empty section will try to use system proxies.
# If don't want that conan mess with proxies at all, remove section [proxies]
# If you don't want Conan to mess with proxies at all, remove section [proxies]
You can specify http and https proxies as follows, use the `no-proxy` keyword to specify a list
of urls that will skip the proxy:
You can specify http and https proxies as follows. Use the `no_proxy_match` keyword to specify a list
of URLs or patterns that will skip the proxy:

.. code-block:: text
Expand All @@ -190,7 +190,7 @@ of urls that will skip the proxy:
http: http://user:[email protected]:3128/
http: http://10.10.1.10:3128
https: http://10.10.1.10:1080
no-proxy: http://url1, http://url2
no_proxy_match: http://url1, http://url2, https://url3*, https://*.custom_domain.*
Use `http=None` and/or `https=None` to disable the usage of a proxy.

Expand Down

0 comments on commit f09012b

Please sign in to comment.