diff --git a/www/conservancy/feeds.py b/www/conservancy/feeds.py index 77f626f1..7c0ce520 100644 --- a/www/conservancy/feeds.py +++ b/www/conservancy/feeds.py @@ -71,14 +71,14 @@ class OmnibusFeed(ConservancyFeedBase): title_template = "feeds/omnibus_title.html" description_template = "feeds/omnibus_description.html" author_email = "info@sfconservancy.org" - author_link = "http://sfconservancy.org/" + author_link = "https://sfconservancy.org/" author_name = "Software Freedom Conservancy" def item_enclosure_mime_type(self): return "audio/mpeg" def item_enclosure_url(self, item): if hasattr(item, 'mp3_path'): - return "http://sfconservancy.org" + item.mp3_path + return "https://sfconservancy.org" + item.mp3_path def item_enclosure_length(self, item): if hasattr(item, 'mp3_path'): return item.mp3_length @@ -93,7 +93,7 @@ class OmnibusFeed(ConservancyFeedBase): return "Software Freedom Conservancy" def item_author_link(self, obj): - return "http://sfconservancy.org" + return "https://sfconservancy.org" def item_author_email(self, item): if item.omnibus_type == "news": diff --git a/www/conservancy/static/about/eval-committee/index.html b/www/conservancy/static/about/eval-committee/index.html index a423af6f..69e63b42 100644 --- a/www/conservancy/static/about/eval-committee/index.html +++ b/www/conservancy/static/about/eval-committee/index.html @@ -7,10 +7,10 @@

The Evaluation Committee evaluates projects that have applied to become members of Conservancy. - Conservancy's Board of - Directors formally - charters and authorizes this Committee to offer membership to - projects that apply + Conservancy's Board of + Directors formally + charters and authorizes this Committee to offer membership to + projects that apply for membership in Conservancy.

Jeremy Allison

diff --git a/www/conservancy/static/about/license/index.html b/www/conservancy/static/about/license/index.html index 572c55be..d7afcd22 100644 --- a/www/conservancy/static/about/license/index.html +++ b/www/conservancy/static/about/license/index.html @@ -14,13 +14,13 @@ gitorious.

The documents on this website are - licensed as CC-By-SA-3.0 + licensed as CC-By-SA-3.0 Unported. In some cases, the documents are dual-licensed (AGPLv3-or-later|CC-By-SA-3.0-Unported-or-later), to make it more convenient to intermix the document with code.

Conservancy's Logo is also licensed - under CC-By-SA-3.0 + under CC-By-SA-3.0 USA. A Conservancy logo package in ZIP format is available, which includes high quality SVG, PNG and other formats.

diff --git a/www/conservancy/static/donate/index.html b/www/conservancy/static/donate/index.html index 20a03963..4bb847b9 100644 --- a/www/conservancy/static/donate/index.html +++ b/www/conservancy/static/donate/index.html @@ -50,11 +50,11 @@ function validateAmount(amount){

Donate via Flattr

-Flattr is a social micro-payment system that allows users to make donations via the web. Like Google Checkout, Flattr does not charge any processing fees on donations to Conservancy. If you are a Flattr user and you would like to "flattr" Conservancy with a donation, click on the button below: +Flattr is a social micro-payment system that allows users to make donations via the web. Like Google Checkout, Flattr does not charge any processing fees on donations to Conservancy. If you are a Flattr user and you would like to "flattr" Conservancy with a donation, click on the button below:

- -Flattr us! + +Flattr us! diff --git a/www/conservancy/static/members/apply/index.html b/www/conservancy/static/members/apply/index.html index 129582b2..8f744704 100644 --- a/www/conservancy/static/members/apply/index.html +++ b/www/conservancy/static/members/apply/index.html @@ -31,12 +31,12 @@

I sent in my inquiry letter and/or application a long time ago. Why haven't you replied?

Conservancy receives an overwhelming level of interest and we have very few - staff positions to + staff positions to meet the interest and demand - for Conservancy's + for Conservancy's services to its member projects. Meanwhile, Conservancy always prioritizes needs of - its existing member + its existing member projects over new inquiries and applications. Therefore, it sometimes can take quite a while to finish the application process and be offered membership, but please note that such delays mean that should @@ -70,10 +70,10 @@ Source license by the Open Source Initiative. All software documentation for the project should be licensed under a license on the preceding lists, or under Creative - Commons' CC-By-SA - or CC-By + Commons' CC-By-SA + or CC-By or - CC-0. + CC-0.

  • The project should have an existing, vibrant, diverse community that develops and documents the software. For example, projects @@ -224,7 +224,7 @@ form their own independent tax-exempt non-profit.

    Conservancy processes to Conservancy's general fund, which primarily is used to pay staff. (Details on how Conservancy spends its funds, including salaries of key employees, can be found - in Conservancy's + in Conservancy's annual filings.)

    Historically, Conservancy allowed projects to give less or nothing at diff --git a/www/conservancy/static/members/services/index.html b/www/conservancy/static/members/services/index.html index e5077297..f82dd94e 100644 --- a/www/conservancy/static/members/services/index.html +++ b/www/conservancy/static/members/services/index.html @@ -137,7 +137,7 @@ burden on behalf of its projects.

    Those familiar with non-profit terminology will recognize most of these services - as fiscal + as fiscal sponsorship services. This term is not particularly well known in the FLOSS community, and many are confused by that term. However, if you are familiar with what a fiscal sponsor typically does diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html index 739f1cf5..61d28ef6 100644 --- a/www/conservancy/templates/base_conservancy.html +++ b/www/conservancy/templates/base_conservancy.html @@ -34,14 +34,14 @@

    Main Page | Contact | Sponsors | Privacy Policy | RSS Feed

    Follow Conservancy - on identi.ca - and twitter. - - Flattr us!

    + on identi.ca + and twitter. + + Flattr us!

    - Creative Commons License + Creative Commons License
    This page is licensed under a - Creative + Creative Commons Attribution-ShareAlike 3.0 USA License.

    diff --git a/www/conservancy/templates/feeds/omnibus_description.html b/www/conservancy/templates/feeds/omnibus_description.html index f86d7e10..d612f7fe 100644 --- a/www/conservancy/templates/feeds/omnibus_description.html +++ b/www/conservancy/templates/feeds/omnibus_description.html @@ -1,10 +1,10 @@ {% ifequal obj.omnibus_type "news" %} -

    A news item from Software Freedom Conservancy.

    +

    A news item from Software Freedom Conservancy.

    {% endifequal %} {% ifequal obj.omnibus_type "event" %} -

    An upcoming event related to the Software Freedom Conservancy.

    +

    An upcoming event related to the Software Freedom Conservancy.

    {% endifequal %} {% ifequal obj.omnibus_type "blog" %} -

    A blog post from Software Freedom Conservancy.

    +

    A blog post from Software Freedom Conservancy.

    {% endifequal %} {% include obj.omnibus_feed_description_template %} diff --git a/www/conservancy/templates/frontpage.html b/www/conservancy/templates/frontpage.html index 91ecb13b..01820639 100644 --- a/www/conservancy/templates/frontpage.html +++ b/www/conservancy/templates/frontpage.html @@ -38,12 +38,12 @@ blog posts.

    You can also follow Conservancy - on identi.ca - and twitter.

    + on identi.ca + and twitter.

    -

    + You can also subscribe to Conservancy's low-traffic email announce list