Ubuntu One Android Music

Merge lp:~cmiller/ubuntuone-android-music/misc2 into lp:ubuntuone-android-music

  1. misc2
  2. Merge into trunk
Proposed by Chad Miller
Status: Merged
Approved by: Martin Albisetti
Approved revision: 457
Merged at revision: 459
Proposed branch: lp:~cmiller/ubuntuone-android-music/misc2
Merge into: lp:ubuntuone-android-music
Diff against target: 81 lines (+38/-26)
1 file modified
assets/html/en/index.html (+38/-26)
To merge this branch: bzr merge lp:~cmiller/ubuntuone-android-music/misc2
Reviewer Review Type Date Requested Status
Martin Albisetti (community) Approve
Review via email: mp+38000@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Albisetti (beuno) :
review: Approve
lp:~cmiller/ubuntuone-android-music/misc2 updated
458. By Chad Miller

Remove extra closing-A tag in help.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'assets/html/en/index.html'
2--- assets/html/en/index.html 2010-10-06 21:23:11 +0000
3+++ assets/html/en/index.html 2010-10-08 18:27:40 +0000
4@@ -7,39 +7,51 @@
5
6 <body>
7
8-<center>
9- <img src="../img/u1.png" alt=""/>
10- <h1>Ubuntu One Music</h1>
11+<center><img src="../img/u1.png" alt=""/>
12+<h1>Ubuntu One Music</h1>
13 </center>
14-<p>
15- With <b>Ubuntu One Mobile Music Streaming</b> you can stream your entire music library from your personal cloud to your Android device.
16-</p>
17-
18-<p>
19- To get started, go to <a href="http://one.ubuntu.com">one.ubuntu.com</a> and sign up for the free Ubuntu One Basic package. Add the Ubuntu One Mobile package for a low monthly or annual price. Try it free for 30 days.
20-</p>
21-
22-<p>
23- The Ubuntu One Mobile package includes the following features.
24-</p>
25-<ul>
26- <li>Stream your entire music library from your personal cloud to iPhone and Android devices, powered by <a href="http://subsonic.org/">Subsonic</a>.</li>
27- <!-- <li>Music media formats supported: ogg, mp3, aac, wav, and flac</li> MG: Check on what media formats we will be able to support -->
28- <li>Unlimited hours of music streaming. Works best over Wi-Fi.</li>
29- <li>Excellent companion to the Ubuntu One Music Store.</li>
30- <li>Includes photos and contacts sync for iPhone and Android devices.</li><!-- May need to alter depending on the delivery date of photos sync -->
31-</ul>
32-
33- <h2>Scrobbling</h2>
34-
35- <p>If you use <a href="http://last.fm/">Last.fm</a> to track your music and get recommendations, then you can install an "scrobbling" app to to send playlist events. Ubuntu One Mobile Music Streaming supports a number of apps:</a></p>
36+
37+ <p>
38+ With <b>Ubuntu One Mobile Music Streaming</b> you can stream your entire music library from your personal cloud to your Android device.
39+ </p>
40+
41+ <p>
42+ To get started, go to <a href="http://one.ubuntu.com">one.ubuntu.com</a> and sign up for the free Ubuntu One Basic package. Add the Ubuntu One Mobile package for a low monthly or annual price; try it free for 30 days.
43+ </p>
44+
45+ <p>
46+ The Ubuntu One Mobile package includes the following features.
47+ </p>
48+ <ul>
49+ <li>Stream your entire music library from your personal cloud to iPhone and Android devices, powered by <a href="http://subsonic.org/">Subsonic</a>.</li>
50+ <!-- <li>Music media formats supported: ogg, mp3, aac, wav, and flac</li> MG: Check on what media formats we will be able to support -->
51+ <li>Unlimited hours of music streaming. Works best over Wi-Fi.</li>
52+ <li>Excellent companion to the Ubuntu One Music Store.</li>
53+ <li>Includes photos and contacts sync for iPhone and Android devices.</li><!-- May need to alter depending on the delivery date of photos sync -->
54+ </ul>
55+
56+
57+<h2>Problems?</h2>
58+
59+ <p>
60+ If you have problems, please check for app updates in the Android Market first, then tell us at <a href="https://bugs.launchpad.net/ubuntuone-android-music">Launchpad's bug tracker for Ubuntu One Music</a>. Please report problems there. We do not watch Android Market reviews for complaints.
61+ </p>
62+
63+ <p>
64+ In some cases, to find out what causes a problem, we may need the system logs from your device, which you can get from using a free app in the market, "aLogCat".
65+ </p>
66+
67+
68+<h2>Scrobbling</h2>
69+
70+ <p>If you use <a href="http://last.fm/">Last.fm</a> to track your music and get recommendations, then this app will work with "scrobbling" apps to to send playlist events. Ubuntu One Music supports a number of apps:</p>
71
72 <ul>
73 <li><i><disableda href="http://market.android.com/details?id=com.adam.aslfms">Simple Last.fm Scrobbler</disableda></i></li>
74 <li>official <i><disableda href="http://market.android.com/search?q=fm.last.android">Last.fm</disableda></i></li>
75 </ul>
76
77- <p>To use, enable scrobbling in the Ubuntu One Mobile Music Streaming settings, after you install and set up a scrobbling app.</p>
78+ <p>To use scrobbling services, install one of these applications and enable scrobbling in Ubuntu One Music.</p>
79
80
81 </body>

Subscribers

People subscribed via source and target branches

to status/vote changes: