From 861f4957aa4dacc066357a416daae4dbfc2eefa7 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Tue, 23 Mar 2010 00:53:27 +0100
Subject: [PATCH] docs: Update all references to mopidy.settings.default

---
 docs/api/mixers.rst         | 4 ++--
 docs/api/settings.rst       | 2 +-
 docs/installation/index.rst | 2 +-
 mopidy/mixers/denon.py      | 3 +--
 mopidy/mixers/nad.py        | 9 ++++-----
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/docs/api/mixers.rst b/docs/api/mixers.rst
index 639a017f..aa5998d0 100644
--- a/docs/api/mixers.rst
+++ b/docs/api/mixers.rst
@@ -32,7 +32,7 @@ Internal mixers
 Most users will use one of these internal mixers which controls the volume on
 the computer running Mopidy. If you do not specify which mixer you want to use
 in the settings, Mopidy will choose one for you based upon what OS you run. See
-:attr:`mopidy.settings.default.MIXER` for the defaults.
+:attr:`mopidy.settings.MIXER` for the defaults.
 
 
 :mod:`mopidy.mixers.alsa` -- ALSA mixer
@@ -71,7 +71,7 @@ External device mixers
 Mopidy supports controlling volume on external devices instead of on the
 computer running Mopidy through the use of custom mixer implementations. To
 enable one of the following mixers, you must the set
-:attr:`mopidy.settings.default.MIXER` setting to point to one of the classes
+:attr:`mopidy.settings.MIXER` setting to point to one of the classes
 found below, and possibly add some extra settings required by the mixer you
 choose.
 
diff --git a/docs/api/settings.rst b/docs/api/settings.rst
index 7d85a68a..c2d21657 100644
--- a/docs/api/settings.rst
+++ b/docs/api/settings.rst
@@ -21,7 +21,7 @@ A complete ``~/.mopidy/settings.py`` may look like this::
 Available settings
 ==================
 
-.. automodule:: mopidy.settings.default
+.. automodule:: mopidy.settings
     :synopsis: Available settings and their default values.
     :members:
     :undoc-members:
diff --git a/docs/installation/index.rst b/docs/installation/index.rst
index e9121ed5..a19e2705 100644
--- a/docs/installation/index.rst
+++ b/docs/installation/index.rst
@@ -72,7 +72,7 @@ libspotify backend instead, copy the Spotify application key to
 
     BACKENDS = (u'mopidy.backends.libspotify.LibspotifyBackend',)
 
-For a full list of available settings, see :mod:`mopidy.settings.default`.
+For a full list of available settings, see :mod:`mopidy.settings`.
 
 
 Running Mopidy
diff --git a/mopidy/mixers/denon.py b/mopidy/mixers/denon.py
index 8f7cd2fc..ae5871d9 100644
--- a/mopidy/mixers/denon.py
+++ b/mopidy/mixers/denon.py
@@ -23,8 +23,7 @@ class DenonMixer(BaseMixer):
 
     **Settings**
 
-    - :attr:`mopidy.settings.default.MIXER_EXT_PORT` -- Example:
-      ``/dev/ttyUSB0``
+    - :attr:`mopidy.settings.MIXER_EXT_PORT` -- Example: ``/dev/ttyUSB0``
     """
 
     def __init__(self):
diff --git a/mopidy/mixers/nad.py b/mopidy/mixers/nad.py
index 7dd0b387..d82a19a3 100644
--- a/mopidy/mixers/nad.py
+++ b/mopidy/mixers/nad.py
@@ -33,11 +33,10 @@ class NadMixer(BaseMixer):
 
     **Settings**
 
-    - :attr:`mopidy.settings.default.MIXER_EXT_PORT` --
-      Example: ``/dev/ttyUSB0``
-    - :attr:`mopidy.settings.default.MIXER_EXT_SOURCE` -- Example: ``Aux``
-    - :attr:`mopidy.settings.default.MIXER_EXT_SPEAKERS_A` -- Example: ``On``
-    - :attr:`mopidy.settings.default.MIXER_EXT_SPEAKERS_B` -- Example: ``Off``
+    - :attr:`mopidy.settings.MIXER_EXT_PORT` -- Example: ``/dev/ttyUSB0``
+    - :attr:`mopidy.settings.MIXER_EXT_SOURCE` -- Example: ``Aux``
+    - :attr:`mopidy.settings.MIXER_EXT_SPEAKERS_A` -- Example: ``On``
+    - :attr:`mopidy.settings.MIXER_EXT_SPEAKERS_B` -- Example: ``Off``
 
     """