From dbb027ed7d1420d121e1c20c3609494046c57b7e Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Tue, 10 Aug 2010 21:46:14 +0200
Subject: [PATCH] docs: How to install libspotify at OS X, and other small
 installation docs changes

---
 docs/installation/despotify.rst  | 10 +++++++--
 docs/installation/index.rst      | 10 +++++----
 docs/installation/libspotify.rst | 38 +++++++++++++++++++++++++-------
 3 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/docs/installation/despotify.rst b/docs/installation/despotify.rst
index 335efa14..6787070d 100644
--- a/docs/installation/despotify.rst
+++ b/docs/installation/despotify.rst
@@ -27,16 +27,22 @@ Build and install Despotify::
     cd despotify/src/
     sudo make install
 
+When Despotify has been installed, continue with :ref:`spytify_installation`.
+
 
 Installing Despotify on OS X
 ============================
 
-In OS X you need to have `XCode <http://developer.apple.com/tools/xcode/>`_
-installed, and `Homebrew <http://mxcl.github.com/homebrew/>`_. Then, install
+In OS X you need to have `XCode <http://developer.apple.com/tools/xcode/>`_ and
+`Homebrew <http://mxcl.github.com/homebrew/>`_ installed. Then, to install
 Despotify::
 
     brew install despotify
 
+When Despotify has been installed, continue with :ref:`spytify_installation`.
+
+
+.. _spytify_installation:
 
 Installing spytify
 ==================
diff --git a/docs/installation/index.rst b/docs/installation/index.rst
index b7601c3a..d70d7392 100644
--- a/docs/installation/index.rst
+++ b/docs/installation/index.rst
@@ -7,11 +7,11 @@ Mopidy itself is a breeze to install, as it just requires a standard Python
 service is far more tricky to get working for the time being. Until
 installation of these libraries are either well documented by their developers,
 or the libraries are packaged for various Linux distributions, we will supply
-our own installation guides.
+our own installation guides, as linked to below.
 
 
-Dependencies
-============
+Install dependencies
+====================
 
 .. toctree::
     :hidden:
@@ -20,6 +20,8 @@ Dependencies
     libspotify
     gstreamer
 
+Make sure you got the required dependencies installed.
+
 - Python >= 2.6, < 3
 - Dependencies for at least one Mopidy mixer:
 
@@ -29,7 +31,7 @@ Dependencies
 
   - OsaMixer (OS X only)
 
-    - Nothing needed.
+    - No additional dependencies.
 
 - Dependencies for at least one Mopidy backend:
 
diff --git a/docs/installation/libspotify.rst b/docs/installation/libspotify.rst
index f595a5cb..9dc9689f 100644
--- a/docs/installation/libspotify.rst
+++ b/docs/installation/libspotify.rst
@@ -12,11 +12,9 @@ To use the libspotify backend you must install libspotify and
     This backend requires a Spotify premium account, and it requires you to get
     an application key from Spotify before use.
 
-**TODO** Test and document installation on OS X.
 
-
-Installing libspotify
-=====================
+Installing libspotify on Linux
+==============================
 
 Download and install libspotify 0.0.4 for your OS and CPU architecture from
 https://developer.spotify.com/en/libspotify/.
@@ -29,6 +27,30 @@ For 64-bit Linux the process is as follows::
     sudo make install prefix=/usr/local
     sudo ldconfig
 
+When libspotify has been installed, continue with
+:ref:`pyspotify_installation`.
+
+
+Installing libspotify on OS X
+=============================
+
+In OS X you need to have `XCode <http://developer.apple.com/tools/xcode/>`_ and
+`Homebrew <http://mxcl.github.com/homebrew/>`_ installed. Then, to install
+libspotify::
+
+    brew install libspotify
+
+When libspotify has been installed, continue with
+:ref:`pyspotify_installation`.
+
+
+Install libspotify on Windows
+=============================
+
+**TODO** Test and document installation on Windows.
+
+
+.. _pyspotify_installation:
 
 Installing pyspotify
 ====================
@@ -43,14 +65,14 @@ Check out the pyspotify code, and install it::
     cd pyspotify/pyspotify/
     sudo python setup.py install
 
-Apply for an application key at
-https://developer.spotify.com/en/libspotify/application-key, download the
-binary version, and place the file at ``pyspotify/spotify_appkey.key``.
-
 
 Testing the installation
 ========================
 
+Apply for an application key at
+https://developer.spotify.com/en/libspotify/application-key, download the
+binary version, and place the file at ``pyspotify/spotify_appkey.key``.
+
 Test your libspotify setup::
 
     examples/example1.py -u USERNAME -p PASSWORD