From 078fbd64406214cca6dc4e08b602ec5df0c9040d Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@fsf.org>
Date: Tue, 24 Nov 2015 18:05:36 -0500
Subject: [PATCH] Many updates to images and copy, getting close to complete
 draft.

---
 2015/givingguide.html | 202 ++++++++++++------------------------------
 1 file changed, 55 insertions(+), 147 deletions(-)

diff --git a/2015/givingguide.html b/2015/givingguide.html
index 77fd3bd..d4c56ec 100755
--- a/2015/givingguide.html
+++ b/2015/givingguide.html
@@ -68,7 +68,7 @@
         <!-- Sharing -->
         <div class="share">
             <span class="share_wrapper">
-                <a href="https://www.fsf.org/share?u=https://www.fsf.org/givingguide/2014/&t=Check%20out%20the%20Free%20Software%20Foundation%20Holiday%20Giving%20Guide">Share (#givefreely)</a>
+                <a href="https://www.fsf.org/share?u=https://www.fsf.org/givingguide/&t=Check out the Free Software Foundation Ethical Tech Giving Guide">Share (#givefreely)</a>
             </span>
         </div>
         <!-- end sharing-->
@@ -81,44 +81,32 @@
                 <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/givingguide/images/libiquity-x200.png" alt="Libiquity X200 Notebook with Libreboot" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/libiquity-x200.png" alt="Libiquity X200 with Libreboot" />
                     </div>
 
-                    <h4 class="title">Libiquity Taurinus X200 GNU/Linux laptop</h4>
+                    <h4 class="title">Libiquity Taurinus X200 with GNU/Linux</h4>
 
                     <ul>
-                        <li>
-                            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>
-                            Based on a Lenovo X200, with FIXME tech stats.
-                        </li>
-                        <li><a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, right down to its libreboot firmware.</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>Comes with the free, transparent and modifiable Trisquel GNU/Linux operating system.</li>
+                    <li>Durable hardware is meant to last and easy to repair.</li>
+                    <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
+                    <li><a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, right down to its libreboot firmware.</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="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/Macbook_Pro.png" alt="Apple Macbook Pro" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/lenovo-u31.png" alt="Lenovo U31" />
 
                     </div>
 
-                    <h4 class="title">FIXME A laptop that has AMT or an Apple Macbook Air or other</h4>
+                    <h4 class="title">Lenovo U31 with Windows</h4>
                     <ul>
-                        <li>
-                            Runs on proprietary software that restricts the user's freedoms.
-                        </li>
-
-                        <li>
-                            Apple's App Store uses <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to restrict what you can do with your purchases.
-                        </li>
-                        <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a>.</li>
-                        <li>
-                            Planned obsolescence: business model forces you to buy new devices frequently.
-                        </li>
-                    </ul>
+                        <li>Runs on proprietary software that profits from treating the user as a product -- each account is assigned an advertising ID to help Microsoft to sell user data.</li>
+                        <li>Intel Management Engine is a hardware-based backdoor that gives various companies a permanent backdoor into your computer.</li>
+                        <li>Mandatory Windows updates force users to test potentially unstable new versions.</li>
+                </ul>
                 </div>
 
                 <!-- 'buy/download' and 'avoid' buttons -->
@@ -142,16 +130,16 @@
                 <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/givingguide/images/tehnoetic-s2.png" alt="Replicant" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/tehnoetic-s2.png" alt="Tehnoetic S2 with Replicant" />
                     </div>
 
-                    <h4 class="title">Tehnoetic S2 FIXME: check that Tiberiu's ok with this being here</h4>
+                    <h4 class="title">Tehnoetic S2 with Replicant</h4>
                     <ul>
                         <li>
-                            Runs the Replicant fully free operating system, based on Android. FIXME: why isn't Replicant endorsed?
+                            Runs the <a href="http://www.replicant.us">Replicant</a> free operating system, based on Android, though some low-level firmware is nonfree.
                         </li>
                         <li>
-                            FIXME: something about F-droid
+                            Features F-droid, the free software catalogue that makes it easy to get all the applications you need without sacrificing control of your phone.
                         </li>
                     </ul>
                 </div>
@@ -166,7 +154,7 @@
                     <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.
+                            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.
@@ -179,7 +167,7 @@
                 <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 href="https://tehnoetic.com/tehnoetic-s2-phone-replicant"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
                             </a>
                         </div>
 
@@ -193,7 +181,7 @@
             <!-- end section_wrapper-->
 
             <div class="section_wrapper">
-                <h3 class="main_title">More Powerful Laptops FIXME:verify</h3>
+                <h3 class="main_title">Full-Sized Laptops</h3>
 
                 <div class="free">
                     <div class="product">
@@ -201,19 +189,15 @@
                         <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/minifree-t400.png" alt="Minifree T400 Notebook with Libreboot" />
                     </div>
 
-                    <h4 class="title">Minifree T400 GNU/Linux laptop</h4>
+                    <h4 class="title">Minifree T400 with GNU/Linux</h4>
 
                     <ul>
-                        <li>
-                            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>
-                            Based on a Lenovo T400, with FIXME tech stats.
-                        </li>
-                        <li>                            <a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, right down to its libreboot firmware.</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>
-
+                        <ul>
+                        <li>Comes with the free, transparent and modifiable Trisquel GNU/Linux operating system.</li>
+                        <li>Durable hardware is meant to last and easy to repair.</li>
+                        <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
+                        <li><a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, right down to its libreboot firmware.</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">
@@ -222,7 +206,7 @@
                         <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/Macbook_Pro.png" alt="Apple Macbook Pro" />
                     </div>
 
-                    <h4 class="title">Apple Macbook Pro</h4>
+                    <h4 class="title">Apple Macbook Pro with OSX</h4>
                     <ul>
                         <li>
                             Runs on proprietary software that restricts the user's freedoms.
@@ -261,40 +245,31 @@
                 <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/taz4.png" alt="TAZ 4.0" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/lulzbot-mini.png" alt="Lulzbot Mini" />
                     </div>
 
-                    <h4 class="title">Lulzbot TAZ 4.0 FIXME: replace with the copy Harris gives you, or update to this year</h4>
+                    <h4 class="title">Lulzbot Mini</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.
-                        </li>
-
-                        <li>
-                            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>-->
+                        <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.</li>
+                        <li>Ease of use features like self-leveling and self-cleaning.</li>
+                        <li>Hardware designs available to make modification and improvement easy. Standardized material format allows 3D printing with plastics, wood-, stone-, bamboo-, rubber-, and metal-like materials.</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/fsforg/img/MakerbotPrepped.png" alt="Makerbot Replicator 2" />
+                    <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/makerbot-mini.png" alt="Makerbot Replicator Mini" />
                 </div>
 
-                <h4 class="title">Makerbot Replicator 2</h4>
+                <h4 class="title">Makerbot Replicator Mini</h4>
                 <ul>
                     <li>
                         MakerWare software is proprietary, restricting freedom and stifling innovation.
                     </li>
 
                     <li>
-                        Recently announced an increasingly proprietary approach, further distancing itself from the free software community.
+                        MakerBot was founded with a more freedom-respecting appraoch, but has since locked down its code and distanced itself from the community that formed around it.
                     </li>
                 </ul>
 
@@ -304,7 +279,7 @@
             <div class="buy_avoid">
                 <div class="buy_avoid_wrapper">
                     <div class="buy">
-                        <a href="https://www.lulzbot.com/products/lulzbot-taz-4-3d-printer/"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                        <a href="https://www.lulzbot.com/store/printers/lulzbot-mini"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
                         </a>
                     </div>
 
@@ -318,24 +293,21 @@
         <!-- end section_wrapper -->
 
         <div class="section_wrapper">
-            <h3 class="main_title">Routers</h3>
+            <h3 class="main_title">WiFi Routers</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/givingguide/images/librecmc-router.jpg" alt="TAZ 4.0" />
+                    <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/librecmc-router.jpg" alt="ThinkPenguin Router" />
                 </div>
 
                 <h4 class="title">ThinkPenguin Router</h4>
                 <ul>
                     <li>
-                        Your network traffic is safe with this device because the software it runs is audited by independent experts. FIXME: verify
+                    Safely segregate privacy sensitive network traffic from internet traffic to further improve security.
                     </li>
                     <li>
-                        The included LibreCMC operating system is highly configurable and extensible. FIXME: examples of extensions?
-                    </li>
-                    <li>
-                        As free as can be: runs the <a href="https://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> LibreCMC operating system on hardware that is certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.
+                    As free as can be: runs the <a href="https://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> LibreCMC operating system on hardware that is certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.
                     </li>
                 </ul>
             </div>
@@ -343,16 +315,16 @@
             <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="http://www.techspot.com/images/products/routers/org/1691824022_1532911738_o.jpg" alt="Linksys WRT1900AC Wireless AC Router" />
+                    <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/isp-router.png" alt="Generic ISP-provided router" />
                 </div>
 
                 <h4 class="title">ISP-provided Routers</h4>
                 <ul>
                     <li>
-                        Proprietary firmware means that there's no way for you to know whether it's spying on you -- and it gets to handle all your Internet traffic as well as local print jobs, file transfers, and communications.
+                        Proprietary firmware means that there's no way for you to know whether it's spying on you -- and it handles all your Internet traffic as well as local print jobs and file transfers.
                     </li>
                     <li>
-                        Subject to surprise firmware updates from your cable provider, likely one of the same companies trying to lock down the Internet and break net neutrality. FIXME: verify
+                        Many models are subject to remote firmware updates from your cable provider, likely one of the same companies trying to lock down the Internet and break net neutrality.
                     </li>
                 </ul>
 
@@ -470,7 +442,7 @@
                     <ul>
                         <li>Proprietary software controlled by Adobe.</li>
                         <li>Prefers locked-down proprietary formats.</li>
-                        <li>Requires costly upgrades to stay up to date.</li>
+                        <li>Shuts down if its DRM is unable to verify the costly required subscription, even if it's actually up to date .</li>
                     </ul>
 
                 </div>
@@ -491,70 +463,6 @@
                 <!-- end buy-avoid -->
             </div> <!-- end section_wrapper -->
 
-            <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> <!-- end section_wrapper -->
-
             <div class="section_wrapper">
                 <h3 class="main_title">Gift Cards</h3>
 
@@ -567,7 +475,7 @@
                     <h4 class="title">FSF Membership Card</h4>
                     <ul>
                         <li>Join over 3,000 active members working to make a better world built on free software.</li>
-                        <li>Enjoy a host of <a href="https://www.fsf.org/associate/benefits">member benefits</a>, including admission to the <a href="http://libreplanet.org/wiki/LibrePlanet:Conference">yearly LibrePlanet conference</a>.</li>
+                        <li>Enjoy a host of <a href="https://www.fsf.org/associate/benefits">member benefits</a>, including admission to the <a href="https://www.libreplanet.org/conference">yearly LibrePlanet conference</a>.</li>
                         <li>Membership donations are tax-deductible in the US. For a smaller gift, <a href="https://www.fsf.org/donate">donate in a friend's name</a>.</li>
                     </ul>
 
@@ -613,13 +521,13 @@
 
     <!-- Recommended Section -->
         <div class="recommended">
-          <h1 class="topic_title">More Recommended Products</h1>
+          <h1 class="topic_title">More Products Certified to Respect Your Freedom</h1>
           <div class="recommend_wrapper">
 
             <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">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">Respect Your Freedom</a>. Discount code: FSFGIVING.</p>
+              <p>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. Discount code: FSFGIVING.</p>
               <div class="buy">
                 <a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
                 </a>
@@ -627,9 +535,9 @@
             </div>
 
             <div class="recommended_product">
-              <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/givingguide/images/thinkpenguin-mini-router.png" alt="ThinkPenguin mini router" />
+              <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/givingguide/images/thinkpenguin-mini-router.png" alt="ThinkPenguin VPN router" />
               <h4 class="title">ThinkPenguin VPN router</h4>
-              <p>FIXME:write</p>
+              <p>Designed to complement your existing router by providing an easy-to-set up VPN that enhances privacy and security. </p>
 
               <div class="buy">
                 <a href="https://www.thinkpenguin.com/gnu-linux/free-software-wireless-n-broadband-router-gnu-linux-tpe-nwifirouter2"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
@@ -638,9 +546,9 @@
             </div>
 
             <div class="recommended_product">
-              <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/givingguide/images/thinkpenguin-long-range-adapter.png" alt="ThinkPenguin long-range adapter FIXME:image" />
-              <h4 class="title">ThinkPenguin long-range adapter FIXME:image</h4>
-              <p>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. Certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</p>
+              <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/givingguide/images/thinkpenguin-long-range-adapter.png" alt="ThinkPenguin long-range adapter" />
+              <h4 class="title">ThinkPenguin long-range adapter</h4>
+              <p>Longer range than its smaller cousin, can be further upgraded with a larger antenna.</p>
               <div class="buy">
                 <a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
                 </a>
@@ -651,7 +559,7 @@
             </p>
           </div>
             <!--recommended charities-->
-            <a name="charities"><h1 class="topic_title">Recommended charities for holiday donations</h1></a>
+            <a name="charities"><h1 class="topic_title">Recommended organizations 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>,
@@ -671,7 +579,7 @@
 
             <!-- Licenses Section -->
             <div class="licenses">
-                <h1 class="topic_title">Licenses</h1>
+                <h1 class="topic_title">Licenses FIXME:update</h1>
                 <p>This page by the Free Software Foundation is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 Unported.</a>
                 </p>
                 <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>
-- 
2.25.1