summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2011-06-13 15:13:45 +0200
committerLars-Dominik Braun <lars@6xq.net>2011-06-13 20:22:31 +0200
commitafc01e4c93e2b39d69c6752a45b8a9abe0974a93 (patch)
tree5845597720c516bc2b2357e1c7ce5105949076da /contrib
parentf0af48a4f70dfed1372112f2247a4f3bbb10cf72 (diff)
downloadpianobar-afc01e4c93e2b39d69c6752a45b8a9abe0974a93.tar.gz
pianobar-afc01e4c93e2b39d69c6752a45b8a9abe0974a93.tar.bz2
pianobar-afc01e4c93e2b39d69c6752a45b8a9abe0974a93.zip
Documentation
Diffstat (limited to 'contrib')
-rw-r--r--contrib/pianobar.16
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/pianobar.1 b/contrib/pianobar.1
index 8df569e..0f7ece1 100644
--- a/contrib/pianobar.1
+++ b/contrib/pianobar.1
@@ -162,7 +162,7 @@ or the key you defined in
Icon for banned songs.
.TP
-.B control_proxy = http://host:port/
+.B control_proxy = http://user:password@host:port/
Non-american users need a proxy to use pandora.com. Only the xmlrpc interface
will use this proxy. The music is streamed directly.
@@ -237,9 +237,9 @@ Icon for loved songs.
Your pandora.com password. Plain-text.
.TP
-.B proxy = http://host:port/
+.B proxy = http://user:password@host:port/
Use a http proxy. Note that this setting overrides the http_proxy environment
-variable.
+variable. Only "Basic" http authentication is supported.
.TP
.B sort = {name_az, name_za, quickmix_01_name_az, quickmix_01_name_za, quickmix_10_name_az, quickmix_10_name_za}