edits, more products, more links, image.

[fsf-giving-guide.git] / v8 / givingguide.html

diff --git a/v8/givingguide.html b/v8/givingguide.html
index 4c38568b8789b277d4144b0ee07ce7c7c2f36c63..02a6d2a99fd4db0307e15b7e0c8be4474fe07b69 100644 (file)
--- a/v8/givingguide.html
+++ b/v8/givingguide.html
@@ -104,7 +104,7 @@
             <h1>Give the gift of freedom!</h1>
 
            <p>A new phone or computer can be the highlight of the holidays, but with proprietary software lurking under the wrapping paper, your thoughtful gift may be more naughty than nice.</p>
             <h1>Give the gift of freedom!</h1>
 
            <p>A new phone or computer can be the highlight of the holidays, but with proprietary software lurking under the wrapping paper, your thoughtful gift may be more naughty than nice.</p>

-<p>This guide replaces these holiday humbugs with better devices from ethical companies&mdash;no creepy remote deletion of files, no punitive and mean rules about copying and sharing. Just products and software that respect the freedom and privacy of your loved ones: gifts you can feel good about.</p>
+<p>This guide replaces these holiday humbugs with better devices from ethical companies&mdash;no <a href="https://gnu.org/proprietary">creepy remote deletion of files or  punitive and mean rules about copying and sharing</a>. Just products and software that respect the freedom and privacy of your loved ones: gifts you can feel good about.</p>

 <p>Plus, our crib notes below will help you explain why this version is better than the one they've heard of (and spread the word about software freedom, too).</p>
           </div>
         </div>
 <p>Plus, our crib notes below will help you explain why this version is better than the one they've heard of (and spread the word about software freedom, too).</p>
           </div>
         </div>


@@ -220,7 +220,7 @@
              <li>Note: While the main processor is exclusively running free software, the modem processor runs a Samsung nonfree system.</li>
             </ul>
 
              <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: iPhones</h5>
+            <h5 class="text-center">Stay away from: iPhone X</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>
             <ul class="cons">
               <li>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</li>
               <li>


@@ -229,6 +229,7 @@
               <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>
                 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>Also bad: iPhone 8 Plus, iPhone 8</li>

             </ul>
           </div>
           <!--End Bad-->
             </ul>
           </div>
           <!--End Bad-->


@@ -316,6 +317,7 @@
               <!-- 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>
             </ul>
               <!-- 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>
             </ul>

+           <li>Also bad: Dell Inspiron Touch-Screen, HP Omen, and MacBook Pro</li>

           </div>
           <!--End Bad-->
         </div>
           </div>
           <!--End Bad-->
         </div>


@@ -330,9 +332,6 @@
           <div class="good col-md-6 col-sm-6">
             <img src="img/products/x200.png" alt="x200" class="center-block" />
             <h5 class="text-center">X200 with GNU/Linux</h5>
           <div class="good col-md-6 col-sm-6">
             <img src="img/products/x200.png" alt="x200" class="center-block" />
             <h5 class="text-center">X200 with GNU/Linux</h5>

-
-
-

            
             <!-- Buy/Download Button   -->
             <a id="get-item-compact" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-compact" aria-expanded="false" aria-controls="sellers-compact" style="display:none">
            
             <!-- Buy/Download Button   -->
             <a id="get-item-compact" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-compact" aria-expanded="false" aria-controls="sellers-compact" style="display:none">


@@ -411,6 +410,7 @@
                  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>
                  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>Also bad: MacBook Air, Asus Zenbook, Lenovo Ideapad</li>

             </ul>
           </div>
           <!--End Bad-->
             </ul>
           </div>
           <!--End Bad-->


@@ -483,7 +483,8 @@
  <li>Runs on proprietary software 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>Runs on proprietary software 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>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>Also bad: Lenovo Yoga, iPad, Windows Ink</li>

             </ul>
           </div>
           <!--End Bad-->
             </ul>
           </div>
           <!--End Bad-->


@@ -817,8 +818,8 @@
       <!--End Container-->
 
 
       <!--End Container-->
 
 

-           <h1 class="title text-center">Books, Music, and Video</h1>
-      
+      <h1 class="title text-center">Books, Music, and Video</h1>
+                    <img src="img/products/bookshelf.png" alt="a shelf of books, with two layers, organized by color." class="center-block img-responsive" />

       <!--ebooks-->
       <div class="container">
         <h3 class="title text-center">Books</h3>
       <!--ebooks-->
       <div class="container">
         <h3 class="title text-center">Books</h3>


@@ -1061,6 +1062,7 @@
                       <li>LulzBot 3D printer photo by Aleph Objects is licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
                       <li>ThinkPenguin with GNU and both ThinkPenguin router images by ThinkPenguin are licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
                       <li>Technoethical Replicant N2, Wi-Fi Dongle, and X200T by Technoethical 2016-2017 licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.</li>
                       <li>LulzBot 3D printer photo by Aleph Objects is licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
                       <li>ThinkPenguin with GNU and both ThinkPenguin router images by ThinkPenguin are licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
                       <li>Technoethical Replicant N2, Wi-Fi Dongle, and X200T by Technoethical 2016-2017 licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.</li>

+                     <li>Photo of bookshelf by <a href="https://www.flickr.com/photos/seeminglee/4556156477/">See-ming Lee</a> licensed under <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC BY-SA 2.0</a>

                   </div>
                 </div>
               </div>
                   </div>
                 </div>
               </div>