fixed viking/vikings linking issue with promotions.

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

diff --git a/v8/givingguide.html b/v8/givingguide.html
index d70f685513e5cc0c4d39ecf4816d571d6156066f..169c0a889c35cdca7923b9607aa8c19892c81b6a 100644 (file)
--- a/v8/givingguide.html
+++ b/v8/givingguide.html
@@ -129,7 +129,7 @@
           <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>
@@ -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>
 
-            <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>
@@ -229,7 +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>Also avoid: iPhone 8 Plus, iPhone 8</li>
+             <li>Avoid: iPhone X, iPhone 8 Plus, iPhone 8, and other models.
             </ul>
           </div>
           <!--End Bad-->
@@ -316,8 +316,7 @@
               </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-Scree and HP Omen.</li>
-            <li>Also avoid: 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-->
@@ -358,7 +357,7 @@
                 </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>
             
@@ -383,7 +382,7 @@
                 </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 -->
@@ -411,8 +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>
-             <li>Avoid: MacBook Air</li>
-             <li>Also avoid: Asus Zenbook, Lenovo Ideapad</li>
+             <li>Avoid: MacBook Air (and MacBook Pro)</li>
             </ul>
           </div>
           <!--End Bad-->
@@ -482,11 +480,8 @@
              </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>Also avoid: Lenovo Yoga, iPad, Windows Ink</li>
+               <li><a href="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="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-->