From d5c5fc16f5da6ffc68fd68781d8c1a19678df048 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sun, 15 Aug 2010 00:28:50 +0200
Subject: [PATCH] Add Spotify Core notices as required by Spotify

---
 docs/installation/libspotify.rst       | 18 ++++++++++++------
 mopidy/backends/libspotify/__init__.py | 17 +++++++++++------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/docs/installation/libspotify.rst b/docs/installation/libspotify.rst
index 911bf39e..629998b9 100644
--- a/docs/installation/libspotify.rst
+++ b/docs/installation/libspotify.rst
@@ -2,15 +2,21 @@
 libspotify installation
 ***********************
 
-We are working on a
-`libspotify <http://developer.spotify.com/en/libspotify/overview/>`_ backend.
-To use the libspotify backend you must install libspotify and
-`pyspotify <http://github.com/winjer/pyspotify>`_.
+Mopidy uses `libspotify
+<http://developer.spotify.com/en/libspotify/overview/>`_ for playing music from
+the Spotify music service. To use :mod:`mopidy.backends.libspotify` you must
+install libspotify and `pyspotify <http://github.com/winjer/pyspotify>`_.
 
 .. warning::
 
-    This backend requires a Spotify premium account, and it requires you to get
-    an application key from Spotify before use.
+    This backend requires a `Spotify premium account
+    <http://www.spotify.com/no/get-spotify/premium/>`_.
+
+.. note::
+
+    This product uses SPOTIFY CORE but is not endorsed, certified or otherwise
+    approved in any way by Spotify. Spotify is the registered trade mark of the
+    Spotify Group.
 
 
 Installing libspotify on Linux
diff --git a/mopidy/backends/libspotify/__init__.py b/mopidy/backends/libspotify/__init__.py
index 7a971bc5..f00ec1f0 100644
--- a/mopidy/backends/libspotify/__init__.py
+++ b/mopidy/backends/libspotify/__init__.py
@@ -9,14 +9,18 @@ ENCODING = 'utf-8'
 
 class LibspotifyBackend(BaseBackend):
     """
-    A Spotify backend which uses the official `libspotify library
-    <http://developer.spotify.com/en/libspotify/overview/>`_.
-
-    `pyspotify <http://github.com/winjer/pyspotify/>`_ is the Python bindings
-    for libspotify. It got no documentation, but multiple examples are
-    available. Like libspotify, pyspotify's calls are mostly asynchronous.
+    A `Spotify <http://www.spotify.com/>`_ backend which uses the official
+    `libspotify <http://developer.spotify.com/en/libspotify/overview/>`_
+    library and the `pyspotify <http://github.com/winjer/pyspotify/>`_ Python
+    bindings for libspotify.
 
     **Issues:** http://github.com/jodal/mopidy/issues/labels/backend-libspotify
+
+    .. note::
+
+        This product uses SPOTIFY(R) CORE but is not endorsed, certified or
+        otherwise approved in any way by Spotify. Spotify is the registered
+        trade mark of the Spotify Group.
     """
 
     # Imports inside methods are to prevent loading of __init__.py to fail on
@@ -40,6 +44,7 @@ class LibspotifyBackend(BaseBackend):
     def _connect(self):
         from .session_manager import LibspotifySessionManager
 
+        logger.info(u'Mopidy uses SPOTIFY(R) CORE')
         logger.info(u'Connecting to Spotify')
         spotify = LibspotifySessionManager(
             settings.SPOTIFY_USERNAME, settings.SPOTIFY_PASSWORD,