X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=v11%2Fgivingguide.html;h=a2cc70c6cfb088a93e55f9566008945beb2d0810;hb=11f510a502a3affd88edeaea91694d2121d9980b;hp=70ed1debe95ef6fcfeeef9112fc259706ce0f507;hpb=1b4aea0e8064b9d84d45d771bc18481f3f7e3ecb;p=fsf-giving-guide.git

diff --git a/v11/givingguide.html b/v11/givingguide.html
index 70ed1de..a2cc70c 100644
--- a/v11/givingguide.html
+++ b/v11/givingguide.html
@@ -593,21 +593,23 @@ newest Apple or Google device is a great gift in itself, and one that
           <!-- End Action -->
 
           <!-- Begin Action -->
-          <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">Unleash your advocacy</a>
+		            <div class="action col-md-4 col-sm-4 text-center">
+            <a class="action-button" href="https://my.fsf.org/gift-a-membership">Support free software</a>
             <p>
-Your fight for freedom doesn't have to end at home. Use this
-<a href="https://static.fsf.org/nosvn/giving-guide-printable/v11/en.zip">printable version</a> of the guide to spread the word.            </p>
-
+         	  Freedom is the gift that keeps on giving. By giving your friend or family member an FSF membership, you can show them you care <i>and</i> benefit the cause for global software freedom.
+            </p>
           </div>
           <!-- End Action -->
 
           <!-- Begin Action -->
+
           <div class="action col-md-4 col-sm-4 text-center">
-            <a class="action-button" href="#charities">Support free software</a>
+            <a class="action-button" href="">Unleash your advocacy</a>
             <p>
-              Donate to our suggested charities.
+			  Your fight for freedom doesn't have to end at home. Use this
+<a href="https://static.fsf.org/nosvn/giving-guide-printable/v11/en.zip">printable version</a> of the guide to spread the word.
             </p>
+
           </div>
           <!-- End Action -->
         </div>
@@ -631,13 +633,19 @@ Your fight for freedom doesn't have to end at home. Use this
 
             <!-- Buy/Download Button   -->
             <a id="get-item" class="btn get-item" role="button" data-toggle="collapse" href="#sellers" aria-expanded="false" aria-controls="sellers" style="display:none">
-              BUY</a>
+              BUY
+              <!-- Begin Sale -->
+              <span class="sale" >sale</span>
+              <!-- End Sale -->
+</a>
             <div class="collapse" id="sellers">
               <div class="center-block seller-group">
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
                 <a href="https://shop.puri.sm/shop/librem-5/" class="seller action-button">Purism</a>
+				<p class="sale-info links">
+				  <a href="#purism-promotion">Sale details.</a></p>
               </div>
             </div>
 
@@ -650,6 +658,8 @@ Your fight for freedom doesn't have to end at home. Use this
                   <strong>Get it from</strong>
                 </p>
                 <a href="https://shop.puri.sm/shop/librem-5/" class="seller action-button">Purism</a>
+				<p class="sale-info links">
+				  <a href="#purism-promotion">Sale details.</a></p>
               </div>
             </noscript>
             <!-- End Buy/Download button -->
@@ -788,7 +798,7 @@ Apple prevents you from installing third-party free software on your own phone,
             <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> -->
+              <span class="sale" >sale</span>
               <!-- End Sale -->
 			</a>
             <div class="collapse" id="sellers-x200">
@@ -800,6 +810,8 @@ Apple prevents you from installing third-party free software on your own phone,
 		<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>
+				<p class="sale-info links">
+				  <a href="#vikings-promotion">Sale details.</a></p>
               </div>
             </div>
 
@@ -814,7 +826,9 @@ 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>
+				<p>				  <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
+				<p class="sale-info links">
+				  <a href="#vikings-promotion">Sale details.</a></p>
               </div>
             </noscript>
             <!-- End Buy/Download button -->
@@ -841,7 +855,7 @@ it's the laptop that's most frequently used in the FSF office!</p>
           <h5 class="text-center">Stay away from: MacBook Air and MacBook Pro</h5>
           <ul class="cons">
 	    <li>macOS is <a href="https://gnu.org/proprietary">proprietary software</a> that restricts its users' freedoms.</li>
-		<li>In early November 2020, macOS started alerting Apple each time a user <a href="https://sneak.berlin/20201112/your-computer-isnt-yours/">opens an app</a>. Even though Apple is <a href="https://support.apple.com/en-us/HT202491">making changes</a> to the service, it just goes to show how bad they try to be until there is an outcry.</li>
+		<li>In early November 2020, macOS was caught alerting Apple each time a user <a href="https://sneak.berlin/20201112/your-computer-isnt-yours/">opens an app</a>. Even though Apple is <a href="https://support.apple.com/en-us/HT202491">making changes</a> to the service, it just goes to show how bad they try to be until there is an outcry.</li>
               <li>Apple has been <a href="https://motherboard.vice.com/en_us/article/evmeya/apple-iphone-right-to-repair-california">opposing the Right to Repair home user devices</a> for years, and maintains totalitarian control over their hardware.</li>
               <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a> that rats on you to advertisers.</li>
             </ul>
@@ -859,10 +873,14 @@ it's the laptop that's most frequently used in the FSF office!</p>
             <!-- 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
+			  <!-- Begin Sale -->
+              <span class="sale" >sale</span>
+              <!-- End Sale -->
             </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>
+				<p class="sale-info links"><a href="#vikings-promotion">Sale details</a></p>
               </div>
             </div>
 
@@ -875,6 +893,7 @@ it's the laptop that's most frequently used in the FSF office!</p>
                   <strong>Get it from</strong>
                 </p>
                 <a href="https://store.vikings.net/ryf-certified-hardware/d8ryf" class="seller action-button">Vikings</a>
+				<p class="sale-info links"><a href="#vikings-promotion">Sale details</a></p>
               </div>
             </noscript>
             <ul class="pros">
@@ -888,7 +907,7 @@ it's the laptop that's most frequently used in the FSF office!</p>
 <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>Quiet and energy efficient while maintaining a small form factor.</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">
@@ -1177,7 +1196,8 @@ numbers, which aids in password generation and encryption.</p>
 <li>All of the music on <a href="https://bandcamp.com">Bandcamp</a> is DRM-free and comes in a variety of formats, including patent-free ones like FLAC and Ogg Vorbis.</li>
 <li><a href="https://www.dischord.com/">Dischord Records</a>, a classic punk label providing music since 1980.</li>
 <li><a href="https://www.emusic.com/">Emusic</a> offers DRM-free MP3 downloads, providing a local alternative to streaming services like Spotify or Apple Music.</li>
-<li><a href="https://folkways.si.edu/">Folkways</a>, providing digital downloads of the world's best folk and children's music, courtesy of the Smithsonian Institute.</li>
+  <li><a href="https://folkways.si.edu/">Folkways</a>, providing digital downloads of the world's best folk and children's music, courtesy of the Smithsonian Institute.</li>
+  <li><a href="https://hdtracks.com">HDTracks</a> is an online music shop offering thousands of DRM-free downloads for you to play at home.</li>
 </ul>
 		  </div>
           <div class="good col-md-6 col-sm-6">
@@ -1308,13 +1328,13 @@ numbers, which aids in password generation and encryption.</p>
 <h2>Companies, distributors, and makers of freedom-friendly gadgets want to make it easier for you to give gifts that you feel good about. Check out these discounts and promotions.</h2>
             <ul style="list-style: none inside none;">
 	      <li id="GNU-promotion"><strong>GNU Press Shop: </strong>5% discount on all items using the coupon code <span class="label label-default">GIVEFREELY</span>. Code expires on December 31st. As always, FSF members get a 20% discount. Together with this code, your associate membership could net you 25% off!</li>
+		  <li id="purism-promotion"><strong>Purism:</strong> 5% off of the Librem 5 with the discount code <span class="label label-default">GNULIDAYS</span>.</li>
+<li id="vikings-promotion"><strong>Vikings:</strong> 10% discount on <b>all</b> products and services between now and December 31, 2020. <b>Help the FSF:</b> Vikings will also make a donation to the FSF for each product purchased using the coupon code <span class="label label-default">LIBREFEST</span>.</li>
           <!--     <li id="libiquity-promotion"><strong>Libiquity: </strong>10% rebate off your subtotal price for any items you buy from the Web site. Libiquity will donate 5% of each purchase's subtotal price to the FSF. Ends at 00:00 EST on February 1st, 2019. Claim the rebate by sending the code <span class="label label-default">FSFGIVING</span> and your order number to <a href="mailto:sales@libiquity.com">sales@libiquity.com</a>. Libiquity will then credit the rebate amount to your payment method.</li> -->
           <!--     <li id="lulzbot-promotion"><strong>LulzBot: </strong><a href="https://www.lulzbot.com/lulzbot-sales-clearance-items">Features sales and clearance items on their Web site</a>.</li> -->
 	      <!-- <li id="minifree-promotion"><strong>Minifree: </strong><a href="https://minifree.org/">Offering a discount on all products through the end of the year.</a> -->
 	      <!-- <li id="technoethical-promotion"><strong>Technoethical:</strong> Discounts for all refurbished products until January 17th.</li> -->
 		      <li id="thinkpenguin-promotion"><strong>ThinkPenguin:</strong> 5% discount on <b>all</b> products is available to <a href="https://fsf.org/join">FSF members</a>.</li>
-                      <!-- <li id="vikings-promotion"><strong>Vikings:</strong> 5% discount on <b>all</b> products and services between now and February 1, 2019. <b>Help the FSF:</b> Vikings will also make a donation to the FSF for each product purchased using the coupon code  <span class="label label-default">fsfftw</span>.</li> -->
-
 </ul>
                   </div>
                 </div>
@@ -1343,7 +1363,7 @@ numbers, which aids in password generation and encryption.</p>
                     <ul style="list-style: none inside none;">
 					  <li>Purism product image copyright Â© 2019, Purism. Licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li>
                       <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/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</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>
