edits made to giving guide to update it for v8.
authorMolly de Blanc <molly@fsf.org>
Mon, 20 Nov 2017 02:25:05 +0000 (21:25 -0500)
committerMolly de Blanc <molly@fsf.org>
Mon, 20 Nov 2017 02:25:05 +0000 (21:25 -0500)
v8/givingguide.html

index 180581a..4d57214 100644 (file)
@@ -226,17 +226,18 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             <!-- End Buy/Download button -->
 
             <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> 
               <li>
-                Runs the <a href="http://www.replicant.us">Replicant</a> free operating system, based on Android. Caveat: its modem hardware separately runs a nonfree system.
+                Runs the <a href="http://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>Note: While the main processor is exclusively running free software, the modem processor runs a Samsung nonfree system.</li>
             </ul>
           </div>
           <!--End Good-->
-
           <div class="bad col-md-6 col-sm-6">
             <img src="img/products/iphone-blocked.png" alt="iphone" class="center-block fix-iphone" />
             <h5 class="text-center">iPhone</h5>
@@ -256,6 +257,8 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
       </div>
       <!--End Container-->
 
+              <h2 class="title text-center">Laptops and Tablets</h2>
+      
       <!--Full-Sized Laptops-->
       <div class="container">
         <h3 class="title text-center">Full-Sized Laptops</h3>
@@ -300,6 +303,8 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             <!-- End Buy/Download button -->
 
             <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="http://www.fsf.org/resources/hw/endorsement/respects-your-freedom">other options available</a>.</p>
               <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system and libreboot firmware.</li>
               <li>Durable hardware is meant to last and is easy to repair.</li>
               <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
@@ -430,75 +435,6 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
       </div>
       <!-- End Container -->
 
-      <!--3D Printers-->
-      <div class="container">
-        <h3 class="title text-center">3D Printers</h3>
-        <div class="row is-table-row">
-          <div class="good col-md-6 col-sm-6">
-            <img src="img/products/lulzbot.png" alt="lulzbot" class="center-block" />
-            <h5 class="text-center">LulzBot Mini</h5>
-
-            <!-- Buy/Download Button   -->
-            <a id="get-item-print" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-print" aria-expanded="false" aria-controls="sellers-print" style="display:none">
-              BUY
-              <!-- Begin Sale -->
-              <span class="sale" >sale</span>
-              <!-- End Sale -->
-            </a>
-            <div class="collapse" id="sellers-print">
-              <div class="center-block seller-group">
-                <p style="color: #6b6b6b">
-                  <strong>Get it from</strong>
-                </p>
-                <a href="https://www.lulzbot.com/store?pk_campaign=fsf16&pk_kwd=store" class="seller action-button">LulzBot</a>
-                <p class="sale-info links">
-                  <a href="#lulzbot-promotion">Sale details.</a>
-                </p>
-              </div>
-            </div>
-
-            <script>
-            document.getElementById('get-item-print').style.display = '';
-            </script>
-            <noscript>
-              <div class="center-block seller-group">
-                <p style="color: #6b6b6b">
-                  <strong>Get it from</strong>
-                </p>
-                <a href="https://www.lulzbot.com/store?pk_campaign=fsf16&pk_kwd=store" class="seller action-button">LulzBot</a>
-                <p class="sale-info links">
-                  <a href="#lulzbot-promotion">Sale details.</a>
-                </p>
-              </div>
-            </noscript>
-            <!-- End Buy/Download button -->
-            <ul class="pros">
-              <li><a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, making 3D printing more accessible and encouraging innovation.</li>
-              <li>Performance and seamless interface <a href="http://www.tomsguide.com/us/lulzbot-mini-3d-printer,review-2744.html">earned it "Editor's Choice"</a> in Tom's Guide's 2016 3D printer comparison.</li>
-              <li>Hardware designs available to make customization easy. Standardized material format allows 3D printing with plastics, wood-, stone-, bamboo-, rubber-, and metal-like materials.</li>
-            </ul>
-          </div>
-          <!--End Good-->
-
-          <div class="bad col-md-6 col-sm-6">
-            <img src="img/products/printer-blocked.png" alt="printer" class="center-block" />
-            <h5 class="text-center">Makerbot Replicator Mini</h5>
-            <ul class="cons">
-              <li>
-                MakerWare software is proprietary, restricting freedom and stifling innovation.
-              </li>
-
-              <li>
-                MakerBot was founded with a more freedom-respecting philosophy, but has since <a href="https://www.cnet.com/news/pulling-back-from-open-source-hardware-makerbot-angers-some-adherents/">announced an increasingly proprietary approach</a> and distanced itself from the community that formed around it.
-              </li>
-            </ul>
-          </div>
-          <!--End Bad-->
-        </div>
-        <!--End Row-->
-      </div>
-      <!--End Container-->
-
       <!-- Begin Recommended Template -->
       <div class="container-fluid recommended-section">
         <!-- <h1 class="text-center"></h1> -->
@@ -628,6 +564,76 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
       </div>
       <!--End Container-->
 
+      <!--3D Printers-->
+      <div class="container">
+        <h3 class="title text-center">3D Printers</h3>
+        <div class="row is-table-row">
+          <div class="good col-md-6 col-sm-6">
+            <img src="img/products/lulzbot.png" alt="lulzbot" class="center-block" />
+            <h5 class="text-center">LulzBot Mini</h5>
+
+            <!-- Buy/Download Button   -->
+            <a id="get-item-print" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-print" aria-expanded="false" aria-controls="sellers-print" style="display:none">
+              BUY
+              <!-- Begin Sale -->
+              <span class="sale" >sale</span>
+              <!-- End Sale -->
+            </a>
+            <div class="collapse" id="sellers-print">
+              <div class="center-block seller-group">
+                <p style="color: #6b6b6b">
+                  <strong>Get it from</strong>
+                </p>
+                <a href="https://www.lulzbot.com/store?pk_campaign=fsf16&pk_kwd=store" class="seller action-button">LulzBot</a>
+                <p class="sale-info links">
+                  <a href="#lulzbot-promotion">Sale details.</a>
+                </p>
+              </div>
+            </div>
+
+            <script>
+            document.getElementById('get-item-print').style.display = '';
+            </script>
+            <noscript>
+              <div class="center-block seller-group">
+                <p style="color: #6b6b6b">
+                  <strong>Get it from</strong>
+                </p>
+                <a href="https://www.lulzbot.com/store?pk_campaign=fsf16&pk_kwd=store" class="seller action-button">LulzBot</a>
+                <p class="sale-info links">
+                  <a href="#lulzbot-promotion">Sale details.</a>
+                </p>
+              </div>
+            </noscript>
+            <!-- End Buy/Download button -->
+            <ul class="pros">
+              <li><a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, making 3D printing more accessible and encouraging innovation.</li>
+              <li>Performance and seamless interface <a href="http://www.tomsguide.com/us/lulzbot-mini-3d-printer,review-2744.html">earned it "Editor's Choice"</a> in Tom's Guide's 2016 3D printer comparison.</li>
+              <li>Hardware designs available to make customization easy. Standardized material format allows 3D printing with plastics, wood-, stone-, bamboo-, rubber-, and metal-like materials.</li>
+            </ul>
+          </div>
+          <!--End Good-->
+
+          <div class="bad col-md-6 col-sm-6">
+            <img src="img/products/printer-blocked.png" alt="printer" class="center-block" />
+            <h5 class="text-center">Makerbot Replicator Mini</h5>
+            <ul class="cons">
+              <li>
+                MakerWare software is proprietary, restricting freedom and stifling innovation.
+              </li>
+
+              <li>
+                MakerBot was founded with a more freedom-respecting philosophy, but has since <a href="https://www.cnet.com/news/pulling-back-from-open-source-hardware-makerbot-angers-some-adherents/">announced an increasingly proprietary approach</a> and distanced itself from the community that formed around it.
+              </li>
+            </ul>
+          </div>
+          <!--End Bad-->
+        </div>
+        <!--End Row-->
+      </div>
+      <!--End Container-->
+
+      
       <!-- Begin Recommended Template -->
       <div class="container-fluid recommended-section">
         <!-- <h1 class="text-center"></h1> -->
@@ -907,6 +913,12 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             <div class="col-md-3 col-sm-4 col-xs-6">
               <a href="https://ceata.org/"><img src="img/charities/ceata.png" alt="ceata" class="center-block img-responsive" /></a>
             </div>
+           <div class="col-md-3 col-sm-4 col-sx-6">
+             <a href="https://www.fsf.org/working-together">IMAGE</a>
+             class="center-block img-responsive" /></a>
+            </div>
+          </div>
+        </div>
             <div class="col-md-3 col-sm-4 col-xs-6">
               <a href="http://www.fsf.org/"><img src="img/charities/fsf.png" alt="fsf" class="center-block img-responsive" /></a>
             </div>
@@ -925,7 +937,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                   <h1 class="fix-margin">Promotion details</h1>
                 </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;">
                     <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>
@@ -944,6 +956,29 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
         </section>
         <!-- End Promotion details   -->
 
+             <!-- Start Respects Your Freedoms -->
+      <section class="promotion-details">
+        <div class="container">
+          <div class="row">
+            <div class="col-md-12">
+              <div class="panel-default">
+                <div class="panel-heading">
+                  <h1 class="fix-margin">Respects Your Freedoms</h1>
+                </div>
+                <div class="panel-body" id="promotion-details">
+                 <p>The FSF certifies hardware as <a href="http://www.fsf.org/resources/hw/endorsement/respects-your-freedom">respecting your freedoms</a>. There is a <a href="http://www.fsf.org/resources/hw/endorsement/respects-your-freedom">complete list</a> of RYF products on FSF.org.</p>
+                  <p>We would never recommend you use, run, or give proprietary software. However, one part of RYF certification is the promise that one can install any software they wish on the device. This includes proprietary software. Free software is about many things, including the right to choose what is on your device. We urge you to keep your gifts and own devices fully free--it's not only the responsible thing, but the right thing.</p>
+                    </div>
+                </div>
+              </div>
+              <!-- End Panel -->
+            </div>
+            <!-- End Row -->
+          </div>
+          <!-- End Container -->
+        </section>
+        <!-- End Respects Your Freedoms   -->
+
         <!-- Begin Licenses -->
         <section class="licenses">
           <div class="container">