Merge branch 'doc/15815-duplicated-time-requirements'

wiki/src/blueprint/personas.mdwn

@@ -491,6 +491,14 @@ developed by SecondMuse:
 
 ### References
 
+- [The Citizen Lab: Reckless Exploit Mexican Journalists, Lawyers, and a Child Targeted with NSO Spyware](https://citizenlab.ca/2017/06/reckless-exploit-mexico-nso/)
+
+- [Wikipedia: List of journalists and media workers killed in Mexico](https://en.wikipedia.org/wiki/List_of_journalists_and_media_workers_killed_in_Mexico)
+
+- Interviews
+  - [[Claudia & Felix|interviews#Claudia]]
+  - [[Joana & Orlando|interviews#Joana]]
+
 - [Digital Rights Foundation: Digital (In)security of Journalists in Pakistan](https://digitalrightsfoundation.pk/wp-content/uploads/2018/01/Report-Digi-Insecurity-of-Journos.pdf)
 
 - [Javier Garza Ramos, Journalist Security in the Digital World](http://www.cima.ned.org/wp-content/uploads/2016/03/CIMA-Journalist-Digital-Tools-03-01-15.pdf)

wiki/src/install/inc/overview.html

@@ -8,8 +8,8 @@
         <div class="caption">
           <h4>
 
-            <span class="windows linux mac-usb mac-dvd upgrade-tails">2 hours in total</span>
-            <span class="debian expert">1½ hour in total</span>
+            <span class="windows linux mac-usb mac-dvd">2 hours in total</span>
+            <span class="debian expert upgrade-tails">1½ hour in total</span>
             <span class="install-clone">½ hour</span>
             <span class="upgrade-clone">¼ hour</span>
             <br />
@@ -101,29 +101,6 @@
         </div>
       </div>
     </div>
-    <div class="col-xs-12 col-sm-3">
-      <div class="thumbnail">
-        [[!img install/inc/icons/clock.png link="no" alt=""]]
-        <div class="caption">
-          <h4>
-
-            <span class="windows linux mac-usb mac-dvd">2 hours in total</span>
-            <span class="debian expert">1½ hour in total</span>
-            <span class="install-clone">½ hour</span>
-            <span class="upgrade-clone">¼ hour</span>
-            <br />
-
-            <span class="windows linux mac-usb mac-dvd debian expert upgrade-tails">
-              <small>[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]] to download</small><br />
-            </span>
-
-            <span class="windows linux mac-usb mac-dvd"><small>1 hour to install</small></span>
-            <span class="debian expert"><small>½ hour to install</small></span>
-            <span class="upgrade-tails"><small>¼ hour to upgrade</small></span>
-          </h4>
-        </div>
-      </div>
-    </div>
     <div class="col-xs-12 col-sm-3">
       <div class="thumbnail">
         [[!img install/inc/icons/screens.png link="no" alt=""]]