updated per johns edits round 3.

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

diff --git a/v9/givingguide.html b/v9/givingguide.html
index d0dd52d37a924c240655cf917f9c55312ac26379..c1c01c126192d7a282bc880ca737a43712823541 100644 (file)
--- a/v9/givingguide.html
+++ b/v9/givingguide.html
@@ -239,7 +239,7 @@
             <ul class="pros">
  <p>Why it's cool: Your smartphone is so much more than a phone: it's a tiny computer you carry with you every day, and for many people around the world, it's their only Internet-enabled device. Choosing one of these phones lets you bring software freedom everywhere you go. You <i>can</i> run your favorite apps and send all the text messages you want, while still running free software.</p>
 
-<p>         You can also get an <a href="https://tehnoetic.com/tehnoetic-s2-phone-replicant">S2</a> or an <a "https://tehnoetic.com/tet-n2">N2 phone/tablet</a>, complete with Replicant.</p>
+<p>         You can also get an <a href="https://tehnoetic.com/tehnoetic-s2-phone-replicant">S2</a> or an <a href="https://tehnoetic.com/tet-n2">N2 phone/tablet</a>, complete with Replicant.</p>
             </ul>
           </div>
           <!--End Good-->
@@ -584,7 +584,7 @@
          <!--start bad-->
           <div class="good col-md-6 col-sm-6">
              <ul class="pros">
-               <li>Choose from two operating systems: the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel, or Parabola.</li>
+               <li>Choose from two operating systems: the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> operating systems Trisquel and Parabola.</li>
                <li>Comes with free boot firmware.</li>
                <li>You can customize and specialize this model to your needs -- the essence of user freedom!</li>
 
@@ -921,7 +921,7 @@ MakerBot was founded with a more freedom-respecting philosophy, but <a href="htt
              <li><a href="https://www.manning.com/ebooks">Manning Publications</a> has audio and video in addition to ebooks.</li>
              <li><a href="https://nostarch.com/">No Starch Press</a> offers "the finest in geek entertainment."</li>
              <li><a href="https://www.packtpub.com/">Packt Publishing</a> has ebooks and videos covering a range of technical topics.</li>
-             <li><a href="https://www.smashwords.com/">Smashwords</a> is the world's largest distributor of indie ebooks.</li>
+             <li><a href="https://www.smashwords.com/books/category/1/bestsellers/0/any/any">Smashwords</a> is the world's largest distributor of indie ebooks.</li>
            <li>Looking to buy paper books? Check out the <a href="https://shop.fsf.org/collection/books-docs">GNU Press Shop</a> for your technical manuals and documentation needs.</li>
            </ul>
 
@@ -1102,7 +1102,7 @@ MakerBot was founded with a more freedom-respecting philosophy, but <a href="htt
                 <div class="panel-body" id="promotion-details">
 <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 shop 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 on Shop items.</li>
+             <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.</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="technoethical-promotion"><strong>Technoethical:</strong> 5% discount on <b>all</b> purchases using the coupon code <span class="label label-default">FSFHOLIDAYS</span>. FSF members get an additional 10% off, using the code <span class="label label-default">FSREWARDS</span>.</li>
@@ -1185,13 +1185,14 @@ MakerBot was founded with a more freedom-respecting philosophy, but <a href="htt
               </div>
               <div class="col-md-8 col-sm-8">
                 <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>
+                  <a href="https://fsf.org/about">learn about our history and work</a>.
                 </p>
                 <p>Version 9.0. Copyright © 2004-2018
                   <a href="https://fsf.org/about/contact.html" title="Find out how to contact us">
                     Free Software Foundation
                   </a>, Inc.
                   <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy"> Privacy Policy</a>.
+                 <a href="js/weblabels.html">Javascript License Information</a>.
                 </p>
               </div>
             </div>
@@ -1221,7 +1222,6 @@ MakerBot was founded with a more freedom-respecting philosophy, but <a href="htt
         // @license-end
         </script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=14" style="border:0" alt="" /></p></noscript>
         <!-- End Piwik Tracking Code -->
-        <a href="js/weblabels.html" rel="jslicense"></a>
       </body>
 
       </html>