aboutsummaryrefslogtreecommitdiffstats
path: root/doc/user.xml
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/user.xml
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 '')
-rw-r--r--doc/user.xml30
1 files changed, 30 insertions, 0 deletions
diff --git a/doc/user.xml b/doc/user.xml
index 3925aa2b8..2fb27fc4d 100644
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -303,6 +303,36 @@ cd mpd-0.14.2</programlisting>
<para>
Opens remote files or streams over HTTP.
</para>
+
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Setting</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <varname>proxy</varname>
+ </entry>
+ <entry>
+ Sets the address of the HTTP proxy server.
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <varname>proxy_user</varname>,
+ <varname>proxy_password</varname>
+ </entry>
+ <entry>
+ Configures proxy authentication.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
</section>
<section>