Removed 'http:' from all image sources. Updated the Troubleshooting 'Leave Feedback...

diff --git a/index.html b/index.html
index 91e509762a6f2eccd9ce2b3928bc1d83256019df..503d1ad74c3d1c949eeb1e0b8ffe010430641236 100644 (file)
--- a/index.html
+++ b/index.html
@@ -45,7 +45,8 @@
                                        <h3><a href="http://www.fsf.org/"><img alt="Free Software Foundation" src="http://static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h3>
                                        <p>The Free Software Foundation is working to secure freedom for computer
                                        users by promoting the development and use of free (as in freedom) software and documentation &mdash; particularly the <a href="http://gnu.org">GNU operating system</a> &mdash; and by <a href="/campaigns">campaigning</a> against threats to computer user freedom like Digital Restrictions Management (DRM) and software patents.</p>
-                                       <p><a href="http://fsf.org/jfb"><img alt="Join now" src="http://static.fsf.org/nosvn/enc-dev0/img/join.en.png"></a></p>
+                                       <!--<p><a href="http://fsf.org/jfb"><img alt="Join now" src="http://static.fsf.org/nosvn/enc-dev0/img/join.en.png"></a></p>-->
+                                       <p><a href="http://donate.fsf.org"><img alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/donate.en.png"></a></p>
                                        <div class="newsletter">
                                                <h5>Sign up</h5>
                                                <p>Enter your email address to receive our monthly newsletter, the <a href="https://www.fsf.org/free-software-supporter/">Free Software Supporter</a></p>
@@ -55,6 +56,7 @@
                                                                <input type="hidden" value="" name="postURL"><input type="hidden" value="1" name="group[25]"><input type="hidden" value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31" name="cancelURL"><input type="hidden" value="Edit:cancel" name="_qf_default">
                                                        </div>
                                                </form>
+                                               <p><small>Read our <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a></small></p>
                                        </div><!-- End .newsletter -->
                                </div><!-- End #fsf-intro -->
 
@@ -74,7 +76,7 @@
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-1a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="http://static.fsf.org/nosvn/enc-dev0/img/screenshots/step1a-install-wizard.png" alt="Step 1.A: Install Wizard" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1a-install-wizard.png" alt="Step 1.A: Install Wizard" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3><em>Step 1.a</em> Set your email program up with your email account (if it isn't already)</h3>
@@ -88,8 +90,8 @@
                                                                        <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>Before Googling, we recommend you start by asking other people who use your email system, to figure out the correct settings.</dd>
-                                                               <dt class="feedback">You didn't find an answer for you problem?</dt>
-                                                                       <dd class="feedback">Leave <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback</a> so we can improve.</dd>
+                                                               <dt class="feedback">Don't see a solution to your problem?</dt>
+                                                                       <dd class="feedback">Please let us know on the <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
                                                        </dl>
                                                </div><!-- /.troubleshooting -->
 
@@ -99,7 +101,7 @@
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-1c" class="step">
                                        <div class="sidebar">
-                                               <p><img src="http://static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-tools-addons.png" alt="Step 1.B: Tools -> Add-ons" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-tools-addons.png" alt="Step 1.B: Tools -> Add-ons" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3><em>Step 1.b</em> Install the Enigmail plugin for your email program</h3>
@@ -111,8 +113,8 @@
                                                        <dl>
                                                                <dt>I can't find the menu.</dt>
                                                                        <dd>In many new email programs, the main menu is represented by an image of three stacked horizontal bars.</dd>
-                                                               <dt class="feedback">You didn't find an answer for you problem?</dt>
-                                                                       <dd class="feedback">Leave <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback</a> so we can improve.</dd>
+                                                               <dt class="feedback">Don't see a solution to your problem?</dt>
+                                                                       <dd class="feedback">Please let us know on the <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
                                                        </dl>
                                                </div><!-- /.troubleshooting -->
                                        </div><!-- End .main -->
@@ -132,7 +134,7 @@
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-2a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="http://static.fsf.org/nosvn/enc-dev0/img/placeholders/placeholder.png" alt="Placeholder" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/placeholders/placeholder.png" alt="Placeholder" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3><em>Step 2.a</em> Make a keypair</h3>
@@ -150,8 +152,8 @@
                                                        <dl>
                                                                <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>
-                                                               <dt class="feedback">You didn't find an answer for you problem?</dt>
-                                                                       <dd class="feedback">Leave <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback</a> so we can improve.</dd>
+                                                               <dt class="feedback">Don't see a solution to your problem?</dt>
+                                                                       <dd class="feedback">Please let us know on the <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
                                                        </dl>
                                                </div><!-- /.troubleshooting -->
                                        </div><!-- End .main -->
@@ -171,7 +173,7 @@
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-3a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="http://static.fsf.org/nosvn/enc-dev0/img/placeholders/placeholder.png" alt="Placeholder" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/placeholders/placeholder.png" alt="Placeholder" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3><em>Step 3.a</em> Send Adele your public key</h3>
@@ -187,8 +189,8 @@
                                                        <dl>
                                                                <dt>PLACEHOLDER</dt>
                                                                        <dd>PLACEHOLDER</dd>
-                                                               <dt class="feedback">You didn't find an answer for you problem?</dt>
-                                                                       <dd class="feedback">Leave <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback</a> so we can improve.</dd>
+                                                               <dt class="feedback">Don't see a solution to your problem?</dt>
+                                                                       <dd class="feedback">Please let us know on the <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
                                                        </dl>
                                                </div><!-- /.troubleshooting -->
                                        </div><!-- End .main -->
@@ -211,8 +213,8 @@
                                                                <dl>
                                                                        <dt>Enigmail can't find Adele's key</dt>
                                                                                <dd>Close the pop-ups that have appeared since you clicked. Make sure you are connected to the Internet and try again. If that doesn't work, repeat the process, choosing a different keyserver when it asks you to pick one.</dd>
-                                                               <dt class="feedback">You didn't find an answer for you problem?</dt>
-                                                                       <dd class="feedback">Leave <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback</a> so we can improve.</dd>
+                                                               <dt class="feedback">Don't see a solution to your problem?</dt>
+                                                                       <dd class="feedback">Please let us know on the <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
                                                                </dl>
                                                        </div><!-- /.troubleshooting -->
                                                </div><!-- End .main -->
@@ -255,7 +257,7 @@
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-4a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="http://static.fsf.org/nosvn/enc-dev0/img/placeholders/placeholder.png" alt="Placeholder" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/placeholders/placeholder.png" alt="Placeholder" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3><em>Step 4.a</em> Sign a key</h3>
@@ -321,7 +323,7 @@
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-gnulinux" class="step">
                                        <div class="sidebar">
-                                               <p><img src="http://static.fsf.org/nosvn/enc-dev0/img/placeholders/placeholder.png" alt="Placeholder" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/placeholders/placeholder.png" alt="Placeholder" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3>Switch to GNU/Linux</h3>
@@ -398,7 +400,7 @@
                                                <li><a href="http://libreplanet.org/wiki/GPG_guide">Help translate this guide to other languages</a></li>
                                </div><!-- /#contribute -->
                                <div id="copyright">
-                                       <h4><a href="http://www.fsf.org/"><img alt="Free Software Foundation" src="http://static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
+                                       <h4><a href="http://www.fsf.org/"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
                                        <p>Copyright &copy; 2014 <a href="https://fsf.org">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://fsf.org/jfb">Join.</a></p>
                                        <p>The images on this page are under a <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version)</a>, and the rest of it is under a <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (or later version)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
                                </div><!-- /#copyright -->

diff --git a/mac.html b/mac.html
index 350f136f2b8675bb101632126b5042a333ffec20..427517adff09e071481ad32176d8ce1c86eddb97 100644 (file)
--- a/mac.html
+++ b/mac.html
@@ -16,7 +16,7 @@
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-1a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="http://static.fsf.org/nosvn/enc-dev0/img/screenshots/step1a-install-wizard.png" alt="Step 1.A: Install Wizard" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1a-install-wizard.png" alt="Step 1.A: Install Wizard" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3><em>Step 1.a</em> Set your email program up with your email account (if it isn't already)</h3>

diff --git a/static b/static
index fde9061471c8b10e0c8f44b20768870052c5d102..675698a7359ee9d2204bd3ad51b46e51a6f58694 160000 (submodule)
--- a/static
+++ b/static
@@ -1 +1 @@
-Subproject commit fde9061471c8b10e0c8f44b20768870052c5d102
+Subproject commit 675698a7359ee9d2204bd3ad51b46e51a6f58694

diff --git a/windows.html b/windows.html
index 81772654fd4f7dd1674f40d56d41c2165c95e670..3e42b9219f240bf9dc8257a24ef428db9d9e14fa 100644 (file)
--- a/windows.html
+++ b/windows.html
@@ -16,7 +16,7 @@
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-1a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="http://static.fsf.org/nosvn/enc-dev0/img/screenshots/step1a-install-wizard.png" alt="Step 1.A: Install Wizard" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1a-install-wizard.png" alt="Step 1.A: Install Wizard" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3><em>Step 1.a</em> Set your email program up with your email account (if it isn't already)</h3>