aboutsummaryrefslogtreecommitdiffstats
path: root/doc/mpd.conf.5
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-04-25 13:35:04 +0200
committerMax Kellermann <max@duempel.org>2009-04-25 13:35:04 +0200
commit11bcd7f01387440f87f19435f3fa41ede43f5c18 (patch)
tree14d53526ed34c34e7e380b421bff8c9d882e5cdc /doc/mpd.conf.5
parentbd014483c229c2eb58bdfb029b6ac06790b198a9 (diff)
downloadmpd-11bcd7f01387440f87f19435f3fa41ede43f5c18.tar.gz
mpd-11bcd7f01387440f87f19435f3fa41ede43f5c18.tar.xz
mpd-11bcd7f01387440f87f19435f3fa41ede43f5c18.zip
curl: moved proxy settings to "input" block
The old global settings "http_proxy_host", "http_proxy_port", "http_proxy_user" and "http_proxy_password" continue to work.
Diffstat (limited to 'doc/mpd.conf.5')
-rw-r--r--doc/mpd.conf.512
1 files changed, 2 insertions, 10 deletions
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index c66937513..f6ac80f63 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -210,16 +210,8 @@ The default is 10%, a little over 1 second of CD-quality audio with the default
buffer size.
.TP
.B http_proxy_host <hostname>
-Use to specify the proxy host used for HTTP connections.
-.TP
-.B http_proxy_port <port>
-The port that the HTTP proxy host uses.
-.TP
-.B http_proxy_user <username>
-If the HTTP proxy server requires authentication, this specifies the username.
-.TP
-.B http_proxy_password <password>
-If the HTTP proxy server requires authentication, this specifies the password.
+This setting is deprecated. Use the "proxy" setting in the "curl"
+input block. See MPD user manual for details.
.TP
.B connection_timeout <seconds>
If a client does not send any new data in this time period, the connection is