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 %}

Conservancy's Copyleft Compliance Projects

-

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

{% endblock %} diff --git a/www/conservancy/static/copyleft-compliance/enforcement-strategy.html b/www/conservancy/static/copyleft-compliance/enforcement-strategy.html index 396182f0fee1173f0d0b33950548586597ff371c..b461a48b14779bd04048ee8a32485ed66f25ebe9 100644 --- a/www/conservancy/static/copyleft-compliance/enforcement-strategy.html +++ b/www/conservancy/static/copyleft-compliance/enforcement-strategy.html @@ -5,7 +5,7 @@

The Strategic GPL Enforcement Initiative

-

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.

Support Conservancy's and Christoph's efforts in this area - by becoming a Conservancy - supporter or becoming a Conservancy + sustainer or .

@@ -85,7 +85,7 @@ software communities alike.

Please to our campaign to enforce the GPL. Help Conservancy increase its number of individual donors, so we have clear evidence to show bad actors that the GPL matters to the individuals in our community. - After you , go and tell the world: “Play by the rules, @VMware. I defend the #GPL with Christoph & @Conservancy. #DTRTvmware Help at https://sfconservancy.org/supporter/ ” on your blog or microblog. + After you , go and tell the world: “Play by the rules, @VMware. I defend the #GPL with Christoph & @Conservancy. #DTRTvmware Help at https://sfconservancy.org/sustainer/ ” on your blog or microblog.

@@ -101,7 +101,7 @@ information.)

to announce that we already reached an anonymous match for this campaign, where every dollar donated was matched up to $50,000. However, that $100,000 is just an initial step and there is so much GPL enforcement work to do. So, please - donate now: by becoming a Conservancy Supporter or + donate now: by becoming a Conservancy Sustainer or via .

Want To Know More?

diff --git a/www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html b/www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html index 8361e1683d79e15fad83f0199927cc5c3b4466e5..bba15c7b583340752ca5dc971432fe29c4dece56 100644 --- a/www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html +++ b/www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html @@ -656,7 +656,7 @@ enforce the GPL regarding the primary issue in this case. support to proceed with this litigation. Litigation costs are unpredictable, and this lawsuit may take years to resolve. Conservancy is prepared to fund this case through its conclusion, but we can only do so - with your support. If you are an + with your support. If you are an individual who supports copyleft and wants to see it defended, please donate now. And, if you make a public statement of support, please email the URL diff --git a/www/conservancy/static/donate/index.html b/www/conservancy/static/donate/index.html index 05c0393b53b0f1b5277f61d053055ffaf12d96b5..feb9ad0c5c40e35620c3b1a8c5efcac1a765eef8 100644 --- a/www/conservancy/static/donate/index.html +++ b/www/conservancy/static/donate/index.html @@ -9,11 +9,11 @@ public to continue its work. Please give generously to support Conservancy’s work.

-

Become a Supporter Now!

+

Become a Sustainer Now!

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, (— a better option if you're donating more +

Or, (— 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 @@

Donations

-

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.

Receiving E-Mail

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.

Cookies and Other Browser Information

diff --git a/www/conservancy/static/projects/apply/index.html b/www/conservancy/static/projects/apply/index.html index eea906c7116c5fc79c39c308d8dcec9aff4c8a4e..97ea4a5e80459c851b3991e02b64abfec15f5791 100644 --- a/www/conservancy/static/projects/apply/index.html +++ b/www/conservancy/static/projects/apply/index.html @@ -268,7 +268,7 @@ form their own independent tax-exempt 501(c)(3) non-profit.

have more income and therefore need more attention from staff. Even now, the 10% we receive from our project does not fully fund our fiscal sponsorship activities; we raise additional funds - through support program to subsidize our fiscal + through support program to subsidize our fiscal sponsorship work.

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.

- + @@ -190,7 +190,7 @@ internal policies are published and available for scrutiny.

- + diff --git a/www/conservancy/static/supporter/thank-you-event.html b/www/conservancy/static/sustainer/thank-you-event.html similarity index 100% rename from www/conservancy/static/supporter/thank-you-event.html rename to www/conservancy/static/sustainer/thank-you-event.html diff --git a/www/conservancy/static/supporter/thank-you.html b/www/conservancy/static/sustainer/thank-you.html similarity index 66% rename from www/conservancy/static/supporter/thank-you.html rename to www/conservancy/static/sustainer/thank-you.html index 2b23fc2068c083d0b4068d2a6e9292526e130b1c..dfaa67ba9517b9504a51c1585fe760a5a3ed31d9 100644 --- a/www/conservancy/static/supporter/thank-you.html +++ b/www/conservancy/static/sustainer/thank-you.html @@ -1,6 +1,6 @@ {% extends "base_conservancy.html" %} {% block subtitle %}Thanks for Your Support - {% endblock %} -{% block category %}supporter{% endblock %} +{% block category %}sustainer{% endblock %} {% block head %} @@ -8,10 +8,10 @@ {% block content %}

Thanks!

-

Thank you for being a Supporter of Software Freedom Conservancy!

+

Thank you for being a Sustainer of Software Freedom Conservancy!

-

As a Conservancy Supporter, you'll also be eligible for future special +

As a Conservancy Sustainer, you'll also be eligible for future special benefits. We may contact you directly by email later to tell you about -special Supporter-only benefits in the coming year.

+special Sustainer-only benefits in the coming year.

Meanwhile, please spread the word about supporting Conservancy with - a “Supporter Badge” on your website, Twitter account, or + a “Sustainer Badge” on your website, Twitter account, or other locations where people view information about you:

-

Become a Conservancy Supporter!

+

Become a Conservancy Sustainer!

Copy and paste this HTML for the image above:

-

Also, please enjoy these “Supporter Cards”, which you print out and +

Also, please enjoy these “Sustainer Cards”, which you print out and carry with you. You've earned it! The cards are available in two different styles: Style 1 (SVG), Style 2 diff --git a/www/conservancy/templates/base_compliance.html b/www/conservancy/templates/base_compliance.html index 26a04c69ff7b1e5e64480b5d8a5a4ed24e230c52..ec130fbf431c8ef748784f0dadb803ba04ee0da9 100644 --- a/www/conservancy/templates/base_compliance.html +++ b/www/conservancy/templates/base_compliance.html @@ -18,8 +18,8 @@

To support our copyleft compliance & enforcement work, - please . We can't sustain + please . We can't sustain this work without ongoing support from donors like you!

diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html index 6f2d6f93ee874b0dcb34ef25c1efc5dfd2a57c81..2a460fc89c10da02924e80cfc57fd70988120d4e 100644 --- a/www/conservancy/templates/base_conservancy.html +++ b/www/conservancy/templates/base_conservancy.html @@ -27,7 +27,7 @@ {% block head %}{% endblock %} - +

@@ -47,7 +47,7 @@