diff --git a/docs/api/settings.rst b/docs/api/settings.rst
index 12d2833f..cfc270d6 100644
--- a/docs/api/settings.rst
+++ b/docs/api/settings.rst
@@ -13,7 +13,7 @@ there.
 
 A complete ``~/.mopidy/settings.py`` may look like this::
 
-    MPD_SERVER_HOSTNAME = u'0.0.0.0'
+    MPD_SERVER_HOSTNAME = u'::'
     SPOTIFY_USERNAME = u'alice'
     SPOTIFY_PASSWORD = u'mysecret'
 
diff --git a/mopidy/settings.py b/mopidy/settings.py
index d4321685..949b2e06 100644
--- a/mopidy/settings.py
+++ b/mopidy/settings.py
@@ -3,16 +3,19 @@ Available settings and their default values.
 
 .. warning::
 
-    Do *not* change settings in ``mopidy/settings.py``. Instead, add a file
-    called ``~/.mopidy/settings.py`` and redefine settings there.
+    Do *not* change settings directly in :mod:`mopidy.settings`. Instead, add a
+    file called ``~/.mopidy/settings.py`` and redefine settings there.
 """
 
+# Absolute import needed to import ~/.mopidy/settings.py and not ourselves
 from __future__ import absolute_import
 import os
 import sys
 
 #: List of playback backends to use. See :mod:`mopidy.backends` for all
-#: available backends. Default::
+#: available backends.
+#:
+#: Default::
 #:
 #:     BACKENDS = (u'mopidy.backends.libspotify.LibspotifyBackend',)
 #:
@@ -28,32 +31,51 @@ BACKENDS = (
 CONSOLE_LOG_FORMAT = u'%(levelname)-8s %(asctime)s' + \
     ' [%(process)d:%(threadName)s] %(name)s\n  %(message)s'
 
-#: The log format used for dump logs. Default::
+#: The log format used for dump logs.
+#:
+#: Default::
 #:
 #:     DUMP_LOG_FILENAME = CONSOLE_LOG_FORMAT
 DUMP_LOG_FORMAT = CONSOLE_LOG_FORMAT
 
-#: The file to dump debug log data to. Default::
+#: The file to dump debug log data to when Mopidy is run with the
+#: :option:`--dump` option.
+#:
+#: Default::
 #:
 #:     DUMP_LOG_FILENAME = u'dump.log'
 DUMP_LOG_FILENAME = u'dump.log'
 
-#: Protocol frontend to use. Default::
+#: Protocol frontend to use.
+#:
+#: Default::
 #:
 #:     FRONTEND = u'mopidy.frontends.mpd.frontend.MpdFrontend'
 FRONTEND = u'mopidy.frontends.mpd.frontend.MpdFrontend'
 
-#: Path to folder with local music. Default::
+#: Path to folder with local music.
+#:
+#: Used by :mod:`mopidy.backends.local`.
+#:
+#: Default::
 #:
 #:    LOCAL_MUSIC_FOLDER = u'~/music'
 LOCAL_MUSIC_FOLDER = u'~/music'
 
-#: Path to playlist folder with m3u files for local music. Default::
+#: Path to playlist folder with m3u files for local music.
+#:
+#: Used by :mod:`mopidy.backends.local`.
+#:
+#: Default::
 #:
 #:    LOCAL_PLAYLIST_FOLDER = u'~/.mopidy/playlists'
 LOCAL_PLAYLIST_FOLDER = u'~/.mopidy/playlists'
 
-#: Path to tag cache for local music. Default::
+#: Path to tag cache for local music.
+#:
+#: Used by :mod:`mopidy.backends.local`.
+#:
+#: Default::
 #:
 #:    LOCAL_TAG_CACHE = u'~/.mopidy/tag_cache'
 LOCAL_TAG_CACHE = u'~/.mopidy/tag_cache'
@@ -86,6 +108,7 @@ MIXER_ALSA_CONTROL = False
 #: External mixers only. Which port the mixer is connected to.
 #:
 #: This must point to the device port like ``/dev/ttyUSB0``.
+#:
 #: Default: :class:`None`
 MIXER_EXT_PORT = None
 
@@ -104,17 +127,23 @@ MIXER_EXT_SPEAKERS_A = None
 #: Default: :class:`None`.
 MIXER_EXT_SPEAKERS_B = None
 
-#: Audio output handler to use. Default::
+#: Audio output handler to use.
+#:
+#: Default::
 #:
 #:     OUTPUT = u'mopidy.outputs.gstreamer.GStreamerOutput'
 OUTPUT = u'mopidy.outputs.gstreamer.GStreamerOutput'
 
-#: Server to use. Default::
+#: Server to use.
+#:
+#: Default::
 #:
 #:     SERVER = u'mopidy.frontends.mpd.server.MpdServer'
 SERVER = u'mopidy.frontends.mpd.server.MpdServer'
 
-#: Which address Mopidy should bind to. Examples:
+#: Which address Mopidy's MPD server should bind to.
+#:
+#:Examples:
 #:
 #: ``127.0.0.1``
 #:     Listens only on the IPv4 loopback interface. Default.
@@ -126,21 +155,31 @@ SERVER = u'mopidy.frontends.mpd.server.MpdServer'
 #:     Listens on all interfaces, both IPv4 and IPv6.
 MPD_SERVER_HOSTNAME = u'127.0.0.1'
 
-#: Which TCP port Mopidy should listen to. Default: 6600
+#: Which TCP port Mopidy's MPD server should listen to.
+#:
+#: Default: 6600
 MPD_SERVER_PORT = 6600
 
-#: Your Spotify Premium username. Used by all Spotify backends.
-SPOTIFY_USERNAME = u''
-
-#: Your Spotify Premium password. Used by all Spotify backends.
-SPOTIFY_PASSWORD = u''
-
-#: Path to your libspotify application key. Used by LibspotifyBackend.
+#: Path to your libspotify application key.
+#:
+#: Used by :mod:`mopidy.backends.libspotify`.
 SPOTIFY_LIB_APPKEY = u'~/.mopidy/spotify_appkey.key'
 
-#: Path to the libspotify cache. Used by LibspotifyBackend.
+#: Path to the libspotify cache.
+#:
+#: Used by :mod:`mopidy.backends.libspotify`.
 SPOTIFY_LIB_CACHE = u'~/.mopidy/libspotify_cache'
 
+#: Your Spotify Premium username.
+#:
+#: Used by :mod:`mopidy.backends.libspotify`.
+SPOTIFY_USERNAME = u''
+
+#: Your Spotify Premium password.
+#:
+#: Used by :mod:`mopidy.backends.libspotify`.
+SPOTIFY_PASSWORD = u''
+
 # Import user specific settings
 dotdir = os.path.expanduser(u'~/.mopidy/')
 settings_file = os.path.join(dotdir, u'settings.py')