From: Andrew Engelbrecht <andrew@fsf.org>
Date: Fri, 20 Oct 2017 22:06:02 +0000 (-0400)
Subject: all http -> https (except piwik code)
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cc167ced5dbc6fba132876daecb4b4d717b0a982;p=fsf-giving-guide.git

all http -> https (except piwik code)

The piwik code in question intentionally contains both http and https
urls.
---

diff --git a/givingguide.html b/givingguide.html
index f462409..db98d25 100644
--- a/givingguide.html
+++ b/givingguide.html
@@ -97,7 +97,7 @@
           <span class="icon-bar bar3"></span>
         </button>
         <a class="navbar-brand" href="https://fsf.org/"><img class="brand" src="img/logo.png" alt="FSF" width="180" /></a>
-        <!-- <span class="label label-warning"><a href="http://fsf.org/jfb">Join the FSF</a></span> -->
+        <!-- <span class="label label-warning"><a href="https://fsf.org/jfb">Join the FSF</a></span> -->
 
       </div>
 
@@ -107,7 +107,7 @@
           <li><a class="animated fadeIn" href="https://www.fsf.org/about/">About the FSF</a></li>
           <li><a class="animated fadeIn" href="https://www.fsf.org/campaigns/">Campaigns</a></li>
           <li><a class="animated fadeIn" href="https://www.fsf.org/donate/">Donate</a></li>
-          <li><a class="animated fadeIn" href="http://shop.fsf.org/">Shop</a>
+          <li><a class="animated fadeIn" href="https://shop.fsf.org/">Shop</a>
           </ul>
 
         </div>
@@ -228,7 +228,7 @@
             <ul class="pros">
 
                         <li>
-                            Runs the <a href="http://www.replicant.us">Replicant</a> free operating system, based on Android. Caveat: its modem hardware separately runs a nonfree system.
+                            Runs the <a href="https://www.replicant.us">Replicant</a> free operating system, based on Android. Caveat: its modem hardware separately runs a nonfree system.
                         </li>
                         <li>
                             Features <a href="https://www.f-droid.org/">F-Droid</a>, the free software catalogue that makes it easy to get all the applications you need without sacrificing control of your phone.
@@ -246,7 +246,7 @@
                 iOS is a fully proprietary operating system, giving Apple control over the software on the devices.
               </li>
               <li>
-                Apple uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to block competing software.
+                Apple uses <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to block competing software.
               </li>
             </ul>
           </div>
@@ -610,7 +610,7 @@
             <!-- End Buy/Download button -->
             <ul class="pros">
               <li>All of the ebooks are gratis, including classics like Peter Pan and Huck Finn.</li>
-              <li>The original purveyor of eBooks free of <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> (Digital Restrictions Management), <a href="https://www.defectivebydesign.org/guide/ebooks">inspiring many others</a>.</li>
+              <li>The original purveyor of eBooks free of <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> (Digital Restrictions Management), <a href="https://www.defectivebydesign.org/guide/ebooks">inspiring many others</a>.</li>
               <li>Enjoy the freedom to read your ebooks on any device.</li>
             </ul>
           </div>
@@ -621,14 +621,14 @@
             <h5 class="text-center">Amazon.com</h5>
             <ul class="cons">
               <li>
-                Amazon can remotely block or delete individual ebooks or your entire library with no warning or explanation (<a href="http://www.defectivebydesign.org/node/2250">they've done it before</a>).
+                Amazon can remotely block or delete individual ebooks or your entire library with no warning or explanation (<a href="https://www.defectivebydesign.org/node/2250">they've done it before</a>).
               </li>
               <li>
-                Amazon uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to prevent you from sharing your favorite books with friends or moving them between readers.
+                Amazon uses <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to prevent you from sharing your favorite books with friends or moving them between readers.
               </li>
               <li>
                 Amazon openly claims
-                <a href="http://www.defectivebydesign.org/amazon-kindle-swindle">you don't actually own or control your ebooks.</a>
+                <a href="https://www.defectivebydesign.org/amazon-kindle-swindle">you don't actually own or control your ebooks.</a>
               </li>
               <li class="neutral"><em>If</em> you do purchase from Amazon, make sure to use <a href="https://smile.amazon.com">smile.amazon.com</a> to designate a nonprofit like the Free Software Foundation to receive some of the money.</li>
             </ul>
@@ -771,7 +771,7 @@
             <img src="img/products/itunes-blocked.png" alt="itunes" class="center-block fix-itunes" />
             <h5 class="text-center">iTunes Cards</h5>
             <ul class="cons">
-              <li> <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> on everything (except music) controls what you can do with your purchases.
+              <li> <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> on everything (except music) controls what you can do with your purchases.
               </li>
 
               <li> Apple claims (wrongly) that you don't actually own anything you buy from the iTunes store.</li>
@@ -870,12 +870,12 @@
                   <p>The graphics and photos used on this page have been modified by the Free Software Foundation and are licensed separately under the following terms: </p>
                   <ul style="list-style: none inside none;">
                     <li>X200, T400, iPhone, and ISP-provided router images are in the public domain.</li>
-                    <li>Lulzbot 3D printer photo by Aleph Objects is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                    <li>FSF USB membership card by FSF is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                    <li>iTunes gift card is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                    <li>ThinkPenguin with GNU and both ThinkPenguin router images by ThinkPenguin are licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                    <li>Macbook Pro PSD by andrew-gw is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                    <li>Astounding Stories is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                    <li>Lulzbot 3D printer photo by Aleph Objects is licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                    <li>FSF USB membership card by FSF is licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                    <li>iTunes gift card is licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                    <li>ThinkPenguin with GNU and both ThinkPenguin router images by ThinkPenguin are licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                    <li>Macbook Pro PSD by andrew-gw is licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                    <li>Astounding Stories is licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
                     <li>The Inkscape and GIMP logos are licensed under the <a href="https://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.</li>
                     <li>The Amazon, iOS, YouTube, Google Drive and Adobe Photoshop and Illustrator logos are registered trademarks.</li>
                     <li>Tehnoetical Replicant s3 and Wi-Fi Dongle by Tehnoetical 2016 licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.</li>