diff options
| author | Max Kellermann <max@duempel.org> | 2016-07-29 20:23:45 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2016-07-29 20:25:59 +0200 |
| commit | 2777a23672dcea12f1b9abf2c137eab987660ece (patch) | |
| tree | 32ca5f5d9d31163cf3bd3b179f42f235febaf35f /doc | |
| parent | 32afd92d3069440f968c459ad81af8c4a63c5122 (diff) | |
| parent | 762f3afb9dc5743d3778b377ec19c3114cbcf982 (diff) | |
Merge branch 'v0.19.x'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/developer.xml | 2 | ||||
| -rw-r--r-- | doc/mpdconf.example | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/developer.xml b/doc/developer.xml index 074c7f36d..f07c52000 100644 --- 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> diff --git a/doc/mpdconf.example b/doc/mpdconf.example index 96fb12e2c..7f9dddecb 100644 --- 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" |