From 06192d9c879cf70171139597b8f722a41fb88a37 Mon Sep 17 00:00:00 2001
From: blmpl <blm@poczta.fm>
Date: Sat, 15 Oct 2016 10:10:52 +0200
Subject: Support binding to a specific network interface

Closes #597.

# Conflicts:
#	src/ui.c
---
 contrib/config-example | 1 +
 1 file changed, 1 insertion(+)

(limited to 'contrib/config-example')

diff --git a/contrib/config-example b/contrib/config-example
index 899ee39..070314b 100644
--- a/contrib/config-example
+++ b/contrib/config-example
@@ -10,6 +10,7 @@
 
 # Proxy (for those who are not living in the USA)
 #control_proxy = http://127.0.0.1:9090/
+#bind_to = if!tun0
 
 # Keybindings
 #act_help = ?
-- 
cgit v1.2.3


From e23931a2509850686150ce12845c70be1cf3f735 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Fri, 17 Mar 2017 11:59:29 +0100
Subject: Sort manpage, remove non-existing tls_fingerprint

---
 contrib/config-example |  1 +
 contrib/pianobar.1     | 38 +++++++++++++++++---------------------
 2 files changed, 18 insertions(+), 21 deletions(-)

(limited to 'contrib/config-example')

diff --git a/contrib/config-example b/contrib/config-example
index 070314b..0a69526 100644
--- a/contrib/config-example
+++ b/contrib/config-example
@@ -50,6 +50,7 @@
 #ban_icon = [-]
 #volume = 0
 #ca_bundle = /etc/ssl/certs/ca-certificates.crt
+#gain_mul = 1.0
 
 # Format strings
 #format_nowplaying_song = %t by %a on %l%r%@%s
diff --git a/contrib/pianobar.1 b/contrib/pianobar.1
index 0619735..bf385f6 100644
--- a/contrib/pianobar.1
+++ b/contrib/pianobar.1
@@ -199,16 +199,6 @@ or the key you defined in
 .B ban_icon = </3
 Icon for banned songs.
 
-.TP
-.B ca_bundle
-Path to CA certifiate bundle, containing the root and intermediate certificates
-required to validate Pandora’s SSL certificate.
-
-.TP
-.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.
-
 .TP
 .B bind_to = {if!tunX,host!x.x.x.x,..}
 This sets the interface name to use as outgoing network interface. The name can
@@ -218,7 +208,17 @@ It can be used as a replacement for
 .B control_proxy
 in conjunction with OpenVPN's
 option
-.B route-nopull. 
+.B route-nopull.
+
+.TP
+.B ca_bundle = /etc/ssl/certs/ca-certificates.crt
+Path to CA certifiate bundle, containing the root and intermediate certificates
+required to validate Pandora's SSL certificate.
+
+.TP
+.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.
 
 .TP
 .B decrypt_password = R=U!LH$O2B#
@@ -309,6 +309,12 @@ Station name
 .B %i
 Station id
 
+.TP
+.B gain_mul = 1.0
+Pandora sends a ReplayGain value with every song. This sets a multiplier so that the gain adjustment can be
+reduced. 0.0 means no gain adjustment, 1.0 means full gain adjustment, values inbetween reduce the magnitude
+of gain adjustment.
+
 .TP
 .B history = 5
 Keep a history of the last n songs (5, by default). You can rate these songs.
@@ -354,10 +360,6 @@ Sort station list by name or type (is quickmix) and name. name_az for example
 sorts by name from a to z, quickmix_01_name_za by type (quickmix at the
 bottom) and name from z to a.
 
-.TP
-.B tls_fingerprint = D9980BA2CC0F97BB03822C6211EAEA4A06EEF427
-Hex-encoded SHA1 fingerprint of Pandora's TLS certificate.
-
 .TP
 .B user = your@user.name
 Your pandora.com username.
@@ -366,12 +368,6 @@ Your pandora.com username.
 .B volume = 0
 Initial volume correction in dB. Usually between -30 and +5.
 
-.TP
-.B gain_mul = 1.0
-Pandora sends a ReplayGain value with every song. This sets a multiplier so that the gain adjustment can be
-reduced. 0.0 means no gain adjustment, 1.0 means full gain adjustment, values inbetween reduce the magnitude
-of gain adjustment.
-
 .SH REMOTE CONTROL
 .B pianobar
 can be controlled through a fifo. You have to create it yourself by executing
-- 
cgit v1.2.3