From d1edcf9dcd990c4b9ab0be0f65777b7eae419bfd Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Thu, 4 Oct 2018 20:17:19 +0200
Subject: [PATCH] Add documentation for ccxt_config

---
 config_full.json.example |  6 +++++-
 docs/configuration.md    | 25 ++++++++++++++++++++++++-
 docs/telegram-usage.md   |  6 ------
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/config_full.json.example b/config_full.json.example
index 7083bada6..71b119fb5 100644
--- a/config_full.json.example
+++ b/config_full.json.example
@@ -53,7 +53,11 @@
         "pair_blacklist": [
             "DOGE/BTC"
         ],
-        "outdated_offset": 5
+        "outdated_offset": 5,
+        "ccxt_config": {},
+        "ccxt_async_config": {
+            "aiohttp_trust_env": false
+            }
     },
     "experimental": {
         "use_sell_signal": false,
diff --git a/docs/configuration.md b/docs/configuration.md
index 010e693d4..7c380e992 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -45,6 +45,8 @@ The table below will list all configuration parameters.
 | `exchange.pair_whitelist` | [] | No | List of currency to use by the bot. Can be overrided with `--dynamic-whitelist` param.
 | `exchange.pair_blacklist` | [] | No | List of currency the bot must avoid. Useful when using `--dynamic-whitelist` param.
 | `exchange.ccxt_rate_limit` | True | No | Have CCXT handle Exchange rate limits. Depending on the exchange, having this to false can lead to temporary bans from the exchange.
+| `exchange.ccxt_config` | None | No | Additional CCXT parameters passed to the regular ccxt instance. Parameters may differ from exchange to exchange and are documented in the [ccxt documentation](https://ccxt.readthedocs.io/en/latest/manual.html#instantiation)
+| `exchange.ccxt_async_config` | None | No | Additional CCXT parameters passed to the async ccxt instance. Parameters may differ from exchange to exchange  and are documented in the [ccxt documentation](https://ccxt.readthedocs.io/en/latest/manual.html#instantiation)
 | `experimental.use_sell_signal` | false | No | Use your sell strategy in addition of the `minimal_roi`.
 | `experimental.sell_profit_only` | false | No | waits until you have made a positive profit before taking a sell decision.
 | `experimental.ignore_roi_if_buy_signal` | false | No | Does not sell if the buy-signal is still active. Takes preference over `minimal_roi` and `use_sell_signal`
@@ -204,8 +206,29 @@ you run it in production mode.
 }
 
 ```
+
 If you have not your Bittrex API key yet, [see our tutorial](https://github.com/freqtrade/freqtrade/blob/develop/docs/pre-requisite.md).
 
+### Using proxy with FreqTrade
+
+To use a proxy with freqtrade, add the kwarg `"aiohttp_trust_env"=true` to the `"ccxt_async_kwargs"` dict in the exchange section of the configuration.
+
+An example for this can be found in `config_full.json.example`
+
+``` json
+"ccxt_async_config": {
+    "aiohttp_trust_env": true
+}
+```
+
+Then, export your proxy settings using the variables `"HTTP_PROXY"` and `"HTTPS_PROXY"` set to the appropriate values
+
+``` bash
+export HTTP_PROXY="http://addr:port"
+export HTTPS_PROXY="http://addr:port"
+freqtrade
+```
+
 
 ### Embedding Strategies
 
@@ -213,7 +236,7 @@ FreqTrade provides you with with an easy way to embed the strategy into your con
 This is done by utilizing BASE64 encoding and providing this string at the strategy configuration field,
 in your chosen config file.
 
-##### Encoding a string as BASE64
+#### Encoding a string as BASE64
 
 This is a quick example, how to generate the BASE64 string in python
 
diff --git a/docs/telegram-usage.md b/docs/telegram-usage.md
index ca764c9b4..945e31f9c 100644
--- a/docs/telegram-usage.md
+++ b/docs/telegram-usage.md
@@ -129,9 +129,3 @@ Day         Profit BTC      Profit USD
 ## /version
 > **Version:** `0.14.3` 
 
-### using proxy with telegram
-```
-$ export HTTP_PROXY="http://addr:port"
-$ export HTTPS_PROXY="http://addr:port"
-$ freqtrade
-```