From 031fc43a8a03f9caaf20b7642cfe01beb90ec033 Mon Sep 17 00:00:00 2001 From: Wouter van Wijk Date: Thu, 14 Mar 2013 23:51:20 +0100 Subject: [PATCH] better markdown --- README.md | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index a1d9c7f..a9bd75e 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ With Mopidy Browser Client, you can play your music on your computer (or Rapsber This is a responsive html/js/css client especially written for Mopidy, a music server. Responsive, so it works on desktop and mobile browsers. You can browse, search and play albums, artists, playlists, and it has cover art from Last.fm. -`Mopidy `_ is a music server which can play music from `Spotify `_ or from your hard drive. +[Mopidy](http://www.mopidy.com/) is a music server which can play music from `Spotify (http://www.spotify.com/) or from your hard drive. Development =========== @@ -17,9 +17,9 @@ Note: this Git-version is under development! As Mopidy changes, this client chan Installation ============ -To install Mopidy, check out `the installation docs `_, `the settings docs `_ and `even more detailed information `_. +To install Mopidy, check out [the installation docs](http://docs.mopidy.com/en/latest/installation/), [the settings docs](http://docs.mopidy.com/en/latest/settings/) and [even more detailed information](http://docs.mopidy.com/en/latest/modules/frontends/http/#http-frontend). -If you want to use the web client on a Raspberry Pi, do yourself a favor and use my custom built SD-image: `Pi MusicBox `_. +If you want to use the web client on a Raspberry Pi, do yourself a favor and use my custom built SD-image: [Pi MusicBox](http://www.woutervanwijk.nl/pimusicbox/). Quick install ============= @@ -28,17 +28,13 @@ Drop the 'webclient' folder in a folder on your Mopidy-system. Then change the s Add a line *mopidy.frontends.http.HttpFrontend* to the FRONTENDS section of your settings.py in the .config directory, and set the *HTTP_SERVER_STATIC_DIR* to point to the folder with the files from the web client. Something like this: -<<<<<<< HEAD:README.rst - -FRONTENDS = ( -======= ```python FRONTENDS = ( ->>>>>>> markup fixed I hope:README.md 'mopidy.frontends.mpd.MpdFrontend', 'mopidy.frontends.http.HttpFrontend', 'mopidy.frontends.lastfm.LastfmFrontend', - 'mopidy.frontends.mpris.MprisFrontend' ) + 'mopidy.frontends.mpris.MprisFrontend', +) HTTP_SERVER_HOSTNAME = u'0.0.0.0' HTTP_SERVER_PORT = 6680 HTTP_SERVER_STATIC_DIR = u'/opt/webclient' @@ -49,4 +45,4 @@ Then point your browser (modern, with websockets: recent versions of Firefox, Ch Security ======== -(Note from Mopidy:) Note that the HTTP frontend does not feature any form of user authentication or authorization. Anyone able to access the web server can use the full core API of Mopidy. Thus, you probably only want to make the web server available from your local network or place it behind a web proxy which takes care or user authentication. You have been warned. +(Note from Mopidy:) Note that the HTTP frontend does not feature any form of user authentication or authorization. Anyone able to access the web server can use the full core API of Mopidy. Thus, you probably only want to make the web server available from your local network or place it behind a web proxy which takes care or user authentication. You have been warned. \ No newline at end of file