From 24d3fed411ebf3ce5a9eebc5971c5c1c0878cd5b Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Wed, 12 Aug 2015 22:21:01 +0200
Subject: [PATCH 1/4] docs: Add captions to ToCs

(cherry picked from commit 25e612876cd2a5ffdf8be9061d87e74b6b37352f)
---
 docs/index.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/index.rst b/docs/index.rst
index 9085024a..647d2319 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -78,6 +78,7 @@ Usage
 =====
 
 .. toctree::
+    :caption: Usage
     :maxdepth: 2
 
     installation/index
@@ -93,6 +94,7 @@ Extensions
 ==========
 
 .. toctree::
+    :caption: Extensions
     :maxdepth: 2
 
     ext/local
@@ -112,6 +114,7 @@ Clients
 =======
 
 .. toctree::
+    :caption: Clients
     :maxdepth: 2
 
     clients/http
@@ -124,6 +127,7 @@ About
 =====
 
 .. toctree::
+    :caption: About
     :maxdepth: 1
 
     authors
@@ -136,6 +140,7 @@ Development
 ===========
 
 .. toctree::
+    :caption: Development
     :maxdepth: 2
 
     contributing
@@ -149,6 +154,7 @@ Reference
 =========
 
 .. toctree::
+    :caption: Reference
     :maxdepth: 2
 
     glossary

From f5f957e4c9b187dc78d12b00dcc3e3c75216cf9c Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Wed, 12 Aug 2015 22:23:32 +0200
Subject: [PATCH 2/4] docs: Remove headers made redundant by ToC captions

(cherry picked from commit d942ae0555398630cc7f064ad364c5a5df5f7735)
---
 docs/index.rst | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index 647d2319..70d14a73 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -74,9 +74,6 @@ If you want to stay up to date on Mopidy developments, you can follow `@mopidy
 announcements related to Mopidy and Mopidy extensions.
 
 
-Usage
-=====
-
 .. toctree::
     :caption: Usage
     :maxdepth: 2
@@ -90,9 +87,6 @@ Usage
 
 .. _ext:
 
-Extensions
-==========
-
 .. toctree::
     :caption: Extensions
     :maxdepth: 2
@@ -110,9 +104,6 @@ Extensions
     ext/web
 
 
-Clients
-=======
-
 .. toctree::
     :caption: Clients
     :maxdepth: 2
@@ -123,9 +114,6 @@ Clients
     clients/upnp
 
 
-About
-=====
-
 .. toctree::
     :caption: About
     :maxdepth: 1
@@ -136,9 +124,6 @@ About
     versioning
 
 
-Development
-===========
-
 .. toctree::
     :caption: Development
     :maxdepth: 2
@@ -150,9 +135,6 @@ Development
     extensiondev
 
 
-Reference
-=========
-
 .. toctree::
     :caption: Reference
     :maxdepth: 2

From 96d5039054e4ceb2cd137d177007e339055ec302 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Thu, 13 Aug 2015 09:34:58 +0200
Subject: [PATCH 3/4] docs: Update sponsors page

(cherry picked from commit b1c4324def1a53bd90d999b3a5de39243b21b762)
---
 docs/sponsors.rst | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/docs/sponsors.rst b/docs/sponsors.rst
index dc94aa6f..2d8b7f4e 100644
--- a/docs/sponsors.rst
+++ b/docs/sponsors.rst
@@ -20,13 +20,21 @@ for free. We use their services for the following sites:
 
 - Mailgun for sending emails from the Discourse forum.
 
-- CDN hosting at http://dl.mopidy.com, which is used to distribute Pi Musicbox
+
+Fastly
+======
+
+`Fastly <https://www.fastly.com/>`_ lets Mopidy use their CDN for free. We
+accelerate requests to all Mopidy services, including:
+
+- https://apt.mopidy.com/dists/, which is used to distribute Debian packages.
+
+- https://dl.mopidy.com/pimusicbox/, which is used to distribute Pi Musicbox
   images.
 
 
 GlobalSign
 ==========
 
-`GlobalSign <https://www.globalsign.com/>`_ provides Mopidy with a free
-wildcard SSL certificate for mopidy.com, which we use to secure access to all
-our web sites.
+`GlobalSign <https://www.globalsign.com/>`_ provides Mopidy with a free SSL
+certificate for mopidy.com, which we use to secure access to all our web sites.

From 9bc78ac10e443bd74998a659eb9a66032d727b23 Mon Sep 17 00:00:00 2001
From: Ben Evans <ben@bensbit.co.uk>
Date: Sat, 22 Aug 2015 01:06:30 +0100
Subject: [PATCH 4/4] docs: JS block fix

---
 docs/api/js.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/js.rst b/docs/api/js.rst
index 6a8e0fcd..856f2db4 100644
--- a/docs/api/js.rst
+++ b/docs/api/js.rst
@@ -256,7 +256,7 @@ chain. The function will be called with the error object as the only argument:
 .. code-block:: js
 
     mopidy.playback.getCurrentTrack()
-        .catch(console.error.bind(console));
+        .catch(console.error.bind(console))
         .done(printCurrentTrack);
 
 You can also register the error handler at the end of the promise chain by