From 315661ec19141e12a9d7abe18659aa236caab830 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sat, 14 Jan 2012 22:43:00 +0100
Subject: [PATCH] Point documentation links at docs.mopidy.com

---
 README.rst                        |  6 ++----
 docs/development/contributing.rst | 14 ++------------
 docs/index.rst                    |  4 +---
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/README.rst b/README.rst
index c063de79..7415c670 100644
--- a/README.rst
+++ b/README.rst
@@ -9,11 +9,9 @@ in Spotify's vast archive, manage playlists, and play music, you can use most
 platforms, including Windows, Mac OS X, Linux, Android and iOS.
 
 To install Mopidy, check out
-`the installation docs <http://www.mopidy.com/docs/master/installation/>`_.
+`the installation docs <http://docs.mopidy.com/en/latest/installation/>`_.
 
-- `Documentation for the latest release <http://www.mopidy.com/docs/master/>`_
-- `Documentation for the development version
-  <http://www.mopidy.com/docs/develop/>`_
+- `Documentation for the latest release <http://docs.mopidy.com/>`_
 - `Source code <http://github.com/mopidy/mopidy>`_
 - `Issue tracker <http://github.com/mopidy/mopidy/issues>`_
 - IRC: ``#mopidy`` at `irc.freenode.net <http://freenode.net/>`_
diff --git a/docs/development/contributing.rst b/docs/development/contributing.rst
index 9ea3533f..0303bdc7 100644
--- a/docs/development/contributing.rst
+++ b/docs/development/contributing.rst
@@ -134,18 +134,8 @@ Then, to generate docs::
     make        # For help on available targets
     make html   # To generate HTML docs
 
-.. note::
-
-    The documentation at http://www.mopidy.com/ is automatically updated when a
-    documentation update is pushed to ``mopidy/mopidy`` at GitHub.
-
-    Documentation generated from the ``master`` branch is published at
-    http://www.mopidy.com/docs/master/, and will always be valid for the latest
-    release.
-
-    Documentation generated from the ``develop`` branch is published at
-    http://www.mopidy.com/docs/develop/, and will always be valid for the
-    latest development snapshot.
+The documentation at http://docs.mopidy.com/ is automatically updated when a
+documentation update is pushed to ``mopidy/mopidy`` at GitHub.
 
 
 Creating releases
diff --git a/docs/index.rst b/docs/index.rst
index 769aed20..7e757de0 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -19,9 +19,7 @@ please create an issue in the `issue tracker
 Project resources
 =================
 
-- `Documentation for the latest release <http://www.mopidy.com/docs/master/>`_
-- `Documentation for the development version
-  <http://www.mopidy.com/docs/develop/>`_
+- `Documentation <http://docs.mopidy.com/>`_
 - `Source code <http://github.com/mopidy/mopidy>`_
 - `Issue tracker <http://github.com/mopidy/mopidy/issues>`_
 - IRC: ``#mopidy`` at `irc.freenode.net <http://freenode.net/>`_