Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / tipjar.mdwn

diff --git a/doc/tipjar.mdwn b/doc/tipjar.mdwn
index 93a58e30d37c0f9238b60ef37db0af7b8a2d9d57..17599e050f544fabc1c6c4bbe7fba0f61b1bbf46 100644 (file)
--- a/doc/tipjar.mdwn
+++ b/doc/tipjar.mdwn
@@ -1,12 +1,25 @@
 Ikiwiki is [[FreeSoftware]], but you're also free to show your appreciation
 Ikiwiki is [[FreeSoftware]], but you're also free to show your appreciation

-to [[Joey]] or help offset hosting costs with a donation in any amount you
-choose.
+by helping to offset hosting costs with a donation in any amount you
+choose. If you'd like to fund development of a specific feature, see the
+[[consultants]] page.

 
 

-<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=joey%40kitenet%2enet&item_name=ikiwiki&no_shipping=1&cn=Comments%3f&tax=0&currency_code=USD&lc=US&bn=PP%2dDonationsBF&charset=UTF%2d8"><img src="https://www.paypal.com/en_US/i/btn/x-click-but04.gif" alt="dontate with PayPal" /></a>
+* [Donate with PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=joey%40kitenet%2enet&item_name=ikiwiki&no_shipping=1&cn=Comments%3f&tax=0&currency_code=USD&lc=US&bn=PP%2dDonationsBF&charset=UTF%2d8)
+* [Donate with Flattr](http://flattr.com/thing/39811/ikiwiki)

 
 

-If you would like your donation listed here, let [[Joey]] know. Thanks to
-the following people for their kind contributions:
+Thanks to the following people for their kind contributions:

 
 * James Westby
 
 * James Westby

+* Kyle S MacLea
+* Adam Shand
+* Martin Krafft
+* Paweł Tęcza
+* Mick Pollard
+* Nico Schottelius
+* Jon Dowland
+* Amitai Schlair
+* Luca Capello
+* Patrick ZAJDA
+* Fergus Cameron

 
 

-(Note that this page is locked to prevent anyone from tampering with the paypal button.)
+(Note that this page is locked to prevent anyone from tampering with the PayPal link.
+If you prefer your donation *not* be listed here, let [[Joey]] know.)