Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/tipjar.mdwn b/doc/tipjar.mdwn
index b2ededf9d8db1e6029d28f8044b74a193c406aab..e678053bb0127962cb32765b12f5c06c94723e0a 100644 (file)
--- a/doc/tipjar.mdwn
+++ b/doc/tipjar.mdwn
@@ -1,14 +1,17 @@
 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
 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>
 
 
 <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:
+Thanks to the following people for their kind contributions:

 
 * James Westby
 * Kyle S MacLea
 * Adam Shand
 
 * James Westby
 * Kyle S MacLea
 * Adam Shand

+* Martin Krafft
+* Paweł Tęcza

 
 

-(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.)