diff --git a/docs/index.rst b/docs/index.rst
index 0af510d0..bdd8e4c1 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -2,13 +2,19 @@
 Mopidy
 ******
 
-Mopidy is a music server which can play music from `Spotify
-<http://www.spotify.com/>`_ or from your local hard drive. To search for music
-in Spotify's vast archive, manage playlists, and play music, you can use most
-`MPD clients <http://mpd.wikia.com/>`_. MPD clients are available for most
-platforms, including Windows, Mac OS X, Linux, Android, and iOS.
+Mopidy is a music server which can play music both from your local hard drive
+and from `Spotify <http://www.spotify.com/>`_. Searches returns results from
+both your local hard drive and from Spotify, and you can mix tracks from both
+sources in your play queue. Your Spotify playlists are also available for use,
+though we don't support modifying them yet.
 
-To install Mopidy, start out by reading :ref:`installation`.
+To control your music server, you can use the Ubuntu Sound Menu on the machine
+running Mopidy, any device on the same network which supports the DLNA media
+controller spec (with the help of Rygel in addition to Mopidy), or any `MPD
+client <http://mpd.wikia.com/>`_. MPD clients are available for most platforms,
+including Windows, Mac OS X, Linux, Android and iOS.
+
+To install Mopidy, start by reading :ref:`installation`.
 
 If you get stuck, we usually hang around at ``#mopidy`` at `irc.freenode.net
 <http://freenode.net/>`_. If you stumble into a bug or got a feature request,
@@ -22,6 +28,7 @@ Project resources
 - `Documentation <http://docs.mopidy.com/>`_
 - `Source code <http://github.com/mopidy/mopidy>`_
 - `Issue tracker <http://github.com/mopidy/mopidy/issues>`_
+- `CI server <http://travis-ci.org/mopidy/mopidy>`_
 - IRC: ``#mopidy`` at `irc.freenode.net <http://freenode.net/>`_
 
 
@@ -39,6 +46,7 @@ User documentation
     licenses
     changes
 
+
 Reference documentation
 =======================
 
@@ -48,6 +56,7 @@ Reference documentation
     api/index
     modules/index
 
+
 Development documentation
 =========================
 
@@ -56,10 +65,10 @@ Development documentation
 
     development
 
+
 Indices and tables
 ==================
 
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-