diff --git a/www/conservancy/static/copyleft-compliance/about.html b/www/conservancy/static/copyleft-compliance/about.html index 56c06de0747bf381fa84d76f21f457496ab3c361..0cc57351349860c4c1546e460acd61a074e643fc 100644 --- a/www/conservancy/static/copyleft-compliance/about.html +++ b/www/conservancy/static/copyleft-compliance/about.html @@ -4,7 +4,7 @@ {% block content %}
As existing donors and supporters know, the Software Freedom Conservancy +
As existing donors and sustainers know, the Software Freedom Conservancy is a 501(c)(3) non-profit charity registered in New York, and Conservancy helps people take control of their computing by growing the software freedom movement, supporting community-driven alternatives to proprietary @@ -37,7 +37,7 @@ compliance actions.
and "the scripts used to control compilation and installation of the executable". -We encourage our supporters and software freedom enthusiasts everywhere to +
We encourage our sustainers and software freedom enthusiasts everywhere to
read our detailed
strategic plan for GPL enforcement and its companion
project, our
@@ -149,7 +149,7 @@ Conservancy should contact &l
Finally, Conservancy welcomes donations in support of our GPL Compliance Projects,
- and we encourage you to become a an official
+ and we encourage you to become a an official
Supporter of Software Freedom Conservancy. As existing donors and supporters know, the Software Freedom Conservancy
+ As existing donors and sustainers know, the Software Freedom Conservancy
is a 501(c)(3) non-profit charity registered in New York, and Conservancy
helps people take control of their computing by growing the software
freedom movement, supporting community-driven alternatives to proprietary
diff --git a/www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html b/www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html
index 3b9924ec6406bf6afd1726a3373d5c4fd18640e0..c1d6e72cb3d79f560d8cb5467d80338984b1c8b3 100644
--- a/www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html
+++ b/www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html
@@ -15,8 +15,8 @@
we announced that Christoph
would appeal the lower court's ruling.The Strategic GPL Enforcement Initiative
-
The best way to donate to Conservancy is - via our official Supporter program, which - earns a t-shirt and other surprise Supporter-only perks throughout the + via our official Sustainer program, which + earns a t-shirt and other surprise Sustainer-only perks throughout the year.
But, there are many other great ways to donate to Conservancy as diff --git a/www/conservancy/static/npoacct/index.html b/www/conservancy/static/npoacct/index.html index fba99348e7c0e145853a9247f6e3801fd343f692..1942e93f503147a538943db58f88b4ca7aeb0813 100644 --- a/www/conservancy/static/npoacct/index.html +++ b/www/conservancy/static/npoacct/index.html @@ -29,8 +29,8 @@ -
Or, become a Conservancy - Supporter (— a better option if you're donating more +
Or, become a Conservancy + Sustainer (— a better option if you're donating more than $120, since you'll get a t-shirt!).
diff --git a/www/conservancy/static/privacy-policy/index.html b/www/conservancy/static/privacy-policy/index.html index 818daaf39d04204ab47668d43965efa00ba4cb83..19a397c8a78ec1b4d03d6e3e8624c701819fad45 100644 --- a/www/conservancy/static/privacy-policy/index.html +++ b/www/conservancy/static/privacy-policy/index.html @@ -11,7 +11,7 @@This Privacy Statement applies to all information collected by or submitted to Conservancy, including personal data. “Personal data” is data that can be used to identify an individual.
Conservancy collects personal data when:
Conservancy’s member projects may also collect data and have their own privacy policies which specify what they do with the data they collect. This policy applies to Conservancy’s general operations, Supporter program and websites.
+Conservancy’s member projects may also collect data and have their own privacy policies which specify what they do with the data they collect. This policy applies to Conservancy’s general operations, Sustainer program and websites.
When you visit any Conservancy web site (including the specific sites named above), we collect your IP address to maintain our servers, estimate de-identified visitor patterns, and attribute changes to public resources like wikis and Etherpad documents.
When you subscribe or post to a Mailman mailing list, Mailman will collect your email address and (optionally) name. When you post to a list, Mailman will additionally archive all the information in your email, including all headers, which typically include your IP address.
When you create an account on a Kallithea site, it collects your email address for authentication. In may also collect your name (to identify your contributions to others) and your SSH public key (optional - to authenticate you when you push changes to source repositories).
@@ -58,12 +58,12 @@We receive personal information from third party services when you donate to us via online payment mechanisms. We do not sell or distribute this information to third parties. Conservancy uses this information to acknowledge your donation and send you occasional solicitations and newsletters. Donors can opt out of all contact or specify only print or e-mail contact by emailing privacy@sfconservancy.org. Donor names are posted on our Sponsors & Supporters page as a recognition of their support. At the time of the donation, the donor can ask to be anonymous, so that their name will not be publicly recognized.
+We receive personal information from third party services when you donate to us via online payment mechanisms. We do not sell or distribute this information to third parties. Conservancy uses this information to acknowledge your donation and send you occasional solicitations and newsletters. Donors can opt out of all contact or specify only print or e-mail contact by emailing privacy@sfconservancy.org. Donor names are posted on our Sponsors & Sustainers page as a recognition of their support. At the time of the donation, the donor can ask to be anonymous, so that their name will not be publicly recognized.
Conservancy may send you e-mail to authorize accounts you create on our sites, to inform you of important upcoming Conservancy events, to send occasional solicitations in connection with our donor programs as described above or in response to your questions. For your protection, Conservancy may contact you in the event that we find an issue that requires your immediate attention. Conservancy processes your personal data in these cases to fulfill and comply with its contractual obligations to you, to provide the services you have requested, and to ensure the security of your account.
We do understand that, particularly for small projects that only receive a diff --git a/www/conservancy/static/supporter/event.html b/www/conservancy/static/sustainer/event.html similarity index 100% rename from www/conservancy/static/supporter/event.html rename to www/conservancy/static/sustainer/event.html diff --git a/www/conservancy/static/supporter/original-supporter-appeal.html b/www/conservancy/static/sustainer/original-supporter-appeal.html similarity index 99% rename from www/conservancy/static/supporter/original-supporter-appeal.html rename to www/conservancy/static/sustainer/original-supporter-appeal.html index b3607d803777baab31cb5050c679f0901b3ba24a..132a40668baf0519bac3172281b507578cb0a534 100644 --- a/www/conservancy/static/supporter/original-supporter-appeal.html +++ b/www/conservancy/static/sustainer/original-supporter-appeal.html @@ -131,7 +131,7 @@ internal policies are published and available for scrutiny.