From 18caae4b18a4e20d58aad8329b64be00ead94e9a Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Tue, 28 Dec 2010 15:12:04 +0100
Subject: [PATCH] Simplify dependency list

---
 docs/installation/index.rst | 40 ++++++++++---------------------------
 mopidy/mixers/alsa.py       |  4 ++++
 mopidy/mixers/osa.py        | 13 +++++++++++-
 3 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/docs/installation/index.rst b/docs/installation/index.rst
index 96ba6027..142c5d84 100644
--- a/docs/installation/index.rst
+++ b/docs/installation/index.rst
@@ -20,45 +20,25 @@ Install dependencies
 Make sure you got the required dependencies installed.
 
 - Python >= 2.6, < 3
-- :doc:`GStreamer <gstreamer>` >= 0.10, with Python bindings
-- Dependencies for at least one Mopidy mixer:
 
-  - :mod:`mopidy.mixers.alsa` (Linux only)
+- GStreamer >= 0.10, with Python bindings. See :doc:`gstreamer`.
 
-    - pyalsaaudio >= 0.2 (Debian/Ubuntu package: python-alsaaudio)
-
-  - :mod:`mopidy.mixers.denon` (Linux, OS X, and Windows)
-
-    - pyserial (Debian/Ubuntu package: python-serial)
-
-  - *Default:* :mod:`mopidy.mixers.gstreamer_software` (Linux, OS X, and
-    Windows)
-
-    - No additional dependencies.
-
-  - :mod:`mopidy.mixers.nad` (Linux, OS X, and Windows)
-
-    - pyserial (Debian/Ubuntu package: python-serial)
-
-  - :mod:`mopidy.mixers.osa` (OS X only)
-
-    - No additional dependencies.
+- Mixer dependencies: The default mixer does not require any additional
+  dependencies. If you use another mixer, see the mixer's docs for any
+  additional requirements.
 
 - Dependencies for at least one Mopidy backend:
 
-  - *Default:* :mod:`mopidy.backends.libspotify` (Linux, OS X, and Windows)
+  - The default backend, :mod:`mopidy.backends.libspotify`, requires libspotify
+    and pyspotify. See :doc:`libspotify`.
 
-    - :doc:`libspotify and pyspotify <libspotify>`
-
-  - :mod:`mopidy.backends.local` (Linux, OS X, and Windows)
-
-    - No additional dependencies.
+  - The local backend, :mod:`mopidy.backends.local`, requires no additional
+    dependencies.
 
 - Optional dependencies:
 
-  - :mod:`mopidy.frontends.lastfm`
-
-    - pylast >= 4.3.0
+  - To use the Last.FM scrobbler, see :mod:`mopidy.frontends.lastfm` for
+    additional requirements.
 
 
 Install latest stable release
diff --git a/mopidy/mixers/alsa.py b/mopidy/mixers/alsa.py
index f90060ce..4aa5952f 100644
--- a/mopidy/mixers/alsa.py
+++ b/mopidy/mixers/alsa.py
@@ -11,6 +11,10 @@ class AlsaMixer(BaseMixer):
     Mixer which uses the Advanced Linux Sound Architecture (ALSA) to control
     volume.
 
+    **Dependencies:**
+
+    - pyalsaaudio >= 0.2 (python-alsaaudio on Debian/Ubuntu)
+
     **Settings:**
 
     - :attr:`mopidy.settings.MIXER_ALSA_CONTROL`
diff --git a/mopidy/mixers/osa.py b/mopidy/mixers/osa.py
index 8d69eb47..2ea04cf2 100644
--- a/mopidy/mixers/osa.py
+++ b/mopidy/mixers/osa.py
@@ -4,7 +4,18 @@ import time
 from mopidy.mixers.base import BaseMixer
 
 class OsaMixer(BaseMixer):
-    """Mixer which uses ``osascript`` on OS X to control volume."""
+    """
+    Mixer which uses ``osascript`` on OS X to control volume.
+
+    **Dependencies:**
+
+    - None
+
+    **Settings:**
+
+    - None
+
+    """
 
     CACHE_TTL = 30