andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

docs: Updated intro

Browse Source
This commit is contained in:
Stein Magnus Jodal 2013-04-11 22:23:22 +02:00
parent 86dc02d794
commit 7e5ff4bfae
3 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
README.rst
View File

@ -2,18 +2,16 @@
Mopidy Mopidy
****** ******
.. image:: https://secure.travis-ci.org/mopidy/mopidy.png?branch=develop Mopidy is a music server which can play music both from multiple sources, like
your local hard drive, radio streams, and from Spotify and SoundCloud. Searches
combines results from all music sources, and you can mix tracks from all
sources in your play queue. Your playlists from Spotify or SoundCloud are also
available for use.
Mopidy is a music server which can play music both from your local hard drive To control your Mopidy music server, you can use one of Mopidy's web clients,
and from Spotify. Searches returns results from both your local hard drive and the Ubuntu Sound Menu, any device on the same network which can control UPnP
from Spotify, and you can mix tracks from both sources in your play queue. Your MediaRenderers, or any MPD client. MPD clients are available for many
Spotify playlists are also available for use, though we don't support modifying platforms, including Windows, OS X, Linux, Android and iOS.
them yet.
To control your music server, you can use the Ubuntu Sound Menu on the machine
running Mopidy, any device on the same network which can control UPnP
MediaRenderers, or any MPD client. MPD clients are available for most
platforms, including Windows, Mac OS X, Linux, Android and iOS.
To get started with Mopidy, check out `the docs <http://docs.mopidy.com/>`_. To get started with Mopidy, check out `the docs <http://docs.mopidy.com/>`_.
@ -21,6 +19,10 @@ To get started with Mopidy, check out `the docs <http://docs.mopidy.com/>`_.
- `Source code <https://github.com/mopidy/mopidy>`_ - `Source code <https://github.com/mopidy/mopidy>`_
- `Issue tracker <https://github.com/mopidy/mopidy/issues>`_ - `Issue tracker <https://github.com/mopidy/mopidy/issues>`_
- `CI server <https://travis-ci.org/mopidy/mopidy>`_ - `CI server <https://travis-ci.org/mopidy/mopidy>`_
- `Download development snapshot <https://github.com/mopidy/mopidy/tarball/develop#egg=mopidy-dev>`_
- IRC: ``#mopidy`` at `irc.freenode.net <http://freenode.net/>`_ - IRC: ``#mopidy`` at `irc.freenode.net <http://freenode.net/>`_
- Mailing list: `mopidy@googlegroups.com <https://groups.google.com/forum/?fromgroups=#!forum/mopidy>`_ - Mailing list: `mopidy@googlegroups.com <https://groups.google.com/forum/?fromgroups=#!forum/mopidy>`_
- `Download development snapshot <https://github.com/mopidy/mopidy/tarball/develop#egg=mopidy-dev>`_ - Twitter: `@mopidy <https://twitter.com/mopidy/>`_
.. image:: https://secure.travis-ci.org/mopidy/mopidy.png?branch=develop

25
docs/index.rst
View File

@ -2,17 +2,18 @@
Mopidy Mopidy
****** ******
Mopidy is a music server which can play music both from your :ref:`local hard Mopidy is a music server which can play music both from multiple sources, like
drive <local-backend>` and from :ref:`Spotify <spotify-backend>`. Searches your :ref:`local hard drive <local-backend>`, :ref:`radio streams
returns results from both your local hard drive and from Spotify, and you can <stream-backend>`, and from :ref:`Spotify <spotify-backend>` and SoundCloud.
mix tracks from both sources in your play queue. Your Spotify playlists are Searches combines results from all music sources, and you can mix tracks from
also available for use, though we don't support modifying them yet. all sources in your play queue. Your playlists from Spotify or SoundCloud are
also available for use.
To control your music server, you can use the :ref:`Ubuntu Sound Menu To control your Mopidy music server, you can use one of Mopidy's :ref:`web
<ubuntu-sound-menu>` on the machine running Mopidy, any device on the same clients <http-clients>`, the :ref:`Ubuntu Sound Menu <ubuntu-sound-menu>`, any
network which can control UPnP MediaRenderers (see :ref:`upnp-clients`), or any device on the same network which can control :ref:`UPnP MediaRenderers
:ref:`MPD client <mpd-clients>`. MPD clients are available for most platforms, <upnp-clients>`, or any :ref:`MPD client <mpd-clients>`. MPD clients are
including Windows, Mac OS X, Linux, Android, and iOS. available for many platforms, including Windows, OS X, Linux, Android and iOS.
To get started with Mopidy, start by reading :ref:`installation`. To get started with Mopidy, start by reading :ref:`installation`.
@ -21,7 +22,9 @@ If you get stuck, we usually hang around at ``#mopidy`` at `irc.freenode.net
<https://groups.google.com/forum/?fromgroups=#!forum/mopidy>`_. If you stumble <https://groups.google.com/forum/?fromgroups=#!forum/mopidy>`_. If you stumble
into a bug or got a feature request, please create an issue in the `issue into a bug or got a feature request, please create an issue in the `issue
tracker <https://github.com/mopidy/mopidy/issues>`_. The `source code tracker <https://github.com/mopidy/mopidy/issues>`_. The `source code
<https://github.com/mopidy/mopidy>`_ may also be of help. <https://github.com/mopidy/mopidy>`_ may also be of help. If you want to stay
up to date on Mopidy developments, you can follow `@mopidy
<https://twitter.com/mopidy/>`_ on Twitter.
Introduction Introduction

2
docs/modules/backends/stream.rst
View File

@ -1,3 +1,5 @@
.. _stream-backend:
*********************************************** ***********************************************
:mod:`mopidy.backends.stream` -- Stream backend :mod:`mopidy.backends.stream` -- Stream backend
*********************************************** ***********************************************