X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=en%2Findex.html;h=fc51eb0d67f96b750917df80f67ba158903275ad;hb=97b7b36152931b77249332c6aa0f2b63ff6c6f6b;hp=0d8f59a9823fcd994c37c8a11388e68d9c7382f1;hpb=99d3c5e17171435874a01bdbc85ad0841b65e910;p=enc.git

diff --git a/en/index.html b/en/index.html
index 0d8f59a9..fc51eb0d 100644
--- a/en/index.html
+++ b/en/index.html
@@ -20,7 +20,6 @@ href="../static/img/favicon.ico" />
 
 <!-- PLACE FUNDRAISER MODAL WINDOW HERE -->
 
-
 <!-- ~~~~~~~~~ GnuPG Header and introduction text ~~~~~~~~~ -->
 <header class="row" id="header"><div>
 
@@ -148,7 +147,7 @@ href="https://u.fsf.org/ys">fsf.org</a>.</p>
 <div id="step-1a" class="step">
 <div class="sidebar">
 
-<p><img
+<p class="large"><img
 src="../static/img/en/screenshots/step1a-install-wizard.png"
 alt="Step 1.A: Install Wizard" /></p>
 
@@ -195,11 +194,11 @@ page</a>.</dd>
 <div id="step-1b" class="step">
 <div class="main">
 
-<h3><em>Step 1.b</em> Get your terminal ready and install GnuPG</h3>
+<h3><em>Step 1.b</em> Install GnuPG</h3>
 
-<p>If you are using a GNU/Linux machine, you should already have GnuPG installed, as well as a terminal, and you can skip to <a href="#section2">Section 2</a>.</p>
+<p>If you are using a GNU/Linux machine, you should already have GnuPG installed, and you can skip to <a href="#section2">Section 2</a>.</p>
 
-<p>If you are using a macOS or Windows machine, however, you need to first install the GnuPG program. Select your operating system below and follow the steps. For the rest of the steps in this guide, the steps are the same for all operating systems. </p>
+<p>If you are using a macOS or Windows machine, however, you need to first install the GnuPG program. Select your operating system below and follow the instructions. For the rest of this guide, the steps are the same for all operating systems. </p>
 
 <!-- ~~~~~~~~~ MACOS ~~~~~~~~~ -->
 <div class="troubleshooting">
@@ -208,10 +207,13 @@ page</a>.</dd>
 
 <dl>
 <dt>Use a third-party package manager to install GnuPG</dt>
-<dd>Your macOS comes with a program called "Terminal" pre-installed, which we'll use to set up your encryption with GnuPG, using the command line. However, the default macOS package manager makes it difficult to install GnuPG and other pieces of free software (like Emacs, GIMP, or Inkscape).<br/>
-To make things easier, we recommend setting up the third-party package manager "Homebrew" to install GnuPG. Copy the link on the home page of <a href="https://brew.sh/">Homebrew</a> and paste it in Terminal. Click "Enter" and wait for the installation to finalize.<br/>
-When this is done, install GnuPG by entering the following code in Terminal:<br/>
-<code>brew install gnupg gnupg2</code>&#65279;. After installation is done, you can follow the steps of the rest of this guide.</dd>
+<dd>
+<p>The default macOS package manager makes it difficult to install GnuPG and other pieces of free software (like Emacs, GIMP, or Inkscape). To make things easier, we recommend setting up the third-party package manager "Homebrew" to install GnuPG. For this, we will use a program called "Terminal," which is pre-installed on macOS.</p>
+
+<p># Copy the first command on the home page of <a href="https://brew.sh/">Homebrew</a> by clicking on the clipboard icon, and paste it in Terminal. Click "Enter" and wait for the installation to finalize.</p>
+<p># Then install GnuPG by entering the following code in Terminal:<br/>
+<code>brew install gnupg gnupg2</code></p>
+</dd>
 </dl>
 
 </div><!-- /.troubleshooting -->
@@ -224,8 +226,6 @@ When this is done, install GnuPG by entering the following code in Terminal:<br/
 <dl>
 <dt>Get GnuPG by downloading GPG4Win</dt>
 <dd><p><a href="https://www.gpg4win.org/">GPG4Win</a> is an email and file encryption software package that includes GnuPG. Download and install the latest version, choosing default options whenever asked. After it's installed, you can close any windows that it creates.</p>
-
-<p class="notes">To follow the rest of the steps in this guide, you'll use the program called "PowerShell", which you'll see elsewhere referred to as a "terminal." This allows you to operate your computer using the command line.</p>
 </dd>
 </dl>
 
@@ -256,7 +256,7 @@ is the program that implements the standard. Most email programs provide an inte
 <div class="section-intro">
 
 <h2><em>#2</em> Make your keys</h2>
-<p><img style="float:right; width:400px; margin-bottom:20px;" src="../static/img/en/screenshots/step2a-01-make-keypair.png" alt="A robot with a head shaped like a key holding a private and a public key"/></p>
+<p class="float medium"><img src="../static/img/en/screenshots/step2a-01-make-keypair.png" alt="A robot with a head shaped like a key holding a private and a public key"/></p>
 
 <p>To use the GnuPG system, you'll need a public key and a private key (known
 together as a keypair). Each is a long string of randomly generated numbers
@@ -283,11 +283,11 @@ discuss this more in the next section.</p>
 <!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
 <div id="step-2a" class="step">
 <div class="sidebar">
-<p><img
+<p class="large"><img
 src="../static/img/en/screenshots/step2a-02-make-keypair.png"
 alt="Step 2.A: Make your Keypair" /></p>
-<br />
-<p><img
+
+<p class="large"><img
 src="../static/img/en/screenshots/step2a-03-make-keypair.png"
 alt="Step 2.A: Set your passphrase" /></p>
 
@@ -302,7 +302,7 @@ alt="Step 2.A: Set your passphrase" /></p>
 GnuPG program.</p>
 
 <p class="notes">Whether on GNU/Linux, macOS or Windows, you can launch your
-terminal ("Terminal" in macOS, "Powershell" in Windows) from the Applications
+terminal ("Terminal" in macOS, "PowerShell" in Windows) from the Applications
 menu (some GNU/Linux systems respond to the <kbd>Ctrl + Alt + T</kbd>
 shortcut).</p>
 
@@ -337,7 +337,7 @@ song lyrics, quotes from books, and so on.</p>
 <dt>GnuPG is not installed</dt>
 <dd>
 You can check if this is the case with the command <code>gpg --version</code>&#65279;.
-If GnuPG is not installed, it would bring up the following result on most GNU/Linux operating systems, or something like it:
+If GnuPG is not installed, it will bring up the following result on most GNU/Linux operating systems, or something like it:
 <samp>Command 'gpg' not found, but can be installed with:
   sudo apt install gnupg</samp>. Follow that command and install the program.</dd>
 
@@ -346,7 +346,7 @@ If GnuPG is not installed, it would bring up the following result on most GNU/Li
 
 <dt>How can I see my key?</dt>
 <dd>
-Use the following command to see all keys: <code>gpg --list-keys</code>&#65279;. Yours should be listed in there, and later, so will Edward's (<a href="#section3">section 3</a>).<br />
+Use the following command to see all keys: <code>gpg --list-keys</code>&#65279;. Yours should be listed in there, and later, so will Edward's (<a href="#section3">Section 3</a>).<br />
 If you want to see only your key, you can use <code>gpg --list-key [your@email]</code>&#65279;.<br />
 You can also use <code>gpg --list-secret-key</code> to see your own private key.</dd>
 
@@ -389,7 +389,7 @@ provide good guides for setting up a secure subkey configuration.</dd>
 <!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
 <div id="step-2b" class="step">
 <div class="sidebar">
-<p><img
+<p class="large"><img
 src="../static/img/en/screenshots/step2b-04-upload-and-certificate.png"
 alt="Step 2.B: Send to server and generate a certificate" /></p>
 
@@ -415,7 +415,7 @@ $ gpg --export -a [keyID] > my_public_key.asc
 </code></p>
 
 <h4>Generate a revocation certificate</h4>
-<p>Just in case you lose your key, or it gets compromised, you want to generate a certificate  and choose to save it in a safe place on your computer for now (please refer to <a href="#step-6c"> step 6.C</a> for how to best store your revocation cerficate safely). This step is essential for your email self-defense, as you'll learn more about in <a href="#section5">Section 5</a>.</p> 
+<p>Just in case you lose your key, or it gets compromised, you want to generate a certificate  and choose to save it in a safe place on your computer for now (please refer to <a href="#step-6c">Step 6.C</a> for how to best store your revocation cerficate safely). This step is essential for your email self-defense, as you'll learn more about in <a href="#section5">Section 5</a>.</p> 
  
 <p># Copy your keyID: <code>gpg --list-key [your@email]</code> will list your public ("pub") key information, including your keyID, which is a unique list of numbers and letters. Copy this keyID, so you can use it in the following command.</p>
 <p># Generate a revocation certificate: <code>gpg --gen-revoke --output revoke.asc [keyID]</code></p>
@@ -505,16 +505,16 @@ $ gpg --edit-key [your@email]
 <div id="step-3a" class="step">
 <div class="sidebar">
 
-<p><img src="../static/img/en/screenshots/step3a-open-key-manager.png"
+<p class="large"><img src="../static/img/en/screenshots/step3a-open-key-manager.png"
 alt="Step 3.A: Email Menu" /></p>
-<br />
-<p><img src="../static/img/en/screenshots/step3a-import-from-file.png"
+
+<p class="large"><img src="../static/img/en/screenshots/step3a-import-from-file.png"
 alt="Step 3.A: Import From File" /></p>
-<br />
-<p><img src="../static/img/en/screenshots/step3a-success.png"
+
+<p class="large"><img src="../static/img/en/screenshots/step3a-success.png"
 alt="Step 3.A: Success" /></p>
-<br />
-<p><img src="../static/img/en/screenshots/step3a-troubleshoot.png"
+
+<p class="large"><img src="../static/img/en/screenshots/step3a-troubleshoot.png"
 alt="Step 3.A: Troubleshoot" /></p>
 </div><!-- /.sidebar -->
 <div class="main">
@@ -560,7 +560,7 @@ page</a>.</dd>
 <div class="section-intro">
 
 <h2><em>#4</em> Try it out!</h2>
-<p><img style="float:right; width:250px; margin-bottom:20px;" src="../static/img/en/screenshots/section3-try-it-out.png" alt="Illustration of a person in a house with a cat connected to a server"/></p>
+<p class="float small"><img src="../static/img/en/screenshots/section3-try-it-out.png" alt="Illustration of a person in a house with a cat connected to a server"/></p>
 <p>Now you'll try a test correspondence with an FSF computer program named Edward,
 who knows how to use encryption. Except where noted, these are the same
 steps you'd follow when corresponding with a real, live person.</p>
@@ -569,13 +569,15 @@ steps you'd follow when corresponding with a real, live person.</p>
 may take a long time to respond, or not respond at all. We're sorry about
 this and we're working hard to fix it. Your key will still work even without
 testing with Edward.</p> -->
+
+<div style="clear: both"></div>
 </div><!-- End .section-intro -->
 
 <!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
 <div id="step-4a" class="step">
 <div class="sidebar">
 
-<p><img
+<p class="large"><img
 src="../static/img/en/screenshots/step4a-send-key-to-Edward.png"
 alt="Step 4.A Send key to Edward." /></p>
 
@@ -611,11 +613,11 @@ before using your private key to decrypt it.</p>
 <div id="step-4b" class="step">
 <div class="sidebar">
 
-<p><img
+<p class="large"><img
 src="../static/img/en/screenshots/step4b-option1-verify-key.png"
 alt="Step 4.B Option 1. Verify key" /></p>
-<br />
-<p><img
+
+<p class="large"><img
 src="../static/img/en/screenshots/step4b-option2-import-key.png"
 alt="Step 4.B Option 2. Import key" /></p>
 </div><!-- /.sidebar -->
@@ -723,7 +725,7 @@ Text</i>.</p>
 <div id="step-4c" class="step">
 <div class="sidebar">
 
-<p><img
+<p class="large"><img
 src="../static/img/en/screenshots/step4c-Edward-response.png"
 alt="Step 4.C Edward's response" /></p>
 
@@ -809,7 +811,7 @@ then it will use your private key to decrypt it.</p>
 <div class="section-intro">
 
 <h2><em>#5</em> Learn about the Web of Trust</h2>
-<p><img style="float:right; width:250px; margin-bottom:20px;" src="../static/img/en/screenshots/section5-web-of-trust.png" alt="Illustration of keys all interconnected with a web of lines"/></p>
+<p class="float small"><img src="../static/img/en/screenshots/section5-web-of-trust.png" alt="Illustration of keys all interconnected with a web of lines"/></p>
 
 <p>Email encryption is a powerful technology, but it has a weakness:
 it requires a way to verify that a person's public key is actually
@@ -838,7 +840,7 @@ connected to each other by chains of trust expressed through signatures.</p>
 <div id="step-5a" class="step">
 <div class="sidebar">
 
-<p><img
+<p class="large"><img
 src="../static/img/en/screenshots/step5a-key-properties.png"
 alt="Section 5: trusting a key" /></p>
 
@@ -955,7 +957,7 @@ and damage the Web of Trust.</p>
 <div id="step-6a" class="step">
 <div class="sidebar">
 
-<p><img
+<p class="medium"><img
 src="../static/img/en/screenshots/section6-01-use-it-well.png"
 alt="Section 6: Use it Well (1)" /></p>
 
@@ -987,7 +989,7 @@ nice to also include a link to this guide in your standard email signature
 <div id="step-6b" class="step">
 <div class="sidebar">
 
-<p><img
+<p class="medium"><img
 src="../static/img/en/screenshots/section6-02-use-it-well.png"
 alt="Section 6: Use it Well (2)" /></p>