tweaks
authorZak Rogoff <zak@montage.office.fsf.org>
Fri, 21 Nov 2014 18:15:49 +0000 (13:15 -0500)
committerZak Rogoff <zak@montage.office.fsf.org>
Fri, 21 Nov 2014 18:15:49 +0000 (13:15 -0500)
givingguide.html

index 9451a9d0746f50d144a1dcccc8adf6a8c6e2dee0..dee5c837dd6314969f5a617658c7a2910e5ab47f 100755 (executable)
@@ -78,7 +78,7 @@
 
   <div class="comparisons">
     <div class="section_wrapper">
-      <h3 class="main_title">Operating System</h3>
+      <h3 class="main_title">Operating Systems</h3>
 
       <div class="free">
         <div class="product">
         <h4 class="title">Windows</h4>
         <ul>
           <li>
-            Proprietary software that profits from controlling how you use your computer
+            Proprietary software that profits from controlling how you use your computer.
           </li>
 
           <li>
             Invades privacy and exposes personal data to Microsoft,
             <a href="http://www.theguardian.com/world/2013/sep/05/nsa-how-to-remain-secure-surveillance">
-                                               the NSA,</a> and other malicious attackers
+                                               the NSA,</a> and other malicious attackers.
           </li>
 
           <li>
-            Dependent on mandatory upgrades and devices that don't support older versions of Windows
+            Dependent on mandatory upgrades and devices that don't support older versions of Windows.
           </li>
         </ul>
 
 
         <h4 class="title">Lulzbot TAZ 4.0</h4>
         <ul>
-          <li>
-            Contact <a href="https://www.lulzbot.com/company/contact-us">Lulzbot sales</a> and mention this guide to receive gratis shipping and filament with your TAZ.
-          </li>
+          
 
           <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.
             Supports tetherless printing, optional Dual Extruder upgrade, and exotic filaments including wood-, rubber- and stone-like materials.
           </li>
           <li>Hardware designs available to make modification and improvement easy.</li>
+          <li>
+            <span style="font-weight:bold">SAVE!</span> When you buy a TAZ, contact <a href="https://www.lulzbot.com/company/contact-us">Lulzbot sales</a> and mention this guide to receive an extra roll of filament and gratis shipping to the US, Canada or the EU (expires at the end of 2014).
+          </li>
         </ul>
 
       </div>
         <h4 class="title">Makerbot Replicator 2</h4>
         <ul>
           <li>
-            MakerWare software is proprietary, restricting freedom and stifling innovation
+            MakerWare software is proprietary, restricting freedom and stifling innovation.
           </li>
 
           <li>
-            Hardware patents threaten free printers like the Lulzbot
+            Hardware patents threaten free printers like the Lulzbot.
           </li>
 
           <li>
-            Recently announced an increasingly proprietary approach, further distancing itself from the free software community
+            Recently announced an increasingly proprietary approach, further distancing itself from the free software community.
           </li>
         </ul>
 
       <div class="buy_avoid">
         <div class="buy_avoid_wrapper">
           <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="images/buy.png" alt="Buy" />
+            <a href="https://www.lulzbot.com/products/lulzbot-taz-4-3d-printer/"><img src="images/buy.png" alt="Buy" />
             </a>
           </div>
 
       <div class="buy_avoid">
         <div class="buy_avoid_wrapper">
           <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="images/buy.png" alt="Buy" />
+            <a href="https://www.gutenberg.org/"><img src="images/buy.png" alt="Buy" />
             </a>
           </div>
 
           <li>
             <a href="http://redmine.replicant.us/projects/replicant/wiki/ReplicantImages">
        Supported devices
-       </a> include both phones and tablets
+       </a> include both phones and tablets.
           </li>
 
           <li>
       <div class="buy_avoid">
         <div class="buy_avoid_wrapper">
           <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="images/download.png" alt="Download" />
+            <a href="http://www.replicant.us"><img src="images/download.png" alt="Download" />
             </a>
           </div>
 
           <h4 class="title">ThinkPenguin GNU/Linux Notebook</h4>
 
           <ul>
-            <li>Save $5 on 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>
               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>.
             </li>
 
             <li> While its proprietary 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>          
           </ul>
 
         </div>
         <div class="proprietary">
           <div class="product">
             <img class="bad" src="images/bad.png" alt="bad" />
-            <img class="product_img" src="images/Macbook_Pro.png" alt="Apple Macbook Pro" />
+            <img class="product_img" src="http://static.fsf.org/nosvn/images/macbook_pro.png" alt="Apple Macbook Pro" />
+
           </div>
 
           <h4 class="title">Apple Macbook Pro</h4>
       <div class="buy_avoid">
         <div class="buy_avoid_wrapper">
           <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="images/buy.png" alt="Buy" />
+            <a href="https://www.thinkpenguin.com/catalog/notebook-computers-gnu-linux-2"><img src="images/buy.png" alt="Buy" />
             </a>
           </div>
 
       <div class="buy_avoid">
         <div class="buy_avoid_wrapper">
           <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="images/download.png" alt="Download" />
+            <a href="https://www.inkscape.org/en/"><img src="images/download.png" alt="Download" />
             </a>
           </div>
 
       <div class="buy_avoid">
         <div class="buy_avoid_wrapper">
           <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="images/buy.png" alt="Buy" />
+            <a href="https://my.fsf.org/associate/support_freedom/join_fsf?"><img src="images/buy.png" alt="Buy" />
             </a>
           </div>
 
           <div class="avoid">
-            <img src="images/avoid.png" alt="avoid" />
+            <img src="https://my.fsf.org/associate/support_freedom/join_fsf?images/avoid.png" alt="avoid" />
           </div>
         </div>
       </div>
       <div class="buy_avoid">
         <div class="buy_avoid_wrapper">
           <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="images/download.png" alt="Download" />
+            <a href="https://leastauthority.com/"><img src="images/buy.png" alt="Buy" />
             </a>
           </div>
 
       <div class="buy_avoid">
         <div class="buy_avoid_wrapper">
           <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="images/download.png" alt="Download" />
+            <a href="http://mediagoblin.org/"><img src="images/download.png" alt="Download" />
             </a>
           </div>
 
     <div class="recommend_wrapper">
 
       <div class="recommended_product">
-        <img class="recommended_product_img" src="images/adaptor-500x500.JPG" alt="Tehnoetic dongle Wi-Fi adapter" />
+        <img class="recommended_product_img" src="http://static.fsf.org/nosvn/images/tehnoetic_adapter.png" alt="Tehnoetic dongle Wi-Fi adapter" />
         <h4 class="title">Tehnoetic dongle Wi-Fi adapter</h4>
         <p>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. Certified to <a href="https://www.fsf.org/ryf">Respects Your Freedom</a>.</p>
         <div class="buy">
       </div>
 
       <div class="recommended_product">
-        <img class="recommended_product_img" src="http://www.thinkpenguin.com/files/imagecache/product/librecmc-router-v2_0.jpg" alt="ThinkPenguin Wi-Fi N router" />
+        <img class="recommended_product_img" src="http://static.fsf.org/nosvn/images/thinkpenguin_router.jpg" alt="ThinkPenguin Wi-Fi N router" />
         <h4 class="title">ThinkPenguin Wi-Fi N router</h4>
         <p>High speed wireless router running <a href="https://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> LibreCMC operating system. Certified to <a href="https://www.fsf.org/ryf">Respects Your Freedom</a>.</p>
 
 
     <p>This page 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>Lulzbot 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://static.fsf.org/nosvn/ryf/taz2.jpg">https://static.fsf.org/nosvn/ryf/taz2.jpg.</a>
+    <p>Lulzbot 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>
+      <br>Based on a work at <a href="https://www.lulzbot.com/news/press-materials">https://www.lulzbot.com/news/press-materials.</a>
     </p>
 
     <p>Replicator 2 by FSF is licensed under a Creative Commons Attribution 2.0 Generic.
 
     <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>
       <br>Retrieved from <a href="http://commons.wikimedia.org/wiki/File:Macbook_Pro_PSD.png">http://commons.wikimedia.org/wiki/File:Macbook_Pro_PSD.png</a>.</p>
     <p>Astounding Stories 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>Retrieved from <a href="http://www.gutenberg.org">http://www.gutenberg.org</a>.</p>
 
-    <p>The Amazon.com logo is public domain but is a registered trademark.</p>
+    <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>Replicant by Paul Kocialkowski 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>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>The iOS logo is a registered trademark.</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 Google Drive logo is public domain but may be subject to trademark laws.</p>
+
     <p>The Media Goblin graphic is public domain.</p>
-    <p>The YouTube logo is public domain but may be subject to trademark laws.</p>
 
   </div>
   <!-- end licenses-->