summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLars-Dominik Braun <PromyLOPh@lavabit.com>2009-05-03 19:59:26 +0200
committerLars-Dominik Braun <PromyLOPh@lavabit.com>2009-05-03 19:59:26 +0200
commit2605e4b8ab511221b14b07f32ff78a69c491b9cc (patch)
tree284de9255da80ca59f6f9dd8db21c28c21344dc9 /src
parent38c5fe0f52e2449d2386f229bb6e826c3ce6e812 (diff)
downloadpianobar-windows-2605e4b8ab511221b14b07f32ff78a69c491b9cc.tar.gz
pianobar-windows-2605e4b8ab511221b14b07f32ff78a69c491b9cc.tar.bz2
pianobar-windows-2605e4b8ab511221b14b07f32ff78a69c491b9cc.zip
Update manpage
disable_secure_login and control_proxy_type has been removed, control_proxy now accepts http proxies only
Diffstat (limited to 'src')
-rw-r--r--src/pianobar.118
1 files changed, 1 insertions, 17 deletions
diff --git a/src/pianobar.1 b/src/pianobar.1
index e11b676..fdc3b88 100644
--- a/src/pianobar.1
+++ b/src/pianobar.1
@@ -123,27 +123,11 @@ or the key you defined in
.B act_songinfo.
.TP
-.B control_proxy = host:port
+.B control_proxy = http://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.
.TP
-.B control_proxy_type = {http,socks4,socks4a,socks5}
-If you want to use a proxy you need to specify the proxy type you're going to
-use. Note that
-.B socks5
-needs an IP address specified in
-.B control_proxy
-
-.TP
-.B disable_secure_login = {1,0}
-If you have problems when loggin in and you know your control proxy
-definitively works try setting this option to
-.B 1.
-It disables the SSL secured login. Beware!
-.I Your password will be send as plain-text!
-
-.TP
.B event_command = path
File that is executed when event occurs. The file is called with the event type
as it's first argument. More information is supplied through stdin.