X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=blobdiff_plain;f=givingguide.html;h=3a8e4a4c3773e48897e6a9d946fdd8e9a3037e7b;hp=765edf768f9963797ca08fa87702bb379a8b5f0f;hb=ca7bca499a4c38350dccd8a59bdc4ec553fee54d;hpb=3c08de1e91d586996c94a0a0940d09aecbaf5f66

diff --git a/givingguide.html b/givingguide.html
index 765edf7..3a8e4a4 100755
--- a/givingguide.html
+++ b/givingguide.html
@@ -57,8 +57,8 @@
             than they give. The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. This is the Free Software Foundation (FSF) guide to smarter gifts, compared with their restrictive
             counterparts.
           </p>
-          <p>Like this guide? Organize a <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Giving
-						Guide Giveaway</a> to share it with your community. And remember: donating to a charity in your friend or family member's name (see our recommendations below) is at least as meaningful as buying them an electronic device.</p>
+          <p>Like this guide? Download the <a href="https://static.fsf.org/nosvn/2014-giving-guide-printable/english.zip">printable version</a> (translations welcome!) and organize a <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Giving
+						Guide Giveaway</a> to share it with your community. And remember: donating to a <a href="#charities">charity</a> in someone's name is at least as meaningful as buying them an electronic device.</p>
         </div>
       </div>
       <!--end intro -->
@@ -77,75 +77,7 @@
   <!--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 <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://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>
 
 
 
@@ -160,7 +92,7 @@
 
         <h4 class="title">Lulzbot TAZ 4.0</h4>
         <ul>
-          
+
 
           <li>
             <a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, making 3D printing more accessible and encouraging innovation.
@@ -229,7 +161,7 @@
 
         <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>
 
@@ -281,72 +213,6 @@
 
     </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>
@@ -362,11 +228,11 @@ 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><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>          
+            <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>
 
         </div>
@@ -412,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>
@@ -465,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>
@@ -522,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>
@@ -607,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>
 
@@ -687,7 +691,7 @@ available Android devices ship with some proprietary software.)
           </a>
         </div>
       </div>
-      
+
       <div class="recommended_product">
         <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/tehnoetic_adapter.png" alt="Tehnoetic dongle Wi-Fi adapter" />
         <h4 class="title">ThinkPenguin dongle Wi-Fi adapter</h4>
@@ -702,7 +706,7 @@ available Android devices ship with some proprietary software.)
 
     <!--recommended charities-->
 
-    <h1 class="topic_title">Recommended charities for holiday donations</h1>
+    <a name="charities"><h1 class="topic_title">Recommended charities for holiday donations</h1></a>
     <p><a href="http://www.eff.org">Electronic Frontier Foundation</a>,
       <a href="http://www.creativecommons.org">Creative Commons</a>,
       <a href="http://wikimedia.org">Wikimedia Foundation</a>,
@@ -741,7 +745,7 @@ available Android devices ship with some proprietary software.)
 
     <p>ThinkPenguin with GNU 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>
       <br>Based on a work at <a href="https://www.thinkpenguin.com/gnu-linux/royal-penguin-gnu-linux-notebook">https://www.thinkpenguin.com/gnu-linux/royal-penguin-gnu-linux-notebook</a>.</p>
-      
+
     <p>ThinkPenguin router by ThinkPenguin 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></p>
 
     <p>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>
@@ -753,12 +757,12 @@ available Android devices ship with some proprietary software.)
     <p>The Inkscape and GIMP logos are licensed under the <a href="https://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.</p>
 
     <p>The Amazon, iOS, YouTube, Google Drive and Adobe Photoshop and Illustrator logos are in the public domain but are registered trademarks.</p>
-    
+
     <p>Replicant by Paul Kocialkowski is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 3.0 Unported.</a>
       <br>Retrieved from <a href="https://en.wikipedia.org/wiki/File:Replicant_logo_alpha.svg">https://en.wikipedia.org/wiki/File:Replicant_logo_alpha.svg</a>.</p>
 
     <p>Tehnoetic Wi-Fi dongle by Tehnoetic 2014 licensed under CC BY-SA 4.0.
-    
+
     <p>The Least Authority logo is copyright Least Authority Enterprises.</p>
 
     <p>The Media Goblin graphic is public domain.</p>
@@ -773,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>.