Permalink
Browse files

M-x fill-paragraph

  • Loading branch information...
1 parent 1be74bb commit 31578e0d916cbcf27687142df42aac864d6b1f2b @alexkay committed Feb 11, 2012
Showing with 56 additions and 18 deletions.
  1. +42 −10 templates/about.html
  2. +5 −2 templates/contact.html
  3. +5 −3 templates/delete.html
  4. +2 −2 templates/faq.html
  5. +2 −1 templates/index.html
View
@@ -4,24 +4,56 @@
{% block content %}
<h2>What is muspy?</h2>
-<p>muspy /<a href="http://en.wikipedia.org/wiki/International_Phonetic_Alphabet">mju&#x02D0;'spa&#x026A;</a>/ is a free service that notifies you when your favourite artists release new albums.</p>
+<p>muspy
+/<a href="http://en.wikipedia.org/wiki/International_Phonetic_Alphabet">mju&#x02D0;'spa&#x026A;</a>/
+is a free service that notifies you when your favourite artists release new
+albums.</p>
<h2>How does it work?</h2>
-<p>Each day muspy checks the <a href="http://musicbrainz.org/">MusicBrainz</a> database to see if the artists you follow have new releases, and notifies you if they do. Notifications are sent by email or via <a href="http://en.wikipedia.org/wiki/Web_feed">RSS</a>.</p>
+<p>Each day muspy checks the <a href="http://musicbrainz.org/">MusicBrainz</a>
+database to see if the artists you follow have new releases, and notifies you if
+they do. Notifications are sent by email or
+via <a href="http://en.wikipedia.org/wiki/Web_feed">RSS</a>.</p>
<h2>Who is behind muspy?</h2>
-<p>muspy was created and is maintained by <a href="http://kojevnikov.com">Alexander Kojevnikov</a> and Olga Vasylevska. Following hundreds of obscure metal bands we are into is quite a daunting task, so we decided to do something about it. Hopefully you will find muspy useful too.</p>
+<p>muspy was created and is maintained
+by <a href="http://kojevnikov.com">Alexander Kojevnikov</a> and Olga
+Vasylevska. Following hundreds of obscure metal bands we are into is quite a
+daunting task, so we decided to do something about it. Hopefully you will find
+muspy useful too.</p>
<h2>Which tools do you use?</h2>
-<p>muspy is written in <a href="http://python.org/">Python</a> using the <a href="http://www.djangoproject.com/">Django</a> framework. It's served by <a href="http://nginx.org/">nginx</a> and <a href="http://projects.unbit.it/uwsgi/">uWSGI</a> running under <a href="http://www.freebsd.org/">FreeBSD</a>.</p>
-<p>muspy wouldn't exist without the <a href="http://musicbrainz.org/doc/Database">MusicBrainz database</a>. If you like muspy, consider <a href="http://musicbrainz.org/doc/HowToContribute">contributing</a> to the MusicBrainz project.</p>
+<p>muspy is written in <a href="http://python.org/">Python</a> using
+the <a href="http://www.djangoproject.com/">Django</a> framework. It's served
+by <a href="http://nginx.org/">nginx</a>
+and <a href="http://projects.unbit.it/uwsgi/">uWSGI</a> running
+under <a href="http://www.freebsd.org/">FreeBSD</a>.</p>
+<p>muspy wouldn't exist without
+the <a href="http://musicbrainz.org/doc/Database">MusicBrainz database</a>. If
+you like muspy,
+consider <a href="http://musicbrainz.org/doc/HowToContribute">contributing</a>
+to the MusicBrainz project.</p>
<h2>Source code</h2>
-<p>muspy is <a href="http://www.gnu.org/philosophy/free-sw.html">free</a> and open source software released under GNU AGPL. The code is hosted on <a href="https://github.com/alexkay/muspy">GitHub</a>.</p>
+<p>muspy is <a href="http://www.gnu.org/philosophy/free-sw.html">free</a> and
+open source software released under GNU AGPL. The code is hosted
+on <a href="https://github.com/alexkay/muspy">GitHub</a>.</p>
<h2>Privacy policy</h2>
-<p>muspy requires a valid email address to send release notifications, to receive them the email address must first be verified. If you use only the RSS feed, you don't have to provide a valid email address. We will never sell or share your email address with anyone, and will use it only for release notifications. You can unsubscribe from receiving emails from muspy on the settings page.</p>
-<p>Your password is stored as a <a href="http://en.wikipedia.org/wiki/Salt_(cryptography)">salted hash</a>. Neither us nor potential crackers have any means to recover your password.</p>
-<p>We use cookies to keep you signed in and to track your session. We may also log your IP address to assist us in administering our site and to compile usage statistics.</p>
-<p>We encourage everyone to review the <a href="https://github.com/alexkay/muspy">source code</a> of muspy and to <a href="/contact">report</a> any privacy and security-related issues.</p>
+<p>muspy requires a valid email address to send release notifications, to
+receive them the email address must first be verified. If you use only the RSS
+feed, you don't have to provide a valid email address. We will never sell or
+share your email address with anyone, and will use it only for release
+notifications. You can unsubscribe from receiving emails from muspy on the
+settings page.</p>
+<p>Your password is stored as
+a <a href="http://en.wikipedia.org/wiki/Salt_(cryptography)">salted
+hash</a>. Neither us nor potential crackers have any means to recover your
+password.</p>
+<p>We use cookies to keep you signed in and to track your session. We may also
+log your IP address to assist us in administering our site and to compile usage
+statistics.</p>
+<p>We encourage everyone to review
+the <a href="https://github.com/alexkay/muspy">source code</a> of muspy and
+to <a href="/contact">report</a> any privacy and security-related issues.</p>
{% endblock content %}
View
@@ -3,8 +3,11 @@
{% block header %}Contact{% endblock %}
{% block content %}
-<p>Report bugs and request features on <a href="https://github.com/alexkay/muspy/issues">GitHub</a>.</p>
+<p>Report bugs and request features
+on <a href="https://github.com/alexkay/muspy/issues">GitHub</a>.</p>
-<p>For other enquiries please <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#105;&#110;&#102;&#111;&#64;&#109;&#117;&#115;&#112;&#121;&#46;&#99;&#111;&#109;">email us</a>.</p>
+<p>For other enquiries
+please <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#105;&#110;&#102;&#111;&#64;&#109;&#117;&#115;&#112;&#121;&#46;&#99;&#111;&#109;">email
+us</a>.</p>
{% endblock content %}
View
@@ -6,9 +6,11 @@
<form method="post" action="/delete">
{% csrf_token %}
<input type="hidden" name="confirm" value="1"/>
-<p>Are you sure you want to delete your account? You will not be able to recover your data and settings.</p>
-<input type="submit" value="Yes, delete my account"/>
-<p>If you just want to adjust your notification settings or to turn off email notifications, you can do it on the <a href="/settings">settings page</a>.</p>
+<p>Are you sure you want to delete your account? You will not be able to recover
+your data and settings.</p> <input type="submit" value="Yes, delete my
+account"/>
+<p>If you just want to adjust your notification settings or to turn off email
+notifications, you can do it on the <a href="/settings">settings page</a>.</p>
</form>
{% endblock content %}
View
@@ -4,8 +4,8 @@
{% block content %}
<h2>How do I start?</h2>
-<p>Watch our video guide for a quick introduction.
-The guide is available on the <a href="/">home page</a>.</p>
+<p>Watch our video guide for a quick introduction. The guide is available on
+the <a href="/">home page</a>.</p>
<h2>Where do you take the information on new releases?</h2>
<p>muspy uses the excellent <a href="http://musicbrainz.org/">MusicBrainz</a>
View
@@ -13,7 +13,8 @@
<h2>Why?</h2>
<p>Have you ever missed an album of one of your favourite artists only to
discover it by accident weeks after the release? Do you spend a lot of time on
-official websites looking for release announcements? <span class="marker">With muspy you will save time and won't miss any releases</span>!</p>
+ official websites looking for release announcements? <span class="marker">With
+ muspy you will save time and won't miss any releases</span>!</p>
<h2>How?</h2>
{% if not user.is_authenticated %}
<p>You need to <a href="/signup">create an account</a> to use muspy.

0 comments on commit 31578e0

Please sign in to comment.