Fix contribute

bzr-revno: 65

files/.htaccess

@@ -8,8 +8,6 @@ RewriteCond %{HTTPS} off
 RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 # Some old URLs start with "en", just drop it
 RewriteRule ^en/(.*)$ /$1 [R=301,L]
-# Some old URLs that are still linked to
-RewriteRule ^contribute$ http://manual.openlp.org/faq.html#can-i-help-with-openlp [R=301,L]
 # Make .html optional
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d

pages/contribute.rst

@@ -0,0 +1,35 @@
+.. title: Contribute to OpenLP
+.. slug: contribute
+.. date: 2017-03-13 03:38:12 UTC
+.. tags: 
+.. category: 
+.. link: 
+.. description: 
+.. type: text
+.. previewimage: /cover-images/contribute.jpg
+
+From time to time we have people asking us how they can contribute to OpenLP. Some people think we only want help from
+developers. This is not true, we need help from a range of people.
+
+Here are some of the areas we need help in:
+
+1. Development (of course): We always need developers who are skilled in Python for OpenLP itself, as well as Swift for
+   the iOS Remote, Java for the Android Remote and Angular for the Web Remote.
+2. Design: Thanks to a few people in the past, OpenLP has had some decent design work done, but that doesn't mean we
+   don't have space for more.
+3. Web Sites: We have a few sites we maintain (the main website, the developer site, etc), and we need help there.
+4. Support: We get around 5 support requests per day in our support system, and around the same in our forums, but
+   there are very few people who actually check either of them. Just spending 10 minutes a day on the forums helping
+   others out would help us tremendously.
+5. Documentation: The reference manual is great, but is in need of updating.
+6. Blog posts: We'd love to have regular blog posts about how people use OpenLP in their churches.
+
+If you think you can help out with any of those items, please contact us through support (at) openlp.org, we'd love to
+hear from you.
+
+If you'd like to contribute financially, please see our `donate page`_.
+
+[ Image Credit: `Help by Lydia`_ ]
+
+.. _donate page: https://openlp.org/donate
+.. _Help by Lydia: https://www.flickr.com/photos/lydiashiningbrightly/4436324664/

pages/donate.rst

@@ -4,9 +4,8 @@
 .. type: text
 .. previewimage: /cover-images/donate.jpg
 
-Like most other voluntary open source projects, OpenLP has no income and is
+Like most other voluntary open source projects, OpenLP has no income and is entirely funded by the personal funds of
-entirely funded by the personal funds of the developers. We have a number of
+the developers. We have a number of fixed costs, like server hosting, domain names, and the like. If you'd like to
-fixed costs, like server hosting, domain names, and the like. If you'd like to
 help us out, please consider donating to our cause.
 
 There are three types of donations:
@@ -17,17 +16,15 @@ There are three types of donations:
 
 Once-off Donations
 ^^^^^^^^^^^^^^^^^^
-Once-off donations are gratefully accepted. Donations can be made via PayPal.
+Once-off donations are gratefully accepted. You can donate by going to `https://www.paypal.me/raoulsnyman`_. You don't
-To send a once-off donatation to OpenLP, send an e-mail via our `contact form`_
+need a PayPal account.
-and we will reply with the Paypal address.
 
 Regular Donations
 ^^^^^^^^^^^^^^^^^
-While once-off donations are nice, regular donations are much more useful to us.
+While once-off donations are nice, regular donations are much more useful to us. They help to cover our month-to-month
-They help to cover our month-to-month costs. We use `Gratipay`_ for automated
+costs. We use `Gratipay`_ for automated regular donations. Gratipay works on a weekly schedule, so calculate what you
-regular donations. Gratipay works on a weekly schedule, so calculate what you
+want to donate on a monthly basis and basically divide it by 4. Gratipay works through PayPal, so all you need is a
-want to donate on a monthly basis and basically divide it by 4. Gratipay works
+PayPal account.
-through PayPal, so all you need is a PayPal account.
 
 Set up your donation by clicking on the button below.
 
@@ -39,13 +36,12 @@ Set up your donation by clicking on the button below.
         </a>
     </p>
 
-*Currently, after payment fees, we are receiving US$ 0.05 per week.*
+*Currently, after payment fees, we are receiving around US$ 9.00 per week.*
 
 Buy Swag
 ^^^^^^^^
-One other way you can help us financially is by buying stuff from our online
+One other way you can help us financially is by buying stuff from our online store. There are T-shirts, cups, hats,
-store. There are T-shirts, cups, hats, USB drives, and other things for sale,
+USB drives, and other things for sale, and all proceeds go to OpenLP.
-and a small percentage of the proceeds goes toward OpenLP.
 
 The store has been set up on Zazzle: `OpenLP Merchandise Store`_
 
@@ -53,15 +49,12 @@ Regular Costs
 ^^^^^^^^^^^^^
 Here's a breakdown of our regular costs:
 
-1. $20/month for a `VPS from Linode.com`_, which we'd like to upgrade to the
+1. $20/month for a `VPS from Linode.com`_, which we'd like to upgrade to the next level, which will cost us $40/month.
-   next level, which will cost us $40/month.
 2. $10/month for a `backup service`_, also from Linode.com.
-3. $17/year for our main domain, `openlp.org`_. See `Gandi.net's pricing page`_
+3. $17/year for our main domain, `openlp.org`_. See `Gandi.net's pricing page`_ for information on domain name costs.
-   for information on domain name costs.
 4. $35/year for our developer domain, `openlp.io`_.
 
-This comes to roughly $8 per week. To be able to upgrade to the next level, we
+This comes to roughly $8 per week. To be able to upgrade to the next level, we will need roughly $12.50 per week.
-will need roughly $12.50 per week.
 
 
 [ Image Credit: `Tip Jar at Open Bar by Dave Dugdale`_ ]