From 2e2151c8227a40c82694a2272448ad9205144be1 Mon Sep 17 00:00:00 2001
From: zoe1 <zoe@fsf.org>
Date: Wed, 7 Jul 2021 21:31:16 +0200
Subject: [PATCH] workshop updates

---
 en/workshops.html | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/en/workshops.html b/en/workshops.html
index 0448ac6..bfb0563 100644
--- a/en/workshops.html
+++ b/en/workshops.html
@@ -115,11 +115,9 @@ receive encrypted email, you're a perfect candidate for leading a workshop!</p>
 
 <!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
 <div class="section-intro">
-
 <p style="margin-top: 0px;" class="image"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/workshop-section1.png"
+src="//static.fsf.org/nosvn/enc-dev1/img/en/screenshots/workshop-section1-update.png"
 alt="A small workshop among friends" /></p>
-
 <h2><em>#1</em> Get your friends or community interested </h2>
 
 <p>If you hear friends grumbling about their lack of privacy, ask them if
@@ -209,12 +207,12 @@ margin-bottom: 0px;">
 <p>Once you've got at least one interested friend, pick a date and start
 planning out the workshop. Tell participants to bring their computer and
 ID (for signing each other's keys). If you'd like to make it easy for the
-participants to use Diceware for choosing passwords, get a pack of dice
+participants to use <a href="https://theintercept.com/2015/03/26/passphrases-can-memorize-attackers-cant-guess/">Diceware</a> for choosing passwords, get a pack of dice
 beforehand. Make sure the location you select has an easily accessible
 Internet connection, and make backup plans in case the connection stops
 working on the day of the workshop. Libraries, coffee shops, and community
 centers make great locations. Try to get all the participants to set up
-an Enigmail-compatible email client before the event. Direct them to their
+an email client based on Thunderbird before the event. Direct them to their
 email provider's IT department or help page if they run into errors.</p>
 
 <p>Estimate that the workshop will take at least forty minutes plus ten minutes
@@ -296,9 +294,8 @@ margin-bottom: 0px;">
 <p>GnuPG's advanced options are far too complex to teach in a single
 workshop. If participants want to know more, point out the advanced subsections
 in the guide and consider organizing another workshop. You can also share
-<a href="https://www.gnupg.org/documentation/index.html">GnuPG's</a> and
-<a href="https://www.enigmail.net/index.php/documentation">Enigmail's</a>
-official documentation and mailing lists. Many GNU/Linux distribution's Web
+<a href="https://www.gnupg.org/documentation/index.html">GnuPG's</a> 
+official documentation and mailing lists, and the <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">Email Self-Defense feedback</a> page. Many GNU/Linux distribution's Web
 sites also contain a page explaining some of GnuPG's advanced features.</p>
 
 </div><!-- End .section-intro -->
@@ -332,7 +329,7 @@ let us know at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a>.</p>
 alt="Free Software Foundation"
 src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png" /></a></h4>
 
-<p>Copyright &copy; 2014-2016 <a
+<p>Copyright &copy; 2014-2021 <a
 href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a
 href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. Please
 support our work by <a href="https://u.fsf.org/yr">joining us as an associate
-- 
2.25.1