From: Molly de Blanc <molly@fsf.org>
Date: Tue, 21 Nov 2017 17:31:35 +0000 (-0500)
Subject: edited giving guide.
X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=commitdiff_plain;h=5fa80a5068e052ea65aa271486948e09b960bb2c;hp=68ea8fbb92fa88cbc213de307f5c90b6f367a258

edited giving guide.
---

diff --git a/v8/givingguide.html b/v8/givingguide.html
index 424b180..c9d4abe 100644
--- a/v8/givingguide.html
+++ b/v8/givingguide.html
@@ -125,15 +125,11 @@
             <img src="img/Illustration.png" alt="large-illutration" class="img-responsive center-block" />
           </div>
           <div class="intro-text col-md-6">
-            <h1>CLEVER TAG LINE HERE THANKS DANA</h1>
-            <h4>You can't always judge a book by its cover</h4>
-            <p>
-	      It's hard to be sure what you're actually giving someone--especially when you're talking about digital media, electronics, and the newest batch of gadgets. With manufacturer restrictions going out of control, some gifts take away more than they give us.
-            </p>
-            <h4>But sometimes you can look inside</h4>
-            <p>
-             Ethical companies are making--and using--ethical technologies to make sure the gifts we give belong to those they're for. Whether you're looking for freedom and privacy or just the knowledge that that ebook will still be around six months from now, the Free Software Foundation's Ethical Giving Guide can help you find the perfect gift.
-            </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 -- 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>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>
       </div>
@@ -146,7 +142,7 @@
         <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">Share</a>
+            <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 <span class="label label-default">#givefreely</span>. You might get a gift out of it!
             </p>
@@ -155,9 +151,9 @@
 
           <!-- 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">Lead an event</a>
+            <a class="action-button" href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Host a Giving Guide Giveaway</a>
             <p>
-              Print and distribute to holiday shoppers.
+              Download the printabe version.
             </p>
 
           </div>
@@ -165,9 +161,9 @@
 
           <!-- Begin Action -->
           <div class="action col-md-4 col-sm-4 text-center">
-            <a class="action-button" href="#charities">Donate instead</a>
+            <a class="action-button" href="#charities">Support free software activism</a>
             <p>
-              Help a free software organization in a friend's name.
+              Donate to our suggested charities in your friend/family member's name
             </p>
           </div>
           <!-- End Action -->
@@ -236,8 +232,8 @@
 
           <div class="good col-md-6 col-sm-6">
 	    <ul class="pros">
-              <li>
-                Runs the <a href="https://www.replicant.us">Replicant</a> free operating system, based on Android.
+	      <li>
+		Runs the <a href="https://www.replicant.us">Replicant</a> free operating system, based on Android.
               </li>
               <li>
                 Features <a href="https://www.f-droid.org/">F-Droid</a>, the free software catalogue that makes it easy to get all the applications you need without sacrificing control of your phone.
@@ -376,7 +372,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.
+                  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>
             
@@ -397,9 +393,13 @@
                 </p>
                 <a href="https://tehnoetic.com/tet-x200" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
-                  Technoethical's X200 has not yet been evaluated for <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certification, but global shipping is available. <a href="#technoethical-promotion">Sale details.</a>
+                  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://minifree.org/product/libreboot-x200/" class="seller action-button">Minifree</a>-->              </div>
+       		    <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>
+
+		<!--<a href="https://minifree.org/product/libreboot-x200/" class="seller action-button">Minifree</a>-->              </div>
             </noscript>
             <!-- End Buy/Download button -->
 
@@ -996,7 +996,6 @@
 
       <!-- Begin Promotion details -->
 
-<!--
       <section class="promotion-details">
         <div class="container">
           <div class="row">
@@ -1007,13 +1006,15 @@
                 </div>
                 <div class="panel-body" id="promotion-details">
 <h2>Companies, distributors, and makers of freedom friendly gadgets and media 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;">
+<!--                  <ul style="list-style: none inside none;">
                     <li id="thinkpenguin-promotion"><strong>ThinkPenguin:</strong> Receive a 5% discount on any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Use the coupon code <span class="label label-default">FSFGIVING16</span> at checkout.</li>
                     <li id="libiquity-promotion"><strong>Libiquity:</strong>            Receive a 5% 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, 2017. 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="technoethical-promotion"><strong>Technoethical:</strong>
-                      Receive a 5% discount on any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Use the coupon code <span class="label label-default">FSFHOLIDAYS</span> at checkout.</li>
-                      <li id="lulzbot-promotion"><strong>LulzBot:</strong> Receive two gratis, 1 kilogram reels of <a href="https://www.lulzbot.com/store/filament/ngen?pk_campaign=fsf16&pk_kwd=ngen">nGen</a> filament when you buy any 3D printer. Ends at 00:00 EST on February 1st, 2017. Use the coupon code  <span class="label label-default">FSF2016</span>. Cannot be combined with other offers.</li>
-                    </ul>
+                      Receive a 5% discount on any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Use the coupon code <span class="label label-default">FSFHOLIDAYS</span> at checkout.</li> -->
+                      <li id="lulzbot-promotion"><strong>LulzBot:</strong><a href="https://www.lulzbot.com/black-friday-cyber-monday-preview">Black Friday and Cyber Monday discounts</a> are available through their site.</li>
+                      <li id="vikings-promotion"><strong>Vikings:</strong> 5% discount on <b>all</b> products and services between now and February 1, 2018. <b>Help the FSF!</b> Vikings will also make a donation for each product purchased using this code. Use the coupon code  <span class="label label-default">fsfftw</span>.</li>
+
+</ul>
                   </div>
                 </div>
               </div>