diff --git a/www/conservancy/static/about/contact/index.html b/www/conservancy/static/about/contact/index.html index 9f1497bb..2dd42c26 100644 --- a/www/conservancy/static/about/contact/index.html +++ b/www/conservancy/static/about/contact/index.html @@ -18,6 +18,7 @@ If you don't hear from us within a week, please try again.

Software Freedom Conservancy, Inc.
137 MONTAGUE ST STE 380
Brooklyn, NY 11201-3548 +

Internet Relay Chat

diff --git a/www/conservancy/static/about/filings/index.html b/www/conservancy/static/about/filings/index.html index 08247d32..ead0ce2f 100644 --- a/www/conservancy/static/about/filings/index.html +++ b/www/conservancy/static/about/filings/index.html @@ -10,7 +10,6 @@ as a non-profit in the State of New York, files an annual CHAR-500 with New York State. Below, Conservancy makes available these filings for public inspection, in reverse chronological order:

-

-

+ {% endblock %} diff --git a/www/conservancy/static/about/outside/index.html b/www/conservancy/static/about/outside/index.html index 56b9a504..44c4e2d0 100644 --- a/www/conservancy/static/about/outside/index.html +++ b/www/conservancy/static/about/outside/index.html @@ -27,7 +27,7 @@ is also a masters instructor at the University of Paris I La Sorbonne and a

Daniel B. Ravicher - Litigation Counsel

-Daniel B. Ravicher is a Lecturer in Law at Benjamin N. Cardozo School of +

Daniel B. Ravicher is a Lecturer in Law at Benjamin N. Cardozo School of Law. He has published numerous legal articles and given dozens of presentations regarding Free and Open Source Software legal issues and served as lead counsel for free and open source software developers in the @@ -60,7 +60,7 @@ of the Public Patent Foundation. legal work with Conservancy, SFLC, and Question Copyright and serves as an officer of both the Conservancy and SFLC. Before joining SFLC, Karen worked as an associate in the - corporate departments of Gibson, Dunn & Crutcher LLP in New York and + corporate departments of Gibson, Dunn & Crutcher LLP in New York and Clifford Chance in New York and London. Karen received her law degree from Columbia Law School in 2000, where she was a James Kent Scholar and co-founder of the Columbia Science and Technology Law Review. Karen @@ -89,7 +89,7 @@ for the GNU project.

Directors Emeritus of the Software Freedom Conservancy are former members of Conservancy's Board of Directors who continue to support Conservancy's mission and - occasionally advise Conservancy. + occasionally advise Conservancy.

Ian Lance Taylor - Director Emeritus

diff --git a/www/conservancy/templates/blog/entry_detail.html b/www/conservancy/templates/blog/entry_detail.html index 5b362ef6..c69acc41 100644 --- a/www/conservancy/templates/blog/entry_detail.html +++ b/www/conservancy/templates/blog/entry_detail.html @@ -7,7 +7,7 @@

{{ object.pub_date|date:"F j, Y" }} by {{ object.author.formal_name }}

{{ object.headline|safe }}

{{ object.body|safe }} -

Posted by {{ object.author.formal_name }} on {{ object.pub_date|date:"F j, Y" }}. Please email any comments on this entry to info@sfconservancy.org.

+

Posted by {{ object.author.formal_name }} on {{ object.pub_date|date:"F j, Y" }}. Please email any comments on this entry to info@sfconservancy.org.

{% if object.tags.all %}

Tags: {% for tag in object.tags.all %}{{ tag.label }}{% if not forloop.last %}, {% endif %}{% endfor %}

{% endif %} diff --git a/www/conservancy/templates/frontpage.html b/www/conservancy/templates/frontpage.html index fa1a0155..91ecb13b 100644 --- a/www/conservancy/templates/frontpage.html +++ b/www/conservancy/templates/frontpage.html @@ -25,8 +25,8 @@
-

Learn More about Conservancy

+

An Overview of Conservancy… Conservancy's current member projects… Services that Conservancy provides to its member projects… @@ -85,8 +85,7 @@

{% endif %} {% endif %} -

Conservancy News - Archive…

+

Conservancy News Archive…

{% if blog.0.is_recent %}

[RSS] Conservancy Blog

@@ -107,7 +106,7 @@

Conservancy Blog Archive...

{% else %} -

Conservancy Blog Archive…

+

Conservancy Blog Archive…

{% endif %} diff --git a/www/conservancy/templates/news/pressrelease_list.html b/www/conservancy/templates/news/pressrelease_list.html index 5468608f..47be3d8a 100644 --- a/www/conservancy/templates/news/pressrelease_list.html +++ b/www/conservancy/templates/news/pressrelease_list.html @@ -4,7 +4,7 @@ {% block outercontent %}