From 2e2c03848f2c8ae652e6681222a2db47eaa2f072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Thu, 11 May 2017 08:51:17 +0200
Subject: [PATCH] Added help text on proxy exclude conf.

---
 global-conf.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/global-conf.sh b/global-conf.sh
index d40dfbb4..39dbec6e 100644
--- a/global-conf.sh
+++ b/global-conf.sh
@@ -81,7 +81,7 @@ CELERITY_SIGNING_KEY='test'
 CELERITY_WORKER_IP='127.0.1.1'
 
 # -- Network configuration --
-# applied with envsetup-launcher.sh client
+# applied with client configuration step
 NETWORK_IP=
 NETWORK_DNS1=
 NETWORK_DNS2=
@@ -89,9 +89,11 @@ NETWORK_MASK=
 NETWORK_GATEWAY=
 # define this if IP is NATed
 NETWORK_IP_NAT=
-# proxy
+
+# -- Proxy configuration --
 PROXY_HTTP=
 PROXY_HTTPS=
+# PROXY_EXCLUDE is used in no_proxy env (a comma separated list of domains)
 PROXY_EXCLUDE=
 
 # -- Backup server specific (burp) --
-- 
GitLab