projects / fsf-giving-guide.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fixed link
[fsf-giving-guide.git] / v7 / givingguide.html
diff --git a/v7/givingguide.html b/v7/givingguide.html
index b2cb921813e8d2b4c13398479e6037e3cd7554c3..8c86010b8fc4785c0d136cbd313cbfef046fec9a 100644 (file)
--- a/v7/givingguide.html
+++ b/v7/givingguide.html
@@ -86,6 +86,11 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
 -->
 
 <body>
+  <!-- banners go here -->
+  <!--
+  <iframe src="//static.fsf.org/nosvn/banners/2017fundraiser/" width="100%" height="100%" scrolling="no" style="overflow: hidden; border: 0 none; display: block;"></iframe>
+  <iframe src="//static1p.fsf.org/nosvn/banners/2018fundraiser/" width="100%" height="100%" scrolling="no" style="overflow: hidden; margin: 0; border: 0 none; display: block;"></iframe>
+  -->
   <nav class="navbar navbar-default">
     <div class="container-fluid">
       <!-- Brand and toggle get grouped for better mobile display -->
@@ -131,7 +136,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             </p>
             <h4>More ethical options</h4>
             <p>
-              The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. This is the Free Software Foundation's guide to smarter gifts, compared with their restrictive counterparts.
+              The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. This is the Free Software Foundation's guide to smarter gift giving, compared with their restrictive counterparts.
             </p>
           </div>
         </div>
@@ -967,11 +972,12 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                       <li>Astounding Stories is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
                       <li>The Inkscape and GIMP logos are licensed under the <a href="https://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.</li>
                       <li>The Amazon, iOS, YouTube, Google Drive and Adobe Photoshop and Illustrator logos are registered trademarks.</li>
-                      <li>Technoethical Replicant s3 and Wi-Fi Dongle by Technoethical 2016 licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</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>The Lenovo U31 image is copyright Lenovo.</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>
                       <li>The MakerBot logo is copyright MakerBot Industries.</li>
                       <li>The Least Authority logo is copyright Least Authority Enterprises.</li>
+                      <li><a href="https://www.flickr.com/photos/janitors/12907608763">Microsoft Surface 2</a> by <a href="https://www.flickr.com/photos/janitors/">Kārlis Dambrāns</a> licensed under CC By 2.0.</li>
                     </ul>
                   </div>
                 </div>