Merge branch 'develop' into feature/search-by-albumartist

Conflicts:
	tests/backends/local/library_test.py

AUTHORS

@@ -23,6 +23,8 @@
 - Tobias Sauerwein <cgtobi@gmail.com>
 - Alli Witheford <alzeih@gmail.com>
 - Alexandre Petitjean <alpetitjean@gmail.com>
+- Terje Larsen <terlar@gmail.com>
 - Pavol Babincak <scroolik@gmail.com>
 - Javier Domingo <javierdo1@gmail.com>
+- Javier Domingo Cansino <javier.domingo@fon.com>
 - Lasse Bigum <lasse@bigum.org>

MANIFEST.in

@@ -2,7 +2,6 @@ include *.rst
 include LICENSE
 include MANIFEST.in
 include data/mopidy.desktop
-include pylintrc
 
 recursive-include docs *
 prune docs/_build

docs/ext/index.rst

@@ -106,7 +106,7 @@ Mopidy-SoundCloud
 
 https://github.com/mopidy/mopidy-soundcloud
 
-rovides a backend for playing music from the `SoundCloud
+Provides a backend for playing music from the `SoundCloud
 <http://www.soundcloud.com/>`_ service.
 
 

docs/index.rst

@@ -30,7 +30,7 @@ Usage
 =====
 
 .. toctree::
-    :maxdepth: 3
+    :maxdepth: 2
 
     installation/index
     installation/raspberrypi

tests/backends/local/library_test.py

@@ -11,7 +11,7 @@ from mopidy.models import Track, Album, Artist
 from tests import path_to_data_dir
 
 
-class LocalLibraryControllerTest(unittest.TestCase):
+class LocalLibraryProviderTest(unittest.TestCase):
     artists = [
         Artist(name='artist1'),
         Artist(name='artist2'),

tests/backends/local/playback_test.py

@@ -19,7 +19,7 @@ from tests.backends.local import generate_song, populate_tracklist
 # TODO Test 'playlist repeat', e.g. repeat=1,single=0
 
 
-class LocalPlaybackControllerTest(unittest.TestCase):
+class LocalPlaybackProviderTest(unittest.TestCase):
     config = {
         'local': {
             'media_dir': path_to_data_dir(''),

tests/backends/local/playlists_test.py

@@ -15,7 +15,7 @@ from tests import path_to_data_dir
 from tests.backends.local import generate_song
 
 
-class LocalPlaylistsControllerTest(unittest.TestCase):
+class LocalPlaylistsProviderTest(unittest.TestCase):
     backend_class = actor.LocalBackend
     config = {
         'local': {

tests/backends/local/tracklist_test.py

@@ -14,7 +14,7 @@ from tests import path_to_data_dir
 from tests.backends.local import generate_song, populate_tracklist
 
 
-class LocalTracklistControllerTest(unittest.TestCase):
+class LocalTracklistProviderTest(unittest.TestCase):
     config = {
         'local': {
             'media_dir': path_to_data_dir(''),