aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-06-23 11:52:25 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-06-23 11:52:25 +0000
commit5550baa4af741d732e44cba19a7fb7f58e623b4b (patch)
treea50fb090bf3fcdd89921b8b8249963bc00ece014 /doc
parent98f523940c35e032be803a8b8f0d7d315e436953 (diff)
downloadmpd-5550baa4af741d732e44cba19a7fb7f58e623b4b.tar.gz
mpd-5550baa4af741d732e44cba19a7fb7f58e623b4b.tar.xz
mpd-5550baa4af741d732e44cba19a7fb7f58e623b4b.zip
Update doc's and Changelog for 0.11.1
git-svn-id: https://svn.musicpd.org/mpd/trunk@1626 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--doc/mpd.120
-rw-r--r--doc/mpdconf.example8
2 files changed, 28 insertions, 0 deletions
diff --git a/doc/mpd.1 b/doc/mpd.1
index d621e7002..2ce78829e 100644
--- a/doc/mpd.1
+++ b/doc/mpd.1
@@ -159,6 +159,18 @@ of libao on sound cards with very small buffers.
.B save_absolute_paths_in_playlists <yes or no>
This specifies whether relative or absolute paths for song filenames are
used when saving playlists. The default value is "no".
+.TP
+.B http_proxy_host <string>
+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 <string>
+If the http proxy server requires authentication, this specifies the user.
+.TP
+.B http_proxy_password <string>
+If the http proxy server requires authentication, this specifies the password.
.SH EXAMPLES
.TP
Below is an example config file. (Note: '#' at the beginning of a line denotes a comment. The '#' must be the first character/symbol on that line.)
@@ -240,5 +252,13 @@ bind_to_address "any"
#filesystem_charset "UTF-8"
.br
#replaygain "album"
+.br
+#http_proxy_host "proxy.isp.com"
+.br
+#http_proxy_port "8080"
+.br
+#http_proxy_user "user"
+.br
+#http_proxy_password "password"
.SH SEE ALSO
mpc(1)
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 6c5c7b26e..a0a580400 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -79,6 +79,14 @@ error_file "~/.mpd/mpd.error"
##################################
+############ HTTP PROXY ################
+# http_proxy_host "proxy.isp.com"
+# http_proxy_port "8080"
+# http_proxy_user "user"
+# http_proxy_password "password"
+########################################
+
+
########### SECURITY SETTINGS ############
# if you start mpd as root, its recommended
# you specify a a user for mpd to run.