Various fiddly work.
authorZak Rogoff <zak@fsf.org>
Sat, 21 Nov 2015 02:10:34 +0000 (21:10 -0500)
committerZak Rogoff <zak@fsf.org>
Sat, 21 Nov 2015 02:10:34 +0000 (21:10 -0500)
2015/givingguide.html

index 7deb046acf14c05478c7577dc19cfd92845ccd76..61c714a57cf404c359938b983bb5b53af18fa00d 100755 (executable)
@@ -53,7 +53,7 @@
 
                 <div class="intro_wrapper">
                     <h2>Are you giving your loved ones tech gifts they can use freely, or gifts which put someone else in control?</h2>
-                    <p>Electronics are popular gifts for the holidays, but people often overlook the restrictions that manufacturers slip under the wrapping paper. From remote deletion of files to harsh rules about copying and sharing, some gifts take more
+                    <p>Electronics are popular gifts, but people often overlook the restrictions that manufacturers slip under the wrapping paper. From remote deletion of files to harsh rules about copying and sharing, some gifts take more
                         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>
                         <img class="product_img" src="//static.fsf.org/nosvn/images/taz4.png" alt="TAZ 4.0" />
                     </div>
 
-                    <h4 class="title">Lulzbot TAZ 4.0</h4>
+                    <h4 class="title">Lulzbot TAZ 4.0 FIXME: replace with the copy Harris gives you, or update to this year</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>
 
                 <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
+                        </li>
+                <li>
+                        The included LibreCMC operating system is highly configurable and extensible. FIXME: examples of extensions?
+                </li>
                     <li>
-                        High speed wireless router running <a href="https://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> LibreCMC operating system.
-                    </li>
-
-                    <li>
-                        Certified to <a href="https://www.fsf.org/ryf">Respects Your Freedom</a>.     </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>.
+                </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/linksys-WRT1900AC.png" alt="Linksys WRT1900AC Wireless AC Router" />
+                        <img class="product_img" src="http://www.techspot.com/images/products/routers/org/1691824022_1532911738_o.jpg" alt="Linksys WRT1900AC Wireless AC Router" />
                     </div>
 
-                    <h4 class="title">Linksys WRT1900AC Wireless AC Router</h4>
+                    <h4 class="title">ISP-provided Routers</h4>
                     <ul>
                         <li>
-                            PLACEHOLDER bullets that are bad.
+                        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.
                         </li>
-
                         <li>
-                            Angry, angry placeholder bullets.                        </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
+                        </li>
                     </ul>
 
                 </div>
                                 <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 GNU/Linux laptop with free boot firmware</h4>
+                            <h4 class="title">Minifree T400 GNU/Linux laptop</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>PLACEHOLDER RYF certification/libreboot bullet. Maybe first commercially available...?</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>
 
                                 <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/libiquity-x200.png" alt="Libiquity X200 Notebook with Libreboot" />
                             </div>
 
-                            <h4 class="title">Libiquity GNU/Linux laptop with free boot firmware</h4>
+                            <h4 class="title">Libiquity Taurinus X200 GNU/Linux laptop</h4>
 
                             <ul>
 
                                     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>PLACEHOLDER RYF certification/libreboot bullet. Maybe first commercially available...?</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>-->
                             </ul>
-
                         </div>
 
                         <div class="proprietary">
 
                             </div>
 
-                            <h4 class="title">Apple Macbook Pro</h4>
+                            <h4 class="title">FIXME A laptop that has AMT or an Apple Macbook Air or other</h4>
                             <ul>
                                 <li>
                                     Runs on proprietary software that restricts the user's freedoms.
                                 Dependent on mandatory upgrades and devices that don't support older versions of Windows.
                             </li>
                         </ul>
-
-
                     </div>
 
                     <!-- 'buy/download' and 'avoid' buttons -->
                             <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/tehnoetic-s2.png" alt="Replicant" />
                         </div>
 
-                        <h4 class="title">Replicant</h4>
+                        <h4 class="title">Tehnoetic S2 FIXME: check that Tiberiu's ok with this being here</h4>
                         <ul>
                             <li>
-                                Fully free software, based on Android.
+                                Runs the Replicant fully free operating system, based on Android. FIXME: why isn't Replicant endorsed?
                             </li>
-
                             <li>
-                                <a href="http://redmine.replicant.us/projects/replicant/wiki/ReplicantStatus#Replicant-42">
-                                    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.)
+                                FIXME: something about F-droid
                             </li>
                         </ul>
 
                 <!-- Recommended Section -->
 
                 <div class="recommended">
-                    <h1 class="topic_title">More Recommended Products</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>
-                            <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>
-                            </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>
-                            <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>
-                            <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>
-                            </div>
-                        </div>
-                        <p class="remark"> If you have ideas for more gifts that can be given freely, submit your recommendations to our
-                            <a href="http://libreplanet.org/wiki/Group:Giving_Guide_Suggestions">growing page</a>.
-                        </p>
-
-                    </div>
-
                     <!--recommended charities-->
-
                     <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>,