Merge branch 'v0.21.x'

2 files changed, 65 insertions, 2 deletions

diff --git a/doc/plugins.rst b/doc/plugins.rst
index e04ddb797..570778366 100644
--- a/doc/plugins.rst
+++ b/doc/plugins.rst
@@ -714,6 +714,8 @@ Valid quality values for libsoxr:
 * "low"
 * "quick"
 
+.. _output_plugins:
+
 Output plugins
 --------------
 
@@ -824,6 +826,15 @@ The fifo plugin writes raw PCM data to a FIFO (First In, First Out) file. The da
    * - **path P**
      - This specifies the path of the FIFO to write to. Must be an absolute path. If the path does not exist, it will be created when MPD is started, and removed when MPD is stopped. The FIFO will be created with the same user and group as MPD is running as. Default permissions can be modified by using the builtin shell command umask. If a FIFO already exists at the specified path it will be reused, and will not be removed when MPD is stopped. You can use the "mkfifo" command to create this, and then you may modify the permissions to your liking.
 
+haiku
+~~~~~
+
+Use the SoundPlayer API on the Haiku operating system.
+
+This plugin is unmaintained and contains known bugs.  It will be
+removed soon, unless there is a new maintainer.
+
+
 jack
 ~~~~
 The jack plugin connects to a `JACK server <http://jackaudio.org/>`_.
@@ -1061,8 +1072,41 @@ The "Solaris" plugin runs only on SUN Solaris, and plays via /dev/audio.
    * - **device PATH**
      - Sets the path of the audio device, defaults to /dev/audio.
 
+
+.. _filter_plugins:
+
+Filter plugins
+--------------
+
+normalize
+~~~~~~~~~
+
+Normalize the volume during playback (at the expensve of quality).
+
+
+null
+~~~~
+
+A no-op filter.  Audio data is returned as-is.
+
+
+route
+~~~~~
+
+Reroute channels.
+
+.. list-table::
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Setting
+     - Description
+   * - **routes "0>0, 1>1, ..."**
+     - Specifies the channel mapping.
+
+
 .. _playlist_plugins:
-     
+
 Playlist plugins
 ----------------
 
diff --git a/doc/user.rst b/doc/user.rst
index 5ab9539db..ea65442b2 100644
--- a/doc/user.rst
+++ b/doc/user.rst
@@ -365,10 +365,14 @@ More information can be found in the :ref:`decoder_plugins` reference.
 Configuring encoder plugins
 ---------------------------
 
-Encoders are used by some of the output plugins (such as shout). The encoder settings are included in the audio_output section.
+Encoders are used by some of the output plugins (such as shout). The
+encoder settings are included in the ``audio_output`` section, see :ref:`config_audio_output`.
 
 More information can be found in the :ref:`encoder_plugins` reference.
 
+
+.. _config_audio_output:
+
 Configuring audio outputs
 -------------------------
 
@@ -421,6 +425,15 @@ The following table lists the audio_output options valid for all plugins:
        implement an external mixer :ref:`external_mixer`) or no mixer
        (:samp:`none`). By default, the hardware mixer is used for
        devices which support it, and none for the others.
+   * - **filters "name,...**"
+     - The specified configured filters are instantiated in the given
+       order.  Each filter name refers to a ``filter`` block, see
+       :ref:`config_filter`.
+
+More information can be found in the :ref:`output_plugins` reference.
+
+
+.. _config_filter:
 
 Configuring filters
 -------------------
@@ -436,6 +449,9 @@ To configure a filter, add a :code:`filter` block to :file:`mpd.conf`:
         name "software volume"
     }
 
+Configured filters may then be added to the ``filters`` setting of an
+``audio_output`` section, see :ref:`config_audio_output`.
+
 The following table lists the filter options valid for all plugins:
 
 .. list-table::
@@ -449,6 +465,9 @@ The following table lists the filter options valid for all plugins:
    * - **name**
      - The name of the filter
 
+More information can be found in the :ref:`filter_plugins` reference.
+
+
 Configuring playlist plugins
 ----------------------------