Merge branch 'master' into release-1.1

docs/clients/mpd.rst

@@ -171,5 +171,5 @@ projects are a real match made in heaven."
 Partify
 -------
 
-`Partify <http://www.partify.us/>`_ is a web based MPD client focusing on
+`Partify <https://github.com/fhats/partify>`_ is a web based MPD client
-making music playing collaborative and social.
+focussing on making music playing collaborative and social.

docs/contributing.rst

@@ -126,3 +126,11 @@ Pull request guidelines
 
 #. Send a pull request to the ``develop`` branch. See the `GitHub pull request
    docs <https://help.github.com/articles/using-pull-requests>`_ for help.
+
+.. note::
+
+    If you are contributing a bug fix for a specific minor version of Mopidy
+    you should create the branch based on ``release-x.y`` instead of
+    ``develop``. When the release is done the changes will be merged back into
+    ``develop`` automatically as part of the normal release process. See
+    :ref:`creating-releases`.

docs/ext/frontends.rst

@@ -81,4 +81,4 @@ Mopidy-Webhooks
 https://github.com/paddycarey/mopidy-webhooks
 
 Extension for sending HTTP POST requests with JSON payloads to a remote server
-on when Mopidy core triggers an event and on regular intervals.
+when Mopidy core triggers an event and on regular intervals.

docs/ext/mixers.rst

@@ -17,7 +17,7 @@ Mopidy-ALSAMixer
 
 https://github.com/mopidy/mopidy-alsamixer
 
-Extension for controlling volume one a Linux system using ALSA.
+Extension for controlling volume on a Linux system using ALSA.
 
 
 Mopidy-Arcam

docs/ext/web.rst

@@ -35,8 +35,8 @@ Mopidy-Local-Images
 
 https://github.com/tkem/mopidy-local-images
 
-Not a full-featured Web client, but rather a local library and Web
+Not a full-featured web client, but rather a local library and web
-extension which allows other Web clients access to album art embedded
+extension which allows other web clients access to album art embedded
 in local media files.
 
 .. image:: /ext/local_images.jpg
@@ -69,7 +69,7 @@ Mopidy-Mobile
 
 https://github.com/tkem/mopidy-mobile
 
-A Mopidy Web client extension and hybrid mobile app, made with Ionic,
+A Mopidy web client extension and hybrid mobile app, made with Ionic,
 AngularJS and Apache Cordova by Thomas Kemmer.
 
 .. image:: /ext/mobile.png
@@ -164,6 +164,22 @@ To install, run::
     pip install Mopidy-Simple-Webclient
 
 
+Mopidy-Spotmop
+==============
+
+https://github.com/jaedb/spotmop
+
+A client targeted at Spotify users. Made by James Barnsley.
+
+.. image:: /ext/spotmop.jpg
+    :width: 720
+    :height: 455
+
+To install, run::
+
+    pip install Mopidy-Spotmop
+
+
 Mopidy-WebSettings
 ==================
 

docs/releasing.rst

@@ -6,6 +6,7 @@ Here we try to keep an up to date record of how Mopidy releases are made. This
 documentation serves both as a checklist, to reduce the project's dependency on
 key individuals, and as a stepping stone to more automation.
 
+.. _creating-releases:
 
 Creating releases
 =================