diff --git a/www/conservancy/static/linux-compliance/vmware-lawsuit-faq.html b/www/conservancy/static/linux-compliance/vmware-lawsuit-faq.html index 1f394ff5ad25516ec698446812b5a57aee3a10c8..4a687562484970f407bda89f15f9ff78a5252489 100644 --- a/www/conservancy/static/linux-compliance/vmware-lawsuit-faq.html +++ b/www/conservancy/static/linux-compliance/vmware-lawsuit-faq.html @@ -5,7 +5,7 @@
Conservancy maintains this - FAQ list regarding + FAQ list regarding Christoph Hellwig's lawsuit against VMware in Germany over alleged GPL violations on Linux as a service to the Free Software community, and in particular, the copyleft community. Conservancy @@ -100,7 +100,7 @@ been unable to achieve compliance, either, through his negotiations in 2014. VMware's last offer was a proposal for a settlement agreement that VMware would only provide if Christoph signed an NDA, and Christoph chose (quite - reasonably) not to sign an NDA merely to look at settlement offer.
+ reasonably) not to sign an NDA merely to look at the settlement offer.Thus, this lawsuit comes after years of negotiations by Conservancy to achieve compliance — negotiations that ended in an outright refusal by diff --git a/www/conservancy/static/supporter/index.html b/www/conservancy/static/supporter/index.html index 0245e5f5be851d34a552a614ff4d7c9274da60b9..9515513c568ab99d8bd0587e96b661c2973246a6 100644 --- a/www/conservancy/static/supporter/index.html +++ b/www/conservancy/static/supporter/index.html @@ -58,14 +58,6 @@ Other annual supporters methods:
News Update: We met our - match goal of $2 of every $1 in supporter donations ($5k - total)! We're looking for donors to pledge a new match; contact us - if you're interested! -
-Software Freedom Conservancy is an essential organization to free and open source software. We are the home of over 30 projects like @@ -88,7 +80,7 @@ contribute to the cause.
For the first time, we're launching a Supporter program. For an annual donation of $120, you can -download an official Supporter card and receive a Conservancy t-shirt1. If +download an official Supporter card and receive a Conservancy t-shirt. If this is out of reach, please donate at whatever level you can - it makes a big difference to us to know that you support us, and a little goes a long way.
@@ -133,9 +125,6 @@ internal policies are published and available for scrutiny.Please join our Supporter program and spread software freedom!
-1The - shirts will ship during Q1 2015.
- diff --git a/www/conservancy/templates/base_compliance.html b/www/conservancy/templates/base_compliance.html index c0d4f0934822301565b7f77a667c0c71f8e5c2e5..dbe970468d388c43a828e520be41d86f016c5af5 100644 --- a/www/conservancy/templates/base_compliance.html +++ b/www/conservancy/templates/base_compliance.html @@ -24,6 +24,7 @@ of $50,000 match met.Donate now via PayPal: +
-Or, become a Conservancy Supporter.
@@ -46,7 +46,7 @@ of $50,000 match met.