Merge branch 'develop' into feature/audio-mute

docs/changelog.rst

@@ -4,15 +4,16 @@ Changelog
 
 This changelog is used to track all major changes to Mopidy.
 
-v0.15.0 (UNRELEASED)
+v0.15.0 (2013-09-19)
 ====================
 
-(no description yet)
+A release with a number of small and medium fixes, with no specific focus.
 
 **Dependencies**
 
 - Mopidy no longer supports Python 2.6. Currently, the only Python version
-  supported by Mopidy is Python 2.7. (Fixes: :issue:`344`)
+  supported by Mopidy is Python 2.7. We're continuously working towards running
+  Mopidy on Python 3. (Fixes: :issue:`344`)
 
 **Command line options**
 
@@ -20,14 +21,16 @@ v0.15.0 (UNRELEASED)
   options.
 
 - :option:`mopidy --show-config` will now take into consideration any
-  :option:`mopidy --option` arguments appearing later on the command line.
+  :option:`mopidy --option` arguments appearing later on the command line. This
+  helps you see the effective configuration for runs with the same
+  :option:`mopidy --options` arguments.
 
 **Audio**
 
-- Added support for audio visualization. :confval:`audio/visualizer` can now be set
+- Added support for audio visualization. :confval:`audio/visualizer` can now be
-  to GStreamer visualizers.
+  set to GStreamer visualizers.
 
-- Properly encode localised mixer names before logging.
+- Properly encode localized mixer names before logging.
 
 **Local backend**
 
@@ -38,7 +41,7 @@ v0.15.0 (UNRELEASED)
   the next file. This fixes some hangs on non-media files, like logs. (Fixes:
   :issue:`476`, :issue:`483`)
 
-- Added support for plugable library updaters. This allows extension writers
+- Added support for pluggable library updaters. This allows extension writers
   to start providing their own custom libraries instead of being stuck with
   just our tag cache as the only option.
 
@@ -66,16 +69,17 @@ v0.15.0 (UNRELEASED)
 
 **HTTP frontend**
 
-- Fix too broad truthness test that caused :class:`~mopidy.models.TlTrack`
+- Fix too broad truth test that caused :class:`mopidy.models.TlTrack`
   objects with ``tlid`` set to ``0`` to be sent to the HTTP client without the
   ``tlid`` field. (Fixes: :issue:`501`)
 
-- Upgrade Mopidy.js dependencies.
+- Upgrade Mopidy.js dependencies. This version has been released to NPM as
+  Mopidy.js v0.1.1.
 
 **Extension support**
 
-- :class:`~mopidy.config.Secret` is now deserialized to unicode strings instead
+- :class:`mopidy.config.Secret` is now deserialized to unicode instead of
-  of bytestrings. This may require modifications to extensions.
+  bytes. This may require modifications to extensions.
 
 
 v0.14.2 (2013-07-01)

docs/config.rst

@@ -147,24 +147,6 @@ Core configuration values
 .. _the Python logging docs: http://docs.python.org/2/library/logging.config.html
 
 
-Extension configuration
-=======================
-
-Mopidy's extensions have their own config values that you may want to tweak.
-For the available config values, please refer to the docs for each extension.
-Most, if not all, can be found at :ref:`ext`.
-
-Mopidy extensions are enabled by default when they are installed. If you want
-to disable an extension without uninstalling it, all extensions support the
-``enabled`` config value even if it isn't explicitly documented by all
-extensions. If the ``enabled`` config value is set to ``false`` the extension
-will not be started. For example, to disable the Spotify extension, add the
-following to your ``mopidy.conf``::
-
-    [spotify]
-    enabled = false
-
-
 Extension configuration
 =======================
 

mopidy/__init__.py

@@ -21,4 +21,4 @@ if (isinstance(pykka.__version__, basestring)
 warnings.filterwarnings('ignore', 'could not open display')
 
 
-__version__ = '0.14.2'
+__version__ = '0.15.0'

tests/version_test.py

@@ -38,5 +38,6 @@ class VersionTest(unittest.TestCase):
         self.assertLess(SV('0.12.0'), SV('0.13.0'))
         self.assertLess(SV('0.13.0'), SV('0.14.0'))
         self.assertLess(SV('0.14.0'), SV('0.14.1'))
-        self.assertLess(SV('0.14.1'), SV(__version__))
+        self.assertLess(SV('0.14.1'), SV('0.14.2'))
-        self.assertLess(SV(__version__), SV('0.14.3'))
+        self.assertLess(SV('0.14.2'), SV(__version__))
+        self.assertLess(SV(__version__), SV('0.15.1'))