Working on section six in index.
authorZak Rogoff <zak@fsf.org>
Thu, 5 Jun 2014 02:27:52 +0000 (22:27 -0400)
committerZak Rogoff <zak@fsf.org>
Thu, 5 Jun 2014 02:27:52 +0000 (22:27 -0400)
index.html
mac.html
static
windows.html

index f5c64656e31b318e2c90bfa224df03b05adbb79a..298cd1b82c52ee54032fb37838d474c1657628e0 100644 (file)
                                        <div class="main">
                                                <h3>Work for political change</h3>
                                                <p>Encrypting our email is a powerful direct action, but to change the system, we also have to go to the root. One of the key things needed is <a href="https://www.gnu.org/philosophy/surveillance-vs-democracy.html">reducing the amount of data collected about us in the first place</a>.</p><p>To learn more and participate in efforts for change, join the <a href="https://www.fsf.org/free-software-supporter/subscribe">Free Software Foundation's mailing list.</a></p>
+
                                        </div><!-- End .main -->
                                </div><!-- End #step-political .step -->
 
 
+
+
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-programming" class="step">
                                        <div class="main">
                                                <h3>Make these tools even better</h3>
-                                               <p>Like programming? Contribute code to <a href="https://www.gnupg.org/">GnuPG</a> or <a href="https://www.enigmail.net/home/index.php">Enigmail</a>. Have an idea for improving this guide? Leave us <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback</a>.</p>
+<p><a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">Leave feedback and suggest improvements to this guide.</a>, or email us at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a> if you'd like to help maintain or translate it.</li> 
+
+                                               <p>If you like programming, you can contribute code to <a href="https://www.gnupg.org/">GnuPG</a> or <a href="https://www.enigmail.net/home/index.php">Enigmail</a>. Have an idea for improving this guide? Leave us <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback</a>.</p>
+
+<p?<a href="https://u.fsf.org/7w">If you can't do any of these, you can always donate to the Free Software Foundation so we can get it into the hands of as many people as possible.</a></p>
+
                                        </div><!-- End .main -->
                                </div><!-- End #step-programming .step -->
 
                                <div id="step-more_technologies" class="step">
                                        <div class="main">
                                                <h3>Protect more of your digital life</h3>
-                                               <p>Learn surveillance-resistant technologies for instant messages, hard drive storage, online sharing and more at <a href="https://directory.fsf.org/wiki/Collection:PRISM"> the Free Software Directory's PRISM Collection</a> and <a href="prism-break.org">prism-break.org</a>.</p>
+                                               <p>Learn surveillance-resistant technologies for instant messages, hard drive storage, online sharing and more at <a href="https://directory.fsf.org/wiki/Collection:Privacy_pack"> the Free Software Directory's Privacy Pack</a> and <a href="prism-break.org">prism-break.org</a>.</p>
                                        </div><!-- End .main -->
                                </div><!-- End #step-more_technologies .step -->
 
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
+                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ --
                                <div id="step-learn_more" class="step">
                                        <div class="main">
                                                <h3>Learn more about GnuPG</h3>
                                                <p>There are a lot more features of GnuPG to discover, including encrypting files on your computer. There are a variety of resources accessible via Google, but we recommend starting with the links on the <a href="https://www.gnupg.org/documentation/">GnuPG Web site</a>.</p>
-                                       </div><!-- End .main -->
+                                       </div><!-- End .main --
                                </div><!-- End #step-learn_more .step -->
 
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-contribute" class="step">
-                                       <div class="main">
-                                               <h3>Contribute to this guide</h3>
-                                               <ul>
-                                                       <li><a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">Leave feedback and suggest improvements</a></li>
-                                                       <li>Email us at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a> if you'd like to help maintain and improve this guide, or to translate it</li>
-                                                       <li><a href="https://u.fsf.org/7w">Donate to the Free Software Foundation</a></li>
-                                               </ul>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-contribute .step -->
 
                        </div>
                </section><!-- End #section6 -->
index a29ca5e6e42f60887b260b04e1ebc29a7badb12c..f4154dfcf823e327031e0167935143cacb3bf024 100644 (file)
--- a/mac.html
+++ b/mac.html
                                <!-- ~~~~~~~~~ section title + graphics  ~~~~~~~~~ -->
                                <div class="section-intro">
                                                <h2><em>#6</em> Next steps</h2>
+<p>You've now completed the basics of email encryption with GnuPG, taking action against bulk surveillance. A pat on the back to you! Want to do more to secure privacy for yourself and the people you communicate with?</p>
                                </div><!-- End .section-intro -->
 
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
diff --git a/static b/static
index c78158fdabd9e24f7ecf31da322f6570bb9bd4b5..bcf35a0d86c7843a58dbeef7cb9e52051891568d 160000 (submodule)
--- a/static
+++ b/static
@@ -1 +1 @@
-Subproject commit c78158fdabd9e24f7ecf31da322f6570bb9bd4b5
+Subproject commit bcf35a0d86c7843a58dbeef7cb9e52051891568d
index 5245640a63848f65b7372a84d8af4a6f73bd33d1..9118d65a9b71010d66513f26f8c9eb83a7767d73 100644 (file)
                                <!-- ~~~~~~~~~ section title + graphics  ~~~~~~~~~ -->
                                <div class="section-intro">
                                                <h2><em>#6</em> Next steps</h2>
+<p>You've now completed the basics of email encryption with GnuPG, taking action against bulk surveillance. A pat on the back to you! Want to do more to secure privacy for yourself and the people you communicate with?</p>
                                </div><!-- End .section-intro -->