From 870d5db135c87ca7d9ff1fcfab2dc9cb1d4a3780 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sun, 4 Nov 2012 21:54:56 +0100
Subject: [PATCH] docs: Fix a broken link. Reduce amount of redirects

---
 docs/changes.rst                 |  2 +-
 docs/clients/mpd.rst             |  2 +-
 docs/development.rst             | 11 ++++++-----
 docs/index.rst                   |  8 ++++----
 docs/installation/libspotify.rst |  4 ++--
 mopidy/settings.py               |  2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/docs/changes.rst b/docs/changes.rst
index ea5a1530..473c7e37 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -1143,7 +1143,7 @@ Mopidy is working and usable. 0.1.0a0 is an alpha release, which basicly means
 we will still change APIs, add features, etc. before the final 0.1.0 release.
 But the software is usable as is, so we release it. Please give it a try and
 give us feedback, either at our IRC channel or through the `issue tracker
-<http://github.com/mopidy/mopidy/issues>`_. Thanks!
+<https://github.com/mopidy/mopidy/issues>`_. Thanks!
 
 **Changes**
 
diff --git a/docs/clients/mpd.rst b/docs/clients/mpd.rst
index c7dc3799..6949e506 100644
--- a/docs/clients/mpd.rst
+++ b/docs/clients/mpd.rst
@@ -281,7 +281,7 @@ Tested version:
 
 The `MPoD <http://www.katoemba.net/makesnosenseatall/mpod/>`_ iPhone/iPod Touch
 app can be installed from the `iTunes Store
-<http://itunes.apple.com/us/app/mpod/id285063020>`_.
+<https://itunes.apple.com/us/app/mpod/id285063020>`_.
 
 Users have reported varying success in using MPoD together with Mopidy. Thus,
 we've tested a fresh install of MPoD 1.5.1 with Mopidy as of revision e7ed28d
diff --git a/docs/development.rst b/docs/development.rst
index eae211b9..1fd419d0 100644
--- a/docs/development.rst
+++ b/docs/development.rst
@@ -3,7 +3,7 @@ Development
 ***********
 
 Development of Mopidy is coordinated through the IRC channel ``#mopidy`` at
-``irc.freenode.net`` and through `GitHub <http://github.com/>`_.
+``irc.freenode.net`` and through `GitHub <https://github.com/>`_.
 
 
 Release schedule
@@ -90,7 +90,8 @@ Code style
 Commit guidelines
 =================
 
-- We follow the development process described at http://nvie.com/git-model.
+- We follow the development process described at
+  `nvie.com <http://nvie.com/posts/a-successful-git-branching-model/>`_.
 
 - Keep commits small and on topic.
 
@@ -133,13 +134,13 @@ To run tests with test coverage statistics::
     nosetests --with-coverage
 
 For more documentation on testing, check out the `nose documentation
-<http://somethingaboutorange.com/mrl/projects/nose/>`_.
+<http://nose.readthedocs.org/>`_.
 
 
 Continuous integration
 ======================
 
-Mopidy uses the free service `Travis CI <http://travis-ci.org/#mopidy/mopidy>`_
+Mopidy uses the free service `Travis CI <https://travis-ci.org/mopidy/mopidy>`_
 for automatically running the test suite when code is pushed to GitHub. This
 works both for the main Mopidy repo, but also for any forks. This way, any
 contributions to Mopidy through GitHub will automatically be tested by Travis
@@ -205,7 +206,7 @@ playlists.
 Writing documentation
 =====================
 
-To write documentation, we use `Sphinx <http://sphinx.pocoo.org/>`_. See their
+To write documentation, we use `Sphinx <http://sphinx-doc.org/>`_. See their
 site for lots of documentation on how to use Sphinx. To generate HTML or LaTeX
 from the documentation files, you need some additional dependencies.
 
diff --git a/docs/index.rst b/docs/index.rst
index c9d2577b..c86c3f0d 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -19,16 +19,16 @@ 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,
 please create an issue in the `issue tracker
-<http://github.com/mopidy/mopidy/issues>`_.
+<https://github.com/mopidy/mopidy/issues>`_.
 
 
 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>`_
+- `Source code <https://github.com/mopidy/mopidy>`_
+- `Issue tracker <https://github.com/mopidy/mopidy/issues>`_
+- `CI server <https://travis-ci.org/mopidy/mopidy>`_
 - IRC: ``#mopidy`` at `irc.freenode.net <http://freenode.net/>`_
 
 
diff --git a/docs/installation/libspotify.rst b/docs/installation/libspotify.rst
index 223e4ed7..042034e7 100644
--- a/docs/installation/libspotify.rst
+++ b/docs/installation/libspotify.rst
@@ -3,8 +3,8 @@ libspotify installation
 ***********************
 
 Mopidy uses `libspotify
-<http://developer.spotify.com/en/libspotify/overview/>`_ for playing music from
-the Spotify music service. To use :mod:`mopidy.backends.spotify` you must
+<https://developer.spotify.com/technologies/libspotify/>`_ for playing music
+from the Spotify music service. To use :mod:`mopidy.backends.spotify` you must
 install libspotify and `pyspotify <http://pyspotify.mopidy.com/>`_.
 
 .. note::
diff --git a/mopidy/settings.py b/mopidy/settings.py
index c1f35887..fbc71f0e 100644
--- a/mopidy/settings.py
+++ b/mopidy/settings.py
@@ -26,7 +26,7 @@ BACKENDS = (
 
 #: The log format used for informational logging.
 #:
-#: See http://docs.python.org/library/logging.html#formatter-objects for
+#: See http://docs.python.org/2/library/logging.html#formatter-objects for
 #: details on the format.
 CONSOLE_LOG_FORMAT = u'%(levelname)-8s %(message)s'