X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=blobdiff_plain;f=v12%2Fgivingguide.html;h=430c5988b38a6399c9e270ec13cca069ce1512f8;hp=39f6786ce4f2ad2a12db14bdfaab69a422ee37a5;hb=HEAD;hpb=55ebee4fd34dd1de3b2bc5579ebdd773e058993b

diff --git a/v12/givingguide.html b/v12/givingguide.html
index 39f6786..a66943c 100644
--- a/v12/givingguide.html
+++ b/v12/givingguide.html
@@ -143,7 +143,7 @@
 <p>The headlines are filled with stories of "Big Tech" abuses, using the
 tight control they have over their devices and platforms to keep us
 powerless and dependent on them. There's no time at which this is more
-evident than in the holiday season, when they martial all of the
+evident than in the holiday season, when they marshal all of the
 advertising at their disposal to sell us things that we don't need --
   and worse, products that don't respect our basic freedoms.</p>
 			<h4>This year, choose freedom</h4>
@@ -165,7 +165,7 @@ give them the one gift that keeps on giving: freedom.</p>
           <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>
             <p>
-			  Use the hashtag <span class="label label-default">#UserFreedom</span> on social media sites like <a href="https://mastodon.social">Mastodon</a>, <a href="https://www.gnu.org/software/social/">GNU social</a>, or <a href="https://fsf.org/twitter">Twitter</a>. You might get a gift out of it yourself!
+			  Use the hashtag <span class="label label-default">#UserFreedom</span> on social media sites like <a href="https://joinmastodon.org/#getting-started">Mastodon</a>, <a href="https://www.gnu.org/software/social/">GNU social</a>, or <a href="https://fsf.org/twitter">Twitter</a>. You might get a gift out of it yourself!
             </p>
           </div>
           <!-- End Action -->
@@ -357,9 +357,6 @@ Apple prevents you from installing third-party free software on your own phone,
             <!-- Buy/Download Button   -->
             <a id="get-item-x200" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-x200" aria-expanded="false" aria-controls="sellers-x200" style="display:none">
               BUY
-              <!-- Begin Sale -->
-              <span class="sale" >sale</span>
-              <!-- End Sale -->
 			</a>
             <div class="collapse" id="sellers-x200">
               <div class="center-block seller-group">
@@ -369,7 +366,6 @@ Apple prevents you from installing third-party free software on your own phone,
            	<p>
 		<a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
 		</p>
-				<p>  <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
               </div>
             </div>
 
@@ -384,7 +380,6 @@ Apple prevents you from installing third-party free software on your own phone,
 		<p>
 		<a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
 		</p>
-				<p>				  <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
               </div>
             </noscript>
             <!-- End Buy/Download button -->
@@ -404,7 +399,7 @@ it's the laptop that's most frequently used in the FSF office!</p>
 	  <!--start bad-->
           <div class="good col-md-6 col-sm-6">
 	      <ul class="pros">
-            <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> <a href="https://trisquel.info">Trisquel</a> operating system and <a href="https://libreboot.org">Libreboot</a> firmware.</li>
+            <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> <a href="https://trisquel.info">Trisquel</a> operating system and <a href="https://libreboot.at">Libreboot</a> firmware.</li>
               <li>Durable hardware that's meant to be easy to repair.</li>
               <li>Created by small businesses that replace restrictive components from a stock laptop.</li>
             </ul>
@@ -419,59 +414,6 @@ it's the laptop that's most frequently used in the FSF office!</p>
       </div>
         <!--End Row-->
 
- <div class="container">
-        <div class="row is-table-row">
-          <div class="col-md-5 col-sm-6 recommended-img">
-	    	    <h5 class="text-center">Vikings D8</h5>
-            <img src="img/products/desktop.png" alt="Vikings D8" class="center-block" />
-
-            <!-- Buy/Download Button   -->
-            <a id="get-item-d8" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-d8" aria-expanded="false" aria-controls="sellers-d8" style="display:none;">
-              BUY
-            </a>
-            <div class="collapse" id="sellers-d8">
-              <div class="center-block seller-group">
-                <a href="https://store.vikings.net/ryf-certified-hardware/d8ryf" class="seller action-button">Vikings</a>
-              </div>
-            </div>
-
-            <script>
-            document.getElementById('get-item-d8').style.display = '';
-            </script>
-            <noscript>
-              <div class="center-block seller-group">
-                <p style="color: #6b6b6b">
-                  <strong>Get it from</strong>
-                </p>
-                <a href="https://store.vikings.net/ryf-certified-hardware/d8ryf" class="seller action-button">Vikings</a>
-              </div>
-            </noscript>
-            <ul class="pros">
-<p>Why it's cool: The Vikings D8 is a robust desktop computer that can be scaled up or down according to your needs, and which is capable of doing everything from simple Web browsing and video playback to intense code compilation.</p>
-
-<p>You can order the Vikings D8 installed with the FSF-endorsed <a href="https://trisquel.info">Trisquel</a> distribution of GNU/Linux, a fully free operating system that removes the user-hostile binary-only blobs lurking in the drivers of many common network and graphics cards, or, if you prefer, you can order the D8 installed with any other <a href="https://gnu.org/distros/free-distros.html">free distribution of GNU/Linux</a>.</p>
-</ul>
-</div>
-
-<div class="good col-md-6 col-sm-6">
-<ul class="pros">
-  <li>Want to graduate from the X200? The D8 is higher performing while still just as respectful of your freedom.</li>
-  <li>Has room for three hard drives and four custom case fans.</li>
-  <li>Despite being a mid-tower PC, it runs quietly, allowing you to surf the Web or code in peace.</li>
-			  </ul>
-            <h5 class="text-center">Desktops running Microsoft Windows</h5>
-            <ul class="cons">
-              <li>Windows is <a href="https://gnu.org/proprietary">proprietary software</a> that profits from treating the user as a product. It <a href="https://www.fsf.org/news/the-fsfs-statement-on-windows-10">forces users to consent to data collection</a> for "targeted advertising." <a href="https://www.fsf.org/news/lifes-better-together-when-you-avoid-windows-11">Windows 11</a> is no better.
-              </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>Looking at a computer that includes an Intel CPU? They come with the <a href="https://www.fsf.org/blogs/sysadmin/the-management-engine-an-attack-on-computer-users-freedom">Intel Management Engine</a>, a hardware-based backdoor that gives Intel -- or intruders -- permanent and privileged access to your computer.</li>
-	     </ul>
-          </div>
-          <!--End Bad-->
-        </div>
-        <!--End Row-->
-      <!--End Container-->
-
       <h2 class="title text-center">Cool Devices</h2>
   <!-- cool devices -->
 <div class="container">
@@ -772,7 +714,7 @@ numbers, which aids in password generation and encryption.</p>
   <p>Try these video services and sites instead:</p>
 <ul class="pros">
   <li>Visit the <a href="https://archive.org/details/movies">Moving Internet Archive</a> for free (as in freedom) classic films and art projects.</li>
-<li>The <a href="https://cloud.blender.org/open-projects">Blender Open Movies</a> project has a collection of computer-animated films that were made entirely with <a href="https://blender.org">Blender</a>, an enormously popular free software tool.</li>
+<li>The <a href="https://studio.blender.org/films">Blender Open Movies</a> project has a collection of computer-animated films that were made entirely with <a href="https://blender.org">Blender</a>, an enormously popular free software tool.</li>
 <li><p>Visit the <a href="https://www.defectivebydesign.org/guide/">Guide to DRM-free Living</a> for more suggestions on how to stay a film lover and keep your freedom at the same time.</p></li>
 	    </ul>
 
@@ -888,7 +830,6 @@ numbers, which aids in password generation and encryption.</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>
                     <ul style="list-style: none inside none;">
                       <li>X200 product image in the public domain.</li>
-					  <li>Vikings product images copyright © 2019, Vikings GmbH. Licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li>
 					  <li>NeuG product image copyright © 2020, Free Software Foundation, Inc. Licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li>
                       <li>ThinkPenguin product images © 2019, ThinkPenguin, Inc. Licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li> 
 		      <li>Bookshelf photo copyright © 2010, <a href="https://www.flickr.com/photos/seeminglee/4556156477/">See-ming Lee</a>. Licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> license.</li>
@@ -913,7 +854,7 @@ numbers, which aids in password generation and encryption.</p>
                 <p>The FSF is a nonprofit with a worldwide mission to advance software freedom —
                   <a href="https://fsf.org/about">learn about our history and work</a>.
                 </p>
-                <p>Version 11.0. Copyright © 2004-2021
+                <p>Version 12.0. Copyright © 2004-2021
                   <a href="https://fsf.org/about/contact.html" title="Find out how to contact us">
                     Free Software Foundation
                   </a>, Inc.
@@ -953,7 +894,7 @@ numbers, which aids in password generation and encryption.</p>
 </script>
 <!-- End Piwik Code -->
 <!-- Piwik Image Tracker -->
-<noscript><img src="https://piwik.fsf.org//piwik.php?idsite=14&rec=1" style="border:0" alt="" /></noscript>
+<!-- <noscript><img src="https://piwik.fsf.org//piwik.php?idsite=14&rec=1" style="border:0" alt="" /><noscript> -->
 <!-- End Piwik -->
       </body>