Copying over some HTML validation fixes from Niibe by overwriting the en directory...
[enc-live.git] / en / mac.html
index b200d5777065f7c5659a72e110e63f31d077aa87..0c5a41e42341cc2727c54faf8b74e4710a811271 100644 (file)
@@ -24,7 +24,7 @@
                        <ul id="languages" class="os">
                                <li><a class="current" href="/en">english - v4.0</a></li>
                                <li><a href="/es">español - v3.0</a></li>
-                               <li><a href="/fr">français - v4.0</a></li>
+                               <li><a href="/fr">français - v3.0</a></li>
                                <li><a href="/de">deutsch - v3.0</a></li>
                                <li><a href="/it">italiano - v3.0</a></li>
                                <li><a href="/pt-br">português do Brasil - v3.0</a></li>
                                        <a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Email encryption for everyone via %40fsf">
                                                Share&nbsp;
                                                <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
-                                               class="share-logo" alt="[GNU Social]">&nbsp;
+                                               class="share-logo" alt="[GNU Social]" />&nbsp;
                                                <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-                                               class="share-logo" alt="[Pump.io]">&nbsp;
+                                               class="share-logo" alt="[Pump.io]" />&nbsp;
                                                <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
-                                               class="share-logo" alt="[Reddit]">&nbsp;
+                                               class="share-logo" alt="[Reddit]" />&nbsp;
                                                <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
-                                               class="share-logo" alt="[Hacker News]">
+                                               class="share-logo" alt="[Hacker News]" />
                                        </a>
                                </li>
                        </ul>
@@ -91,7 +91,7 @@
                        <!-- ~~~~~~~~~ Guide Introduction ~~~~~~~~~ -->
                        <div class="intro">
                                <p>
-                                       <a id="infographic" href="infographic.html"><img src="//static.fsf.org/nosvn/enc-dev0/img/en/infographic-button.png" alt="View &amp; share our infographic &rarr;" /></a>Bulk surveillance violates our fundamental rights and makes free speech risky. This guide will teach you a basic surveillance self-defense skill: email encryption. Once you've finished, you'll be able to send and receive emails that are scrambed to make sure a surveillance agent or thief intercepting your email can't read them. All you need is a computer with an Internet connection, an email account, and about forty minutes.</p>
+                                       <a id="infographic" href="infographic.html"><img src="//static.fsf.org/nosvn/enc-dev0/img/en/infographic-button.png" alt="View &amp; share our infographic &rarr;" /></a>Bulk surveillance violates our fundamental rights and makes free speech risky. This guide will teach you a basic surveillance self-defense skill: email encryption. Once you've finished, you'll be able to send and receive emails that are scrambled to make sure a surveillance agent or thief intercepting your email can't read them. All you need is a computer with an Internet connection, an email account, and about forty minutes.</p>
 
                                        <p>Even if you have nothing to hide, using encryption helps protect the privacy of people you communicate with, and makes life difficult for bulk surveillance systems. If you do have something important to hide, you're in good company; these are the same tools that whistleblowers use to protect their identities while shining light on human rights abuses, corruption and other crimes.</p>
 
                                                                <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step1a-install-wizard.png" alt="Step 1.A: Install Wizard" /></p>
                                                        </div><!-- /.sidebar -->
                                                        <div class="main">
-                                                               <h3><em>Step 1.a</em> Setup your email program with your email account</h3>
+                                                               <h3><em>Step 1.a</em> Set up your email program with your email account</h3>
                                                                <p>Open your email program and follow the wizard (step-by-step walkthrough) that sets it up with your email account.</p>
 
                                                                <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
                                                        <li>On the screen titled "Encryption," select "Encrypt all of my messages by default, because privacy is critical to me."</li>
                                                        <li>On the screen titled "Signing," select "Don't sign my messages by default."</li>
                                                        <li>On the screen titled "Key Selection," select "I want to create a new key pair for signing and encrypting my email."</li>
-                                                       <li>On the screen titled "Create Key," pick a strong password! You can do it manually, or you can use the Diceware method. Doing it manually is faster but not as secure. Using Diceware takes longer and requires dice, but creates a password that is much harder for attackers figure out. To use it, read the section "Make a secure passphrase with Diceware" in <a href="https://theintercept.com/2015/03/26/passphrases-can-memorize-attackers-cant-guess/">this article</a> by Micah Lee.</p>
-</a>
+                                                       <li><p>On the screen titled "Create Key," pick a strong password! You can do it manually, or you can use the Diceware method. Doing it manually is faster but not as secure. Using Diceware takes longer and requires dice, but creates a password that is much harder for attackers figure out. To use it, read the section "Make a secure passphrase with Diceware" in <a href="https://theintercept.com/2015/03/26/passphrases-can-memorize-attackers-cant-guess/">this article</a> by Micah Lee.</p>
+</li>
                                                        </ul>
 
                                                        <p>If you'd like to pick a password manually, come up with something you can remember which is at least twelve characters long, and includes at least one lower case and upper case letter and at least one number or punctuation symbol. Never pick a password you've used elsewhere. Don't use any recognizable patterns, such as birthdays, telephone numbers, pets' names, song lyrics, quotes from books, and so on.</p>
 </div> End #step-5d .step-->
 
 
-</div>
 </section><!-- End #section5 -->