From 763d09b17263a58735a394ec6bd7e3a879c4cf60 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Mon, 3 Sep 2012 22:15:43 +0200
Subject: [PATCH] Tweak OUTPUT docs

---
 docs/changes.rst  | 10 +++++-----
 docs/settings.rst |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/changes.rst b/docs/changes.rst
index ce01c364..ce011d9b 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -26,11 +26,11 @@ v0.8 (in development)
   known setting, and suggests to the user what we think the setting should have
   been.
 
-- Removed most traces of multiple outputs support. Having this feature
-  currently seems to be more trouble than what it is worth.
-  :attr:`mopidy.settings.OUTPUTS` setting is no longer supported, and has been
-  replaced with :attr:`mopidy.settings.OUTPUT` which is a GStreamer
-  bin described in the same format as ``gst-launch`` expects. Default value is
+- Removed multiple outputs support. Having this feature currently seems to be
+  more trouble than what it is worth. The :attr:`mopidy.settings.OUTPUTS`
+  setting is no longer supported, and has been replaced with
+  :attr:`mopidy.settings.OUTPUT` which is a GStreamer bin description string in
+  the same format as ``gst-launch`` expects. Default value is
   ``autoaudiosink``.
 
 
diff --git a/docs/settings.rst b/docs/settings.rst
index 2f0f0f12..94f3c63b 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -157,13 +157,13 @@ server simultaneously. To use the SHOUTcast output, do the following:
 #. Install, configure and start the Icecast server. It can be found in the
    ``icecast2`` package in Debian/Ubuntu.
 
-#. Set :attr:`mopidy.settings.OUTPUT` to ``lame ! shout2send`` (an Ogg Vorbis
-   encoder could be used instead of lame).
+#. Set :attr:`mopidy.settings.OUTPUT` to ``lame ! shout2send``. An Ogg Vorbis
+   encoder could be used instead of the lame MP3 encoder.
 
 #. You might also need to change the ``shout2send`` default settings, run
    ``gst-inspect-0.10 shout2send`` to see the available settings. Most likely
-   you want to change ``ip``, ``username``, ``password`` and ``mount``. For
-   example, to set the password use:
+   you want to change ``ip``, ``username``, ``password``, and ``mount``. For
+   example, to set the username and password, use:
    ``lame ! shout2send username="foobar" password="s3cret"``.
 
 Other advanced setups are also possible for outputs. Basically anything you can