Merge branch 'master' of git@github.com:jodal/mopidy

This commit is contained in:
Stein Magnus Jodal 2010-03-23 22:36:16 +01:00
commit 37822aefee
2 changed files with 6 additions and 7 deletions

3
.gitignore vendored
View File

@ -5,8 +5,7 @@
MANIFEST
build/
dist/
docs/_build
mopidy/settings/local.py
docs/_build/
pip-log.txt
src/
tmp/

View File

@ -98,10 +98,10 @@ To start Mopidy, simply open a terminal and run::
mopidy
When Mopidy says ``Please connect to localhost port 6600 using an MPD client.``
it's ready to accept connections by any MPD client. You can find a list of tons
of MPD clients at http://mpd.wikia.com/wiki/Clients. We use Sonata, GMPC,
ncmpc, and ncmpcpp during development. The first two are GUI clients, while the
last two are terminal clients.
When Mopidy says ``MPD server running at [localhost]:6600`` it's ready to
accept connections by any MPD client. You can find a list of tons of MPD
clients at http://mpd.wikia.com/wiki/Clients. We use Sonata, GMPC, ncmpc, and
ncmpcpp during development. The first two are GUI clients, while the last two
are terminal clients.
To stop Mopidy, press ``CTRL+C``.