From 2d73ba2482da6225d2e280f1aa2598f292f10e5a Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@montage.office.fsf.org>
Date: Fri, 21 Nov 2014 13:14:19 -0500
Subject: [PATCH] tweaks

---
 givingguide.html | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/givingguide.html b/givingguide.html
index a824ceb..fbd39ec 100755
--- a/givingguide.html
+++ b/givingguide.html
@@ -115,17 +115,17 @@
         <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>
 
@@ -162,9 +162,7 @@
 
         <h4 class="title">Lulzbot TAZ 4.0</h4>
         <ul>
-          <li>
-            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.
-          </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.
@@ -174,6 +172,9 @@
             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>
@@ -187,15 +188,15 @@
         <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>
 
@@ -205,7 +206,7 @@
       <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>
 
@@ -273,7 +274,7 @@
       <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>
 
@@ -304,7 +305,7 @@
           <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>
@@ -341,7 +342,7 @@
       <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>
 
@@ -367,12 +368,13 @@
           <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>
@@ -404,7 +406,7 @@
       <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>
 
@@ -458,7 +460,7 @@
       <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>
 
@@ -514,12 +516,12 @@
       <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>
@@ -582,7 +584,7 @@
       <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>
 
@@ -650,7 +652,7 @@
       <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>
 
@@ -734,6 +736,8 @@
 
     <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>
-- 
2.25.1