Reordering items.
[fsf-giving-guide.git] / givingguide.html
index 0472c80ce62eda8665ba12cc1d5f26bff65db0b3..63a7e966e312594227d3368714c0467342758255 100755 (executable)
   <!--We compare different products from here-->
 
   <div class="comparisons">
-    <div class="section_wrapper">
-      <h3 class="main_title">Operating Systems</h3>
-
-      <div class="free">
-        <div class="product">
-          <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-          <img class="product_img" src="//www.gnu.org/graphics/trisquel/trisquel.svg" alt="Trisquel GNU/Linux" />
-        </div>
-
-        <h4 class="title">Trisquel GNU/Linux</h4>
-        <ul>
-          <li>
-            <a href="http://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> completely free operating system: transparent and modifiable.
-          </li>
-
-          <li>
-            Break the cycle of forced upgrades and planned obsolescence.
-          </li>
-
-          <li>
-            Comes with all the software you need and an easy software manager to find more.
-          </li>
-          <li>Works great with the Wi-Fi adapters in this guide.</li>
-        </ul>
-
-
-
-      </div>
-
-      <div class="proprietary">
-        <div class="product">
-          <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-          <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/windows.png" alt="Windows" />
-        </div>
-
-        <h4 class="title">Windows</h4>
-        <ul>
-          <li>
-            Proprietary software that profits from controlling how you use your computer.
-          </li>
-
-          <li>
-            Invades privacy and exposes personal data to Microsoft,
-            <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInWindows>
-                                               the NSA,</a> and other malicious attackers.
-          </li>
-
-          <li>
-            Dependent on mandatory upgrades and devices that don't support older versions of Windows.
-          </li>
-        </ul>
-
-
-      </div>
-
-                       <!-- 'buy/download' and 'avoid' buttons -->
-      <div class="buy_avoid">
-        <div class="buy_avoid_wrapper">
-          <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
-            </a>
-          </div>
-
-          <div class="avoid">
-            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-          </div>
-        </div>
-      </div>
-                       <!-- end buy-avoid -->
-
-    </div>
+    
 
 
 
 
         <ul>
           <li>All of the ebooks are gratis, including classics like Peter Pan and Huck Finn.</li>
-          <li>The original purveyor of DRM-free eBooks, <a href="htts://www.defectivebydesign.org/guide/ebooks">inspiring many others</a>.</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>Enjoy the freedom to read your ebooks on any device.</li>
         </ul>
 
                        <!-- end buy-avoid -->
 
     </div>
-
-    <div class="section_wrapper">
-      <h3 class="main_title">Mobile OS</h3>
-
-      <div class="free">
-        <div class="product">
-          <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-          <img class="product_img" src="//static.fsf.org/nosvn/images/Replicant_logo.png" alt="Replicant" />
-        </div>
-
-        <h4 class="title">Replicant OS</h4>
-        <ul>
-          <li>
-            Fully free software, based on Android.
-          </li>
-
-          <li>
-            <a href="http://redmine.replicant.us/projects/replicant/wiki/ReplicantImages">
-       Supported devices
-       </a> include both phones and tablets.
-          </li>
-
-          <li>
-            Works on used devices, so your dollars won't go to proprietary OS companies. (All commercially
-available Android devices ship with some proprietary software.)
-          </li>
-        </ul>
-
-
-      </div>
-
-      <div class="proprietary">
-        <div class="product">
-          <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-          <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/iOS.png" alt="Apple iPhone, iPad and Watch" />
-        </div>
-
-        <h4 class="title">Apple iPhone, iPad and Watch</h4>
-        <ul>
-          <li>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</li>          
-          <li>
-            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.
-          </li>
-
-        </ul>
-      </div>
-
-                       <!-- 'buy/download' and 'avoid' buttons -->
-      <div class="buy_avoid">
-        <div class="buy_avoid_wrapper">
-          <div class="buy">
-            <a href="http://www.replicant.us"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
-            </a>
-          </div>
-
-          <div class="avoid">
-            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-          </div>
-        </div>
-      </div>
-                       <!-- end buy-avoid -->
-
-    </div>
-
+    
     <div class="comparisons">
       <div class="section_wrapper">
         <h3 class="main_title">Laptops</h3>
@@ -364,10 +228,10 @@ available Android devices ship with some proprietary software.)
           <ul>
 
             <li>
-              Comes installed with a free OS, and its Wi-Fi and 3D-accelerated graphics work with any other <a href="http://www.gnu.org/distros/">fully free GNU/Linux distribution</a>.
+              Comes installed with a free OS, and its Wi-Fi and 3D-accelerated graphics work with any other <a href="https://www.gnu.org/distros/free-distros.html">fully free GNU/Linux distribution</a>.
             </li>
 
-            <li> While its proprietary boot firmware means it's <a href="https://www.fsf.org/campaigns/free-bios.html">not fully free</a>, this laptop is one of the most freedom-supporting available. Browse more companies that sell <a href="www.gnu.org/links/companies">free software-compatible computers</a>.</li>
+            <li> While its proprietary boot firmware means it's <a href="https://www.fsf.org/campaigns/free-bios.html">not fully free</a>, this laptop is one of the most freedom-supporting available. Browse more companies that sell <a href="https://www.gnu.org/links/companies">free software-compatible computers</a>.</li>
             <li><span style="font-weight:bold">SAVE!</span> $5 off any purchase of $50 or more with coupon code FSFGIVING. ThinkPenguin will also donate $5 to the FSF (expires at the end of 2014).</li>          
           </ul>
 
@@ -414,6 +278,10 @@ available Android devices ship with some proprietary software.)
 
     </div>
 
+    
+
+    
+
     <div class="comparisons">
       <div class="section_wrapper">
         <h3 class="main_title">Graphic Design</h3>
@@ -467,7 +335,75 @@ available Android devices ship with some proprietary software.)
                        <!-- end buy-avoid -->
 
     </div>
+<div class="section_wrapper">
+      <h3 class="main_title">Operating Systems</h3>
+
+      <div class="free">
+        <div class="product">
+          <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+          <img class="product_img" src="//www.gnu.org/graphics/trisquel/trisquel.svg" alt="Trisquel GNU/Linux" />
+        </div>
+
+        <h4 class="title">Trisquel GNU/Linux</h4>
+        <ul>
+          <li>
+            <a href="http://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> completely free operating system: transparent and modifiable.
+          </li>
+
+          <li>
+            Break the cycle of forced upgrades and planned obsolescence.
+          </li>
+
+          <li>
+            Comes with all the software you need and an easy software manager to find more.
+          </li>
+          <li>Works great with the Wi-Fi adapters in this guide.</li>
+        </ul>
+
+
+
+      </div>
+
+      <div class="proprietary">
+        <div class="product">
+          <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+          <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/windows.png" alt="Windows" />
+        </div>
+
+        <h4 class="title">Windows</h4>
+        <ul>
+          <li>
+            Proprietary software that profits from controlling how you use your computer.
+          </li>
+
+          <li>
+            Invades privacy and exposes personal data to <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInWindows">Microsoft</a>, the NSA, and other malicious attackers.
+            </li>
+
+          <li>
+            Dependent on mandatory upgrades and devices that don't support older versions of Windows.
+          </li>
+        </ul>
+
 
+      </div>
+
+                       <!-- 'buy/download' and 'avoid' buttons -->
+      <div class="buy_avoid">
+        <div class="buy_avoid_wrapper">
+          <div class="buy">
+            <a href="http://trisquel.info/"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
+            </a>
+          </div>
+
+          <div class="avoid">
+            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+          </div>
+        </div>
+      </div>
+                       <!-- end buy-avoid -->
+
+    </div>
     <div class="comparisons">
       <div class="section_wrapper">
         <h3 class="main_title">Gift Cards</h3>
@@ -524,6 +460,72 @@ available Android devices ship with some proprietary software.)
 
     </div>
 
+<div class="section_wrapper">
+      <h3 class="main_title">Mobile OS</h3>
+
+      <div class="free">
+        <div class="product">
+          <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+          <img class="product_img" src="//static.fsf.org/nosvn/images/Replicant_logo.png" alt="Replicant" />
+        </div>
+
+        <h4 class="title">Replicant OS</h4>
+        <ul>
+          <li>
+            Fully free software, based on Android.
+          </li>
+
+          <li>
+            <a href="http://redmine.replicant.us/projects/replicant/wiki/ReplicantImages">
+       Supported devices
+       </a> include both phones and tablets.
+          </li>
+
+          <li>
+            Works on used devices, so your dollars won't go to proprietary OS companies. (All commercially
+available Android devices ship with some proprietary software.)
+          </li>
+        </ul>
+
+
+      </div>
+
+      <div class="proprietary">
+        <div class="product">
+          <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+          <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/iOS.png" alt="Apple iPhone, iPad and Watch" />
+        </div>
+
+        <h4 class="title">Apple iPhone, iPad and Watch</h4>
+        <ul>
+          <li>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</li>          
+          <li>
+            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.
+          </li>
+
+        </ul>
+      </div>
+
+                       <!-- 'buy/download' and 'avoid' buttons -->
+      <div class="buy_avoid">
+        <div class="buy_avoid_wrapper">
+          <div class="buy">
+            <a href="http://www.replicant.us"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
+            </a>
+          </div>
+
+          <div class="avoid">
+            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+          </div>
+        </div>
+      </div>
+                       <!-- end buy-avoid -->
+
+    </div>
+
     <div class="comparisons">
       <div class="section_wrapper">
         <h3 class="main_title">Online Storage</h3>
@@ -609,7 +611,7 @@ available Android devices ship with some proprietary software.)
               Soon-to-be federated to allow decentralized sharing.
             </li>
 
-            <li>Supports free video formats. And ability to choose a <a href="https://www.gnu.org/copyleft/">copyleft license</a>.</li>
+            <li>Supports free video formats and grants the ability to choose a <a href="https://www.gnu.org/copyleft/">copyleft license</a>.</li>
 
             <li>Source files can be attached to an upload, making it easy to remix people's work.</li>
 
@@ -775,13 +777,13 @@ available Android devices ship with some proprietary software.)
       <div class="footer_wrapper">
         <div>
           <p>The FSF is a charity with a worldwide mission to advance software freedom —
-            <a href="https://static.fsf.org/about">learn about our history and work.</a>
+            <a href="https://fsf.org/about">learn about our history and work.</a>
           </p>
         </div>
 
         <div class="copyright">
           <p>Copyright © 2004-2014
-                               <a href="https://static.fsf.org/about/contact.html" title="Find out how to contact us">
+                               <a href="https://fsf.org/about/contact.html" title="Find out how to contact us">
                                        Free Software Foundation
                                </a>, Inc.
                                <a href="https://my.fsf.org/donate/privacypolicy.html"> Privacy Policy</a>.