Merge branch 'master' into cvs

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

diff --git a/doc/tipjar.mdwn b/doc/tipjar.mdwn
index bbcbbf122621afc1007b939ca05d853350e1ed9b..6d65a0a70a87447fc819d810fba6425436a224e3 100644 (file)
--- a/doc/tipjar.mdwn
+++ b/doc/tipjar.mdwn
@@ -1,13 +1,25 @@
 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.
+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="donate with PayPal" /></a>
 
-If you would like your donation listed here, let [[Joey]] know. Thanks to
-the following people for their kind contributions:
+<script type="text/javascript">var flattr_url = 'http://ikiwiki.info';</script>
+<script src="http://api.flattr.com/button/load.js" type="text/javascript"></script>
+
+Thanks to the following people for their kind contributions:
 
 * James Westby
 * Kyle S MacLea
+* Adam Shand
+* Martin Krafft
+* Paweł Tęcza
+* Mick Pollard
+* Nico Schottelius
+* Jon Dowland
+* Amitai Schlair
+* Luca Capello
 
-(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 button.
+If you prefer your donation *not* be listed here, let [[Joey]] know.)