ran makefile 2020-03-05

diff --git a/2020/includes/generated-bios.html b/2020/includes/generated-bios.html
index 1c3cb774572691146b88816e8740d2bf73beeb36..67b31c1f1271fb2fdabfdd3f923490f1010af853 100644 (file)
--- a/2020/includes/generated-bios.html
+++ b/2020/includes/generated-bios.html
@@ -33,7 +33,7 @@ Will we allow ourselves to reinvent our concept of libraries and archives to exp
   <div class="views-field views-field-nothing-2">        <span class="field-content"><hr id="3288">
 
 <div class="talkblock" style="clear:both">
-<h2 style="clear:both">Free the Future Youth Keynote Panel</h2>
+<h2 style="clear:both">Free the Future Young Hackers Keynote Panel</h2>
 <div class="talkblockheader">
 <i class="glyphicon glyphicon-calendar"></i>: <a class="lpcalendarlink" href="/2020/program/#3288">Saturday 09:45 - 10:30 - Opening Keynote</a>
 <i class="glyphicon glyphicon-home"></i>: Back Bay Grand 
@@ -861,27 +861,7 @@ In this talk, they will introduce Creative Commons and the general concept of th
 <h2>Timid  Zehta</h2></div>
 <div class="webform-long-answer">Timid Robot brings over fifteen years of professional experience empowering others’ use of technology and digital infrastructure. They have a BA in liberal arts from Sarah Lawrence College. Timid Robot loves cats, free source software, systems, and giving back to the communities around them.</div> 
 </div></span>  </div>  </div>
-  <div class="views-row views-row-1 views-row-odd views-row-first">
-      
-  <div class="views-field views-field-nothing-2">        <span class="field-content"><hr id="2737">
-
-<div class="talkblock" style="clear:both">
-<h2 style="clear:both">MADDES Secret Lair: Matty&#039;s Advanced Deniable Disk Encryption Setup</h2>
-<div class="talkblockheader">
-<i class="glyphicon glyphicon-calendar"></i>: <a class="lpcalendarlink" href="/2020/program/#2737">Saturday 14:30 - 16:00</a>
-<i class="glyphicon glyphicon-home"></i>: Justice 
-</br>
-<i class="glyphicon glyphicon-road"></i>: <span class="lptrack lptrack7">Workshop</span>
-</div>
-<div class="abstract"><div class="webform-long-answer">This session will be a demonstration of how MADDES (Matty&#039;s Advanced Deniable Disk Encryption Setup) Secret Lair can be implemented on a GNU/Linux OS. The demonstration will be using either PureOS 9 or Ubuntu 18.04. MADDES allows for plausible deniability with full disk encryption (FDE), including &quot;/boot&quot; and auto generation support for grub-install, grub-mkconfig, and for kernel update (i.e. update-initramfs). VeraCrypt FDE for GNU/Linux has not been possible before, nor has auto generation support for detached header/random looking devices without the use of MADDES, to my knowledge.</div></div>
-</div>
-
-<div class="speakerblock">
-<div class="speakerheader"><img class="speakerpic"  src="https://static.fsf.org/nosvn/libreplanet/2020/assets/logo-lores.png">
-<h2>Matt  Lavigne</h2></div>
-<div class="webform-long-answer">Matt Lavigne is an Assembly, C, and C++ programmer. He is a strong supporter for encryption, privacy, and software freedom. He is studying mechanical engineering.</div> 
-</div></span>  </div>  </div>
-  <div class="views-row views-row-2 views-row-even views-row-last">
+  <div class="views-row views-row-1 views-row-odd views-row-first views-row-last">
       
   <div class="views-field views-field-nothing-2">        <span class="field-content"><hr id="2538">
 

diff --git a/2020/includes/generated-sessions.html b/2020/includes/generated-sessions.html
index 86ecb3972b52c7af80fcf6efd4250813e3f2f9c8..77f32252e752da2eaf53738cc498e18c8d4022cb 100644 (file)
--- a/2020/includes/generated-sessions.html
+++ b/2020/includes/generated-sessions.html
@@ -33,7 +33,7 @@
           <tr  class="row-1 row-first row-last">
                   <td  class="col-1 col-first">
               
-  <div class="views-field views-field-value">        <span class="field-content"><a href="/2020/speakers/#3288"><div id="3288">Free the Future Youth Keynote Panel</div></a></span>  </div>  
+  <div class="views-field views-field-value">        <span class="field-content"><a href="/2020/speakers/#3288"><div id="3288">Free the Future Young Hackers Keynote Panel</div></a></span>  </div>  
   <div class="views-field views-field-value-3">        <span class="field-content"><i class="glyphicon glyphicon-home"></i>: Back Bay Grand</span>  </div>  
   <div class="views-field views-field-value-7">        <span class="field-content"><i class="glyphicon glyphicon-road"></i>: <span class="lptrack lptrack12">Keynote</span></span>  </div>  
   <div class="views-field views-field-value-6">        <span class="field-content"><img class="schedulepic" style="float:left;  max-width:23px; max-height:23px; margin-right:5px; border-radius: 5px" src="https://my.fsf.org/sites/default/files/webform/panel.png">