[git] gnupg-doc - branch, master, updated. cfd38b44f761922cfacdeabca994f692c52a9f5b

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GnuPG website and other docs".

The branch, master has been updated
       via  cfd38b44f761922cfacdeabca994f692c52a9f5b (commit)
      from  7fd7f497302b09fa2cd9712a4ef37fa31804a9b9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cfd38b44f761922cfacdeabca994f692c52a9f5b
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 2 15:21:19 2017 +0200

    web: Use prose instead of tables to explain the donations.

diff --git a/web/donate/kudos.org b/web/donate/kudos.org
index bc16540..e776ed0 100644
--- a/web/donate/kudos.org
+++ b/web/donate/kudos.org
@@ -29,41 +29,47 @@
 |      |      | 351305 | 351305 |     323415 |
 #+TBLFM: $LR3=vsum(@I.. at II)::$LR4=vsum(@I.. at II)::$LR5=vsum(@I.. at II)
 #+HTML: <div id="smallnote">
-/Indi./ lists individual donations, /Corp./ lists large corporate
-donations and grants, and /Total/ gives the net value without taxes
-and banking fees.  Note that this list has been updated on 2017-05-02
-to include the Linux Foundation grant.  The /Total/ for 2016 is
-preliminary.
-
-About 2016:\\
-| Individual Donations | 268 |   9615 |        |
-| Facebook             |   1 |  44715 |  44715 |
-| Stripe               |   1 |  47824 |  47824 |
-| Linux Foundation     |   1 |  54220 |  54220 |
-|----------------------+-----+--------+--------|
-|                      | 271 | 156374 | 146759 |
-
-About 2015:\\
-| Individual Donations | 5844 | 205560 | 193692 |
-| Facebook             |    1 |  44213 |  44213 |
-| Stripe               |    1 |  45633 |  45633 |
-| Linux Foundation     |    1 |  54416 |  54416 |
-|----------------------+------+--------+--------|
-|                      | 5847 | 349822 | 337954 |
-
-About 2014:\\
-Some of the 801 donations from 2014 have been hold back by Stripe
-over the end of the year and thus VAT was only payable in 2015.
-That VAT is not included in the net amount for 2014.  The net amount
-received from individual donations in 2014 have been 2525, 919, 541,
-26320 Euro per quarter.
-
-About 2013:\\
-The [[https://gnupg.org/blog/20140512-rewards-sent.html][Goteo crowdfunding]] campaign raised 32641 Euro (27429 net) in
-December 2013.  Goteo transferred that money in March 2014 in 6
-chunks: 11423, 6000, 5000, 5000, 5218.  The total amount is
-however listed for 2013 along with 148 individual donations of 5041
-Euro (4041 net) received before the start of the Goteo Campaign.
+Legend: “Indi.” indicates individual donations, “Corp.” lists large
+corporate donations and grants, and “Total” gives the net value
+without taxes and banking fees.  Note that this list has been updated
+on 2017-05-02 to include the Linux Foundation grant.  Note further
+that the “Total” for 2016 is preliminary.
+
+# About 2016:\\
+# | Individual Donations | 268 |   9615 |        |
+# | Facebook             |   1 |  44715 |  44715 |
+# | Stripe               |   1 |  47824 |  47824 |
+# | Linux Foundation     |   1 |  54220 |  54220 |
+# |----------------------+-----+--------+--------|
+# |                      | 271 | 156374 | 146759 |
+In 2016 we had 268 individual donations summing up to 9615 Euro, we
+received 50000 USD each from Facebook and Stripe resulting in 92539
+Euro, and 60000 USD (54220 Euro) from the Linux Foundation.
+
+# About 2015:\\
+# | Individual Donations | 5844 | 205560 | 193692 |
+# | Facebook             |    1 |  44213 |  44213 |
+# | Stripe               |    1 |  45633 |  45633 |
+# | Linux Foundation     |    1 |  54416 |  54416 |
+# |----------------------+------+--------+--------|
+# |                      | 5847 | 349822 | 337954 |
+In 2015 we had 5844 individual donations summing up to 205560 Euro
+(193692 net), we received 50000 USD each from Facebook and Stripe
+resulting in 89846 Euro, and 60000 USD (54416 Euro) from the Linux
+Foundation.
+
+In 2014 we had 901 individual donations dumming up to 34700 Euro
+(30305 net).  Some of the donations have been hold back by Stripe over
+the end of the year and thus VAT was only payable in 2015.  That VAT
+is not included in the net amount for 2014.  The net amount received
+from individual donations in 2014 have been 2525, 919, 541, 26320 Euro
+per quarter.
+
+In 2013 the [[https://gnupg.org/blog/20140512-rewards-sent.html][Goteo]] campaign raised 32641 Euro (27429 net) in December.
+Goteo transferred that money in March 2014 in 6 chunks: 11423, 6000,
+5000, 5000, 5218.  The total amount is however listed for 2013 along
+with 148 individual donations of 5041 Euro (4041 net) received before
+the start of the Goteo campaign.
 
 #+HTML: </div>
 

-----------------------------------------------------------------------

Summary of changes:
 web/donate/kudos.org | 76 ++++++++++++++++++++++++++++------------------------
 1 file changed, 41 insertions(+), 35 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org