fixed links in giving guide.
[fsf-giving-guide.git] / v8 / givingguide.html
index 152e7ac957741fc0f295e64a74dcda74f6a34f3e..c8e4aa317488d75968157a3bcaf8ccc9aed1c3bb 100644 (file)
 -->
 
 <body>
+  <!-- banners go here -->
+  <!--
   <iframe src="//static.fsf.org/nosvn/banners/2017fundraiser/" width="100%" height="100%" scrolling="no" style="overflow: hidden; border: 0 none; display: block;"></iframe>
+  -->
+  <iframe src="//static1p.fsf.org/nosvn/banners/2018fundraiser/" width="100%" height="100%" scrolling="no" style="overflow: hidden; margin: 0; border: 0 none; display: block;"></iframe>
   <nav class="navbar navbar-default">
     <div class="container-fluid">
       <!-- Brand and toggle get grouped for better mobile display -->
         <div class="row">
           <!-- Begin Action -->
           <div class="action col-md-4 col-sm-4 text-center">
-            <a class="action-button" href="https://www.fsf.org/share?u=https://www.fsf.org/givingguide/&amp;t=Check out the Free Software Foundation Ethical Tech Giving Guide">Tell your friends</a>
+            <a class="action-button" href="https://www.fsf.org/share?u=https://www.fsf.org/givingguide/&t=Check%20out%20the%20Free%20Software%20Foundation%20Ethical%20Tech%20Giving%20Guide">Tell your friends</a>
             <p>
               Use <span class="label label-default">#givefreely</span>. You might get a gift out of it!
             </p>
           <div class="action col-md-4 col-sm-4 text-center">
             <a class="action-button" href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Host a Giveaway</a>
             <p>
-              Download the printable version.
+              Printable version coming soon!
             </p>
 
           </div>
             </noscript>
             <!-- End Buy/Download button -->
 
-            <ul class="pros">
- <p>Why it's cool: Ever feel like every time you pick up your smartphone, someone is watching you? This may not cut off their access entirely, but it will make their job a little harder.</p>
+           <p>Why it's cool: Ever feel like every time you pick up your smartphone, someone is watching you? This may not cut off their access entirely, but it will make their job a little harder.</p>
 
 <p> Your smartphone is so much more than a phone: it's a tiny computer you carry with you every day, and for many people around the world, it's their only internet-enabled device. Choosing one of these phones lets you bring software freedom everywhere you go.</p>
 
-<p>         You can also get an <a href="https://tehnoetic.com/tehnoetic-s2-phone-replicant">S2</a> or <a "https://tehnoetic.com/mobile-devices/tehnoetic-s3-phone-replicant">S3</a>, complete with Replicant.</p>
-            </ul>
+<p>You can also get an <a href="https://tehnoetic.com/tehnoetic-s2-phone-replicant">S2</a> or <a href="https://tehnoetic.com/mobile-devices/tehnoetic-s3-phone-replicant">S3</a>, complete with Replicant.</p>
+
           </div>
           <!--End Good-->
 
              <li>Note: While the main processor is exclusively running free software, the modem processor runs a Samsung nonfree system.</li>
             </ul>
 
-            <h5 class="text-center">Stay away from: iPhone X</h5>
+            <h5 class="text-center">Stay away from: iPhone</h5>
             <ul class="cons">
               <li>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</li>
               <li>
               <li>
                 Apple uses <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">Digital Restrictions Management (DRM)</a> to block competing software.
               </li>
-             <li>Avoid: iPhone 8 Plus, iPhone 8</li>
+             <li>Avoid: iPhone X, iPhone 8 Plus, iPhone 8, and other models.
             </ul>
           </div>
           <!--End Bad-->
               </li>
               <!-- Commented out pending citation or confirmation <li>Includes Management Engine, a hardware-based backdoor that gives Intel a permanent backdoor into your computer.</li>-->
               <li>Mandatory Windows updates force users to test potentially unstable new versions. <a href="https://www.fsf.org/campaigns/windows">Read more about Windows's abuses.</a></li>
-            <li>Avoid: Dell Inspiron Touch-Screen, HP Omen, and MacBook Pro</li>
+            <li>You can find Windows on computers like the Dell Inspiron Touch-Screen, HP Omen, and Lenovo Ideapad.</li>
             </ul>
           </div>
           <!--End Bad-->
                   Libiquity's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified, but shipping is limited to the US. <a href="#libiquity-promotion">Sale details.</a>
 
                 </p>
-                <a href="https://tehnoetic.com/tet-x200" class="seller action-button">Technoethical</a>
+
+                               <a href="https://minifree.org/product/libreboot-x200/" class="seller action-button">Minifree</a>
                 <p class="sale-info links">
-                  Technoethical's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. Global shipping is available. <a href="#technoethical-promotion">Sale details.</a>
-                </p>
+                  Minifree's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. </p>
+
+               
+                <a href="https://tehnoetic.com/tet-x200" class="seller action-button">Technoethical</a><br>
+                <p class="sale-info links">
+               <!--   Technoethical's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. Global shipping is available. <a href="#technoethical-promotion">Sale details.</a>
+                </p> -->
                    <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a>
                 <p class="sale-info links">
-                  Vikings's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. Global shipping is available. <a href="#viking-promotion">Sale details.</a>
+                  Vikings's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. Global shipping is available. <a href="#vikings-promotion">Sale details.</a>
 
                 </p>
             
                 <p class="sale-info links">
                   Libiquity's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a>-certified, but shipping is limited to the US. <a href="#libiquity-promotion">Sale details.</a>
                 </p>
+                               <a href="https://minifree.org/product/libreboot-x200/" class="seller action-button">Minifree</a>
+                <p class="sale-info links">
+                  Minifree's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. </p>
+               
                 <a href="https://tehnoetic.com/tet-x200" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
                   Technoethical's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified, and global shipping is available. <a href="#technoethical-promotion">Sale details.</a>
                 </p>
                            <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a>
                 <p class="sale-info links">
-                  Viking's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. Global shipping is available. <a href="#viking-promotion">Sale details.</a></p>
+                  Viking's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. Global shipping is available. <a href="#vikings-promotion">Sale details.</a></p>
  </div>
             </noscript>
             <!-- End Buy/Download button -->
             <ul class="pros">
              <p>Why it's cool: Take it to the office, take it to the cafe, take it to class, take it home and set it up on the counter so you can rock out while you cook. Do all of this the easy way.</p>
 
-<p>This machine is made to go everywhere with you, and thanks to Libiquity and Technoethical, you can have your mobility and your freedom too.</p>
+<p>This machine is made to go everywhere with you and thanks to our friends who make RYF products, you can have your mobility and your freedom too.</p>
             </ul>
 
           </div>
                  Apple app stores use <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>Avoid: MacBook Air, Asus Zenbook, Lenovo Ideapad</li>
+             <li>Avoid: MacBook Air (and MacBook Pro)</li>
             </ul>
           </div>
           <!--End Bad-->
              </ul>
             <h5 class="text-center">Stay away from: Microsoft Surface</h5>
               <ul class="cons">
- <li>Runs on <a href="https://gnu.org/proprietary">proprietary software</a> that profits from treating the user as a product&mdash;<a href="https://edri.org/microsofts-new-small-print-how-your-personal-data-abused/">each account is assigned an advertising ID</a> to help Microsoft sell user
-                data.
-              </li>
- <li>Mandatory Windows updates force users to test potentially unstable new versions. <a href="https://www.fsf.org/campaigns/windows">Read more about Windows's abuses.</a></li>
- <li>Avoid: Lenovo Yoga, iPad, Windows Ink</li>
+               <li><a href="https://arstechnica.com/information-technology/2015/07/windows-10-updates-to-be-automatic-and-mandatory-for-home-users/">Forced "upgrades"</a> give Microsoft a backdoor to do anything they want with your apps or data--including <a href="https://www.ghacks.net/2015/11/24/beware-latest-windows-10-update-may-remove-programs-automatically/">removing them</a>.</li>
+               <li>When major security bugs are found, the <a href="https://web.archive.org/web/20130622044225/http://blogs.computerworlduk.com/open-enterprise/2013/06/how-can-any-company-ever-trust-microsoft-again/index.htm">NSA gets the option to exploit them</a> before they're fixed.
             </ul>
           </div>
           <!--End Bad-->
 <p>Why it's cool: Sometimes you need heavy-duty computing power that a laptop just can't provide.</p>
 
 <p>Gamers, video editors, and other users may want or need a more powerful machine – a desktop is the answer when you really need that extra push. Also good for users who want a bigger screen.</p>
-             <p>Vikings offers three desktop computers. (ThinkPenguin also <a href="https://www.thinkpenguin.com/catalog/desktop-computers-gnu-linux">has desktops</a>.)
             </ul>
 
           </div>
             <ul class="pros">
              <p>Many consider music essential to the richness of the human experience. Thanks to the <a href="https://www.defectivebydesign.org/guide/audio">many artists, producers, record labels, and shops</a> highlighted on <a href="https://defectivebydesign.org">Defective by Design</a>, the rights-respecting options are nearly endless. Check out music from great labels and artists, including:</p>
               <li><a href="http://www.dischord.com/">Dischord Records</a>, a classic punk label providing music since 1980.</li>
-             <li><a href="https://folkways.si.edu/">Folkways</a>, courtesy of the Smithsonian Institute.</li>
              <li><a href="https://www.emusic.com/">Emusic</a> is the Web's second largest music store.</li>
+             <li><a href="https://folkways.si.edu/">Folkways</a>, courtesy of the Smithsonian Institute.</li>
            </ul>
 
           </div>
               <p>You can <a href="https://www.defectivebydesign.org/guide/video">find your DRM-free video fix</a> at places including:</p>
              <li><a href="http://www.comedydirect.com/">ComedyDirect</a> can make you laugh while storing your videos locally.</li>
              <li><a href="https://archive.org/details/movies">Moving Image Archive</a> is a section of <a href="https://archive.org">Archive.org</a> containing thousands of film releases, available to stream or download.</li>
-             <li><a href="https://durian.blender.org/download/">Sintel</a> has a huge selection of DRM-free films made with free software.</li>
              <li><a href="http://wolfeondemand.com/">WolfeOnDemand</a> provides for all of your LGBTQ watching desires.</li>
            </ul>