Merge branch 'v0.19.x'

2016-07-29 20:23:45 +02:00
parent 32afd92d30 762f3afb9d
commit 2777a23672
9 changed files with 349 additions and 73 deletions
--- a/doc/developer.xml
+++ b/doc/developer.xml
@@ -41,7 +41,7 @@
      <listitem>
        <para>
          the code should be C++11 compliant, and must compile with
-          <application>GCC</application> 4.6 and
+          <application>GCC</application> 4.7 and
          <application>clang</application> 3.2
        </para>
      </listitem>
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -232,7 +232,7 @@ input {
 #
 #audio_output {
 #	type		"shout"
-#	encoding	"ogg"			# optional
+#	encoder		"vorbis"		# optional
 #	name		"My Shout Stream"
 #	host		"localhost"
 #	port		"8000"