Updated Corvellec bio and session description, added photo.

diff --git a/2015/program/index.html b/2015/program/index.html
index e5109ddb8153c119a4e525372012e730cfa4268c..9983197020289e189efcf07462a5c6e3f4b0a5c6 100755 (executable)
--- a/2015/program/index.html
+++ b/2015/program/index.html
@@ -230,9 +230,7 @@ Contents
                <div class="session">
                        <h4>TAFTA, CETA, TISA: traps and threats to Free Software Everywhere</h4>
                        <span class="speakers"><a href="/2015/program/speakers.html#corvellec">Marianne Corvellec</a>, <a href="/2015/program/speakers.html#le-lous">Jonathan Le Lous</a></span>
-                       <p>TAFTA, CETA, and TISA are far-reaching trade agreements which represent major threats to online freedom and create legal uncertainty for all Internet players. They set forth an ever stronger protection of copyright, patents, and trademarks. They are negotiated by unelected officials in a complete lack of transparency. They are found to "recycle" the most toxic parts of ACTA, the anti-counterfeiting trade agreement which was rejected by the European Parliament in 2012. This rejection followed the demands of European and international organizations and citizens, who campaigned and demonstrated massively against ACTA.</p>
-
-                       <p>It takes a benevolent political and legislative environment to get Free Software Everywhere. We should remain vigilant and realize the traps and threats posed by these trade agreements. Our presentation will focus on the software aspects of TAFTA, CETA, and TISA. We will call for action against these global treaty projects and offer alternative proposals which favor Free Software Everywhere.</p>
+<p>TAFTA, CETA, and TISA are far-reaching trade agreements posing major threats to online freedom and creating legal uncertainty for all Internet players. They set forth an ever stronger protection of copyright and patents. They 'recycle' the most toxic parts of ACTA, the anti-counterfeiting trade agreement which was rejected in 2012. The presentation focuses on the software aspects of TAFTA, CETA, TISA. We will call for action against these global treaty projects and offer alternative proposals, which favour Free Software Everywhere.</p>
                </div>
 
                <div class="session">

diff --git a/2015/program/speakers.html b/2015/program/speakers.html
index 0635f1c6cd8418b44341bcb8de00aeba2483a914..fc01219723d34c8bbcdfb85ac6175776571fdd5d 100755 (executable)
--- a/2015/program/speakers.html
+++ b/2015/program/speakers.html
@@ -73,11 +73,11 @@
 
 <div class="row session-speaker">
        <div class="col-md-2 col-sm-3 col-xs-4">
-
+               <img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/speakers/corvellec.jpg" alt="[ Marianne Corvellec - Photo ]"/>
        </div>
        <div class="col-md-10 col-sm-9 col-xs-8">
                <h3 id="corvellec">Marianne Corvellec, April</h3>
-               <p>Marianne Corvellec, Free Software activist at April, an association which has been promoting and defending Free Software in France and Europe since 1996.</p>
+               <p>Marianne Corvellec has been a Free Software activist with April since 2011. April is an advocacy association which has been promoting and defending Free Software in France and Europe since 1996. Marianne's focus has been on legal and institutional issues.</p>
        </div>
 </div>