From f1575ece1a6b340f552a9763c9139f26f13204c8 2013-03-01 17:03:43
From: Bradley M. Kuhn
Date: 2013-03-01 17:03:43
Subject: [PATCH] Merge in various HTML fixes from Martin Michlmayr on 2013-02-21.
This did not fast-forward merge because I'd made changes to those files since
Martin submitted his merge request. This merge brings in the changes
contributed in the following two commits from Martin:
commit 8b54927bb51833156a75354090c6ff7dd8794bc8
Author: Martin Michlmayr
Date: 2013-02-21 21:47:15 +0000
Remove stray character
commit 660c48a528baf4e09bb7cc3ccd30afd7bf46072d
Author: Martin Michlmayr
Date: 2013-02-21 21:46:40 +0000
Fix various HTML syntax errors
---
diff --git a/www/conservancy/static/about/contact/index.html b/www/conservancy/static/about/contact/index.html
index 9f1497bb0a305a9abcb570522eab492cfda756c1..2dd42c262c5f80b0e53f3388f5e3fefaf03e294c 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 2ea052b51722d6a529fd26dde1ce7c15a34ba236..998009b14acc11cbc91b7b2d5f39e042bd0bb9cb 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:
-
- Fiscal Year 2012 (from 2012-03-01 through 2013-02-28)
For FY 2012, Conservancy's due date for filing its Form 990, CHAR 500, and related paperwork is currently 2013-07-15.
@@ -60,5 +59,5 @@ public inspection, in reverse chronological order:
incorporation documents, and as approved by New York on 7 April 2006.
-
+
{% endblock %}
diff --git a/www/conservancy/static/about/outside/index.html b/www/conservancy/static/about/outside/index.html
index 3064fcbc9dd52c66b20f54a54424b0b6f363bb93..aeca578fb320a73e55cd0b57ec68e7b4a9639557 100644
--- a/www/conservancy/static/about/outside/index.html
+++ b/www/conservancy/static/about/outside/index.html
@@ -23,11 +23,11 @@ culture.
pertaining to free licenses (GNU/GPL, Creative Commons) as well at Wikimania
2008, the annual international conference of the Wikimedia Foundation. Olivier
is also a masters instructor at the University of Paris I La Sorbonne and a
-+member of the associations INTA and IAEL.
+member of the associations INTA and IAEL.
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
diff --git a/www/conservancy/templates/blog/entry_detail.html b/www/conservancy/templates/blog/entry_detail.html
index 5b362ef639e01a73e4bafc210191a2a828ed5920..c69acc4121394836cf392a198f2da398b1fdc1a8 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 fa1a01558ff0083436e5faa1a57f93c2f24788bc..91ecb13b152427e5f9c6706bab28284850892717 100644
--- a/www/conservancy/templates/frontpage.html
+++ b/www/conservancy/templates/frontpage.html
@@ -25,8 +25,8 @@
{% endif %}
diff --git a/www/conservancy/templates/news/pressrelease_list.html b/www/conservancy/templates/news/pressrelease_list.html
index 5468608ffd6645ddf65838d2d3db05801d2ae749..47be3d8a940a6357f06f19eac96bd8b42654a0db 100644
--- a/www/conservancy/templates/news/pressrelease_list.html
+++ b/www/conservancy/templates/news/pressrelease_list.html
@@ -4,7 +4,7 @@
{% block outercontent %}