diff --git a/www/conservancy/static/about/eval-committee/index.html b/www/conservancy/static/about/eval-committee/index.html index e8159aea6ae2b2ce2dbeb40874fdb048d11c63f1..c65769f02df360bac57e34440065477ddae0e061 100644 --- a/www/conservancy/static/about/eval-committee/index.html +++ b/www/conservancy/static/about/eval-committee/index.html @@ -113,13 +113,14 @@ platform.

Martin Michlmayr has been involved in various free and open source software projects for well over 15 years. He acted as the leader of the -Debian project for two years and currently serves on the board of the Open -Source Initiative (OSI). Martin works for HP as an Open Source Community -Expert. In this role, he facilitates open source activities both +Debian project for two years, served on the board of the Open Source +Initiative (OSI) for six years and currently serves on the board of +Software Freedom Conservancy. Martin works for HP as an Open Source +Community Expert. In this role, he facilitates open source activities both internally within HP as well as externally within the broader open source -community. Martin holds Master degrees in Philosophy, Psychology and -Software Engineering, and earned a PhD from the University of -Cambridge.

+community. Martin earned a PhD from the University of Cambridge and he +received an O'Reilly Open Source Award in 2013 for his contributions to the +open source community.

Evan Prodromou

diff --git a/www/conservancy/templates/frontpage.html b/www/conservancy/templates/frontpage.html index 051e7597ae95d06f1a9856c584fde0a2aa553c75..a500653d3fb02e66eac84ef188912bfbeb9446d0 100644 --- a/www/conservancy/templates/frontpage.html +++ b/www/conservancy/templates/frontpage.html @@ -87,26 +87,19 @@ {% endif %}

Conservancy News Archive…

{% if blog.0.is_recent %} -

[RSS] Conservancy Blog

+

[RSS] Conservancy Blog

{{ blog.0.headline|safe }}

-

Posted by {{ blog.0.author.formal_name }} -on {{ blog.0.pub_date|date:"F j, Y" }}

+

Posted by {{ blog.0.author.formal_name }} on {{ blog.0.pub_date|date:"F j, Y" }}

{{ blog.0.summary|safe }} -

Read More - from {{ blog.0.author.casual_name }} on this…

-
-{% endif %} - +

Read More from {{ blog.0.author.casual_name }} on this…

{% if blog.1.is_recent %} -

{{ blog.1.headline|safe }}

-

Posted by {{ blog.1.author.formal_name }} -on {{ blog.1.pub_date|date:"F j, Y" }}

+

Posted by {{ blog.1.author.formal_name }} on {{ blog.1.pub_date|date:"F j, Y" }}

{{ blog.1.summary|safe }} -

Read More - from {{ blog.1.author.casual_name }} on this…

+

Read More from {{ blog.1.author.casual_name }} on this…

+{% endif %}
{% endif %}

Conservancy Blog Archive…