Creating new files for mac and windows, and working on Section 1 in all three version...
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 3 Jun 2014 16:40:47 +0000 (12:40 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 3 Jun 2014 16:40:47 +0000 (12:40 -0400)
index.html

index bcb883e802a6c266a4ff063859201d6b35884e02..0297c7ac0c94f1f46bb10e8b95796d8392629316 100644 (file)
@@ -68,8 +68,8 @@
                                        </div><!-- /.sidebar -->
                                        <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
                                        <div class="main">
-                                               <p>Before starting, you'll need any one of these desktop email programs installed on your computer: <a href="http://www.fossamail.org">FossaMail</a> (for Windows), <a href="http://directory.fsf.org/wiki/Icedove">Icedove</a> (for Debian GNU/Linux), <a href="http://www.mozilla.org/en-US/thunderbird/">Thunderbird</a> (for other GNU/Linux flavors, Apple OS X), or any other program based on one of these. If you are already using one of these, you can skip to <a href="#step-1b">Step 1.b</a>.</p>
-                                               <p>An email program lets you read and write mail without using a Web browser, and provides special features that are hard to find in email systems you use in a Web browser. Using an email program doesn't mean that you have to make a new email account &mdash; most people just connect an existing email account from a Web email service (like GMail) or their workplace to their email program. You can think of it as another way to access the same email account.</p>
+                                               <p>Most GNU/Linux operating systems come with GnuPG installed on them, so you don't have to get it. Before starting though, you'll need any one of these desktop email programs installed on your computer: <a href="http://directory.fsf.org/wiki/Icedove">Icedove</a> (for Debian GNU/Linux) or Thunderbird (for other GNU/Linux flavors. Email programs are another way to access the same email accounts you can access in a browser (like GMail), but provide extra features.</p>
+                                               <p>If you are already have one of these, you can skip to <a href="#step-1b">Step 1.b</a>.</p>
                                        </div><!-- End .main -->
                                </div><!-- End .section-intro -->
 
                                                <div class="troubleshooting">
                                                        <h4>Troubleshooting</h4>
                                                        <dl>
+                                                               <dt>What's a wizard?</dt>
+                                                                       <dd>A wizard is a series of windows that pop up to make it easy to get something done on a computer, like installing a program. You click through it, selecting options as you go.</dd>
                                                                <dt>My email program can't find my account or isn't downloading my mail?</dt>
-                                                                       <dd>Answer coming soon</dd>
+                                                                       <dd>Before Googling, we recommend you start by asking other people who use your email system, to figure out the correct settings.</dd>
                                                        </dl>
                                                </div><!-- /.troubleshooting -->
 
                                        </div><!-- End .main -->
                                </div><!-- End #step1-a .step -->
 
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-
-                               <div id="step-1b" class="step">
-                                       <div class="main">
-                                               <h3><em>Step 1.b</em> If you are using Windows, download gpg4Win</h3>
-                                               <p><a rel="external" href="http://gpg4win.org/">Download it</a>, run the executable and click through the installation wizard with all the default settings. You don't need to run the program once it's installed.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step1b .step -->
-
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-1c" class="step">
                                        <div class="main">
-                                               <h3><em>Step 1.c</em> Install the Enigmail plugin for your email program</h3>
+                                               <h3><em>Step 1.b</em> Install the Enigmail plugin for your email program</h3>
                                                <p>In your email program's menu, select Add-ons (it may be in the Tools section). Make sure Extensions is selected on the left. Do you see Enigmail? if so, skip this step.</p>
                                                <p>If not, search "Enigmail" with the search bar in the upper right. You can take it from here. Restart your email program when you're done.</p>
                                                <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
                                                <div class="troubleshooting">
                                                        <h4>Troubleshooting</h4>
                                                        <dl>
-                                                               <dt>Enigmail detected an existing key on my computer?</dt>
-                                                                       <dd>Answer coming soon.</dd>
-                                                               <dt>I can't find the OpenPGP menu?</dt>
-                                                                       <dd>In many new email programs, it's represented by an image of three stacked horizontal bars.</dd>
+                                                               <dt>I can't find the OpenPGP menu.</dt>
+                                                                       <dd>In many new email programs, the main menu is represented by an image of three stacked horizontal bars. OpenPGP may be inside a section called Tools.</dd>
                                                        </dl>
                                                </div><!-- /.troubleshooting -->
                                        </div><!-- End .main -->