edited giving guide.

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

diff --git a/v8/givingguide.html b/v8/givingguide.html
index 373c8c4d7f1ff437e49b87a02175de439b0ad974..c9d4abeadf3ba103c66af03150906e56459ca45f 100644 (file)
--- 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">
             <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>
           </div>
         </div>
       </div>


@@ -146,7 +142,7 @@
         <div class="row">
           <!-- Begin Action -->
           <div class="action col-md-4 col-sm-4 text-center">
         <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>
             <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">
 
           <!-- 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>
             <p>

-              Print and distribute to holiday shoppers.
+              Download the printabe version.

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


@@ -165,9 +161,9 @@
 
           <!-- Begin Action -->
           <div class="action col-md-4 col-sm-4 text-center">
 
           <!-- 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>
             <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 -->
             </p>
           </div>
           <!-- End Action -->


@@ -186,8 +182,8 @@
         <h2 class="title text-center">Smartphones</h2>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">
         <h2 class="title text-center">Smartphones</h2>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">

-            <img src="//static.fsf.org/nosvn/images/technoethical-replicant-s3.png" alt="replicant phone" class="center-block" />
-            <h5 class="text-center">Galaxy S3 with Replicant</h5>
+            <img src="/v8/img/products/mobile_n2.png" alt="replicant phone" class="center-block" />
+            <h5 class="text-center">Galaxy Note 2 with Replicant</h5>

 
             <!-- 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/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">


@@ -201,7 +197,7 @@
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>

-                <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant" class="seller action-button">Technoethical</a>
+                <a href="https://tehnoetic.com/mobile-devices/tet-n2" class="seller action-button">Technoethical</a>

                 <div class="sale-info links">
                   <a href="#technoethical-promotion">Sale details.</a>
                 </div>
                 <div class="sale-info links">
                   <a href="#technoethical-promotion">Sale details.</a>
                 </div>


@@ -216,7 +212,7 @@
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>

-                <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant" class="seller action-button">Technoethical</a>
+                <a href="https://tehnoetic.com/mobile-devices/tet-n2" class="seller action-button">Technoethical</a>

                 <p class="sale-info links">
                   <a href="#technoethical-promotion">Sale details.</a>
                 </p>
                 <p class="sale-info links">
                   <a href="#technoethical-promotion">Sale details.</a>
                 </p>


@@ -227,7 +223,7 @@
 
             <ul class="pros">
  <p>Your smartphone isn't just a phone--it's a computer you carry with you every day. It's your camera, your connection to your friends and family, and, for many people around the world, their only internet-enabled device. By choosing one of these phones, you're bringing freedom to your pocket, not just your communications.</p>
 
             <ul class="pros">
  <p>Your smartphone isn't just a phone--it's a computer you carry with you every day. It's your camera, your connection to your friends and family, and, for many people around the world, their only internet-enabled device. By choosing one of these phones, you're bringing freedom to your pocket, not just your communications.</p>

-<p>          In addition to Technoethical's <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant">refurbished S3</a>, they also offer an <a href="https://tehnoetic.com/tehnoetic-s2-phone-replicant">S2</a> and <a href="https://tehnoetic.com/tet-n2">N2</a>.</p>
+<p>         You can also get an <a href="https://tehnoetic.com/tehnoetic-s2-phone-replicant">S2</a> or <a "https://tehnoetic.com/mobile-devices/tehnoetic-s3-phone-replicant">S3</a>, complete with replicant.</p>

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


@@ -236,8 +232,8 @@
 
           <div class="good col-md-6 col-sm-6">
            <ul class="pros">
 
           <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.
               </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.


@@ -313,8 +309,8 @@
 
             <ul class="pros">
              <p>Setting up a fully free system is easier than it used to be, but can still seem daunting--especially if you've never done it before. Luckily, you can now get a new-to-you laptop that's ready to go out of the box.</p>
 
             <ul class="pros">
              <p>Setting up a fully free system is easier than it used to be, but can still seem daunting--especially if you've never done it before. Luckily, you can now get a new-to-you laptop that's ready to go out of the box.</p>

-             <p>While we're highlighting the follow laptops, there are <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom">other options available</a>.</p>
-            </ul>
+             <p>Technoethical also has a <a href="https://tehnoetic.com/laptops/tet-t400s">T400s</a> available.</p>
+           </ul>

 
           </div>
           <!--End Good-->
 
           </div>
           <!--End Good-->


@@ -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">
                 </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>
             
 
                 </p>
             


@@ -397,9 +393,13 @@
                 </p>
                 <a href="https://tehnoetic.com/tet-x200" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
                 </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>
                 </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 -->
 
             </noscript>
             <!-- End Buy/Download button -->
 


@@ -509,7 +509,7 @@
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
             <img src="img/products/desktop.png" alt="The Workstation, a tower computer by Vikings" class="center-block" />
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
             <img src="img/products/desktop.png" alt="The Workstation, a tower computer by Vikings" class="center-block" />

-            <h5 class="text-center">The Workstation with GNU/Linux</h5>
+            <h5 class="text-center">D16 Workstation 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">


@@ -526,7 +526,7 @@
 
                 <a href="https://store.vikings.net/libre-friendly-hardware/vikings-d16-workstation" class="seller action-button">Vikings</a>
                 <p class="sale-info links">
 
                 <a href="https://store.vikings.net/libre-friendly-hardware/vikings-d16-workstation" class="seller action-button">Vikings</a>
                 <p class="sale-info links">

-                 The Workstation is not Respects Your Freedoms certified at this point.
+                 The D16 Workstation is not Respects Your Freedoms certified at this point.

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


@@ -995,6 +995,7 @@
       <!-- End Donations -->
 
       <!-- Begin Promotion details -->
       <!-- End Donations -->
 
       <!-- Begin Promotion details -->

+

       <section class="promotion-details">
         <div class="container">
           <div class="row">
       <section class="promotion-details">
         <div class="container">
           <div class="row">


@@ -1005,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>
                 </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>
                     <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>
                   </div>
                 </div>
               </div>


@@ -1064,7 +1067,7 @@
                       <li>X200, T400, iPhone, and ISP-provided router images are in the public domain.</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>X200, T400, iPhone, and ISP-provided router images are in the public domain.</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 s3, 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>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>LibreTea computer with modular chassis image by Luke Kenneth Casson Leighton licensed under<a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.</li>   </ul>
                   </div>
                 </div>
                       <li>LibreTea computer with modular chassis image by Luke Kenneth Casson Leighton licensed under<a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.</li>   </ul>
                   </div>
                 </div>