From 99078190bdadae5cc27022dbef28bdd870be8629 Mon Sep 17 00:00:00 2001 From: "Bradley M. Kuhn" Date: Sat, 5 Nov 2016 20:53:25 -0700 Subject: [PATCH] s/enforcement/compliance/ Karen asked for this change. --- .../static/supporter/2015-supporter-appeal.html | 12 ++++++------ www/conservancy/templates/base_conservancy.html | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/www/conservancy/static/supporter/2015-supporter-appeal.html b/www/conservancy/static/supporter/2015-supporter-appeal.html index 06d401b6..25ef71fb 100644 --- a/www/conservancy/static/supporter/2015-supporter-appeal.html +++ b/www/conservancy/static/supporter/2015-supporter-appeal.html @@ -381,7 +381,7 @@ forced to radically restructure.

we cannot afford even one staff member and basic overhead with the revenue we take in from our projects. With 750 supporters, we can now sustain the basic work and we will survive. But to thrive, and handle the really complex tasks like -copyright and licensing advice, and license enforcement, we need even more +copyright and licensing advice, and license compliance, we need even more resources. That's why our final target is 2,500 Supporters. If you use or care about our member projects, which include some of the most widely used free software, you can help them all @@ -403,7 +403,7 @@ success of software freedom and copyleft not to mention in the long term interest of the industry as a whole, it makes fundraising from companies very difficult. Some companies have withdrawn from funding us and some have even successfully pressured -conferences to cancel or prevent talks on our enforcement work. We do +conferences to cancel or prevent talks on our compliance work. We do this work because we think that it is good for everyone in the long run, because we know it is the right thing to do, and because we know that we are in the best position to do it. But that's not enough — you have to think it's @@ -415,7 +415,7 @@ becoming a Supporter now.

It's up to you

We have raised enough money to continue the VMware case, but our overall -enforcement work needs additional support to be able to continue. As we +compliance work needs additional support to be able to continue. As we state in the Principles of Community-Oriented GPL Enforcement, we cannot prioritize profit in @@ -423,14 +423,14 @@ these actions without compromising on the end goals of that work which is to help companies become free and open source software users and contributors.

Moreover, we have lost committed general funding from companies explicitly -because of our enforcement work. Continuing this work without individual +because of our compliance work. Continuing this work without individual support is no longer possible.

As a result, we need 2,500 Supporters in order to maintain the staff and -resources in the organization to properly undertake enforcement. We hope you +resources in the organization to properly undertake compliance efforts. We hope you will to help us achieve this. If we don't reach our goal, we will have no choice -but to hibernate enforcement until we have the resources to pick it up +but to hibernate compliance until we have the resources to pick it up properly at some point in the future.

If you care about the diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html index c42f7116..fb8ff261 100644 --- a/www/conservancy/templates/base_conservancy.html +++ b/www/conservancy/templates/base_conservancy.html @@ -47,12 +47,12 @@ Conservancy needs {{ sitefundgoal.fundraiser_donation_count|intcomma }} Supporters to continue its basic community services & {{ sitefundgoal.fundraiser_goal_amount|intcomma }} to - avoid hibernating its enforcement efforts in 2017. + avoid hibernating its compliance efforts in 2017. {% else %} Conservancy will continue our basic community services, thanks to our first {{ sitefundgoal.fundraiser_donation_count|intcomma }} Supporters! We still need {{ sitefundgoal.fundraiser_goal_amount|subtract:sitefundgoal.fundraiser_donation_count_disclose_threshold|subtract:sitefundgoal.fundraiser_so_far_amount|intcomma }} more Supporters to avoid reducing licensing work & hibernating our - enforcement efforts in 2017. + compliance efforts in 2017. {% endif %} {% if sitefundgoal.fundraiser_donation_count_disclose_threshold < 632 %} The next {{ 632|subtract:sitefundgoal.fundraiser_donation_count_disclose_threshold }} supporters