Merge branch 'master' into v1.1.x

This commit is contained in:
Stein Magnus Jodal 2015-08-23 17:27:11 +02:00
commit 09a34fb90c
3 changed files with 19 additions and 23 deletions

View File

@ -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

View File

@ -74,10 +74,8 @@ 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
installation/index
@ -89,10 +87,8 @@ Usage
.. _ext:
Extensions
==========
.. toctree::
:caption: Extensions
:maxdepth: 2
ext/local
@ -108,10 +104,8 @@ Extensions
ext/web
Clients
=======
.. toctree::
:caption: Clients
:maxdepth: 2
clients/http
@ -120,10 +114,8 @@ Clients
clients/upnp
About
=====
.. toctree::
:caption: About
:maxdepth: 1
authors
@ -132,10 +124,8 @@ About
versioning
Development
===========
.. toctree::
:caption: Development
:maxdepth: 2
contributing
@ -145,10 +135,8 @@ Development
extensiondev
Reference
=========
.. toctree::
:caption: Reference
:maxdepth: 2
glossary

View File

@ -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.