Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authormattpiwik <matthieu.aubry@gmail.com>2011-05-22 01:30:16 +0400
committermattpiwik <matthieu.aubry@gmail.com>2011-05-22 01:30:16 +0400
commit1159b4beda8facff4e0f3300b8811e9c0c7e174f (patch)
tree5f38b6fc69a4a217955b85645bb84f633b04e806 /config
parentfbc87709a49fd93633fd1382a4eaae9578eb3d77 (diff)
Refs #2443
git-svn-id: http://dev.piwik.org/svn/trunk@4753 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'config')
-rw-r--r--config/global.ini.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/config/global.ini.php b/config/global.ini.php
index 7e148a99b6..109b41b6d4 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -351,10 +351,10 @@ encryption = ; SMTP transport-layer encryption, either 'ssl', 'tls', or emp
[proxy]
type = BASIC ; proxy type for outbound/outgoing connections; currently, only BASIC is supported
-host = ; check your proxy configuration
-port = ; there is no standard default, but 80, 1080, 3128, and 8080 are popular
-username = ; if specified, password is mandatory
-password = ; if specified, username is mandatory
+host = ; Proxy host: the host name of your proxy server (mandatory)
+port = ; Proxy port: the port that the proxy server listens to. There is no standard default, but 80, 1080, 3128, and 8080 are popular
+username = ; Proxy username: optional; if specified, password is mandatory
+password = ; Proxy password: optional; if specified, username is mandatory
[log]
;possible values for log: screen, database, file