Little updates.

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

diff --git a/givingguide.html b/givingguide.html
index 6a33f513fcbc5af29f2541ee62efe0341f6d2d7c..a824ceb1c49308b1c88e234cb391592bfb44f1ed 100755 (executable)
--- a/givingguide.html
+++ b/givingguide.html
@@ -78,7 +78,7 @@
 
   <div class="comparisons">
     <div class="section_wrapper">
-      <h3 class="main_title">Operating System</h3>
+      <h3 class="main_title">Operating Systems</h3>
 
       <div class="free">
         <div class="product">
@@ -163,7 +163,7 @@
         <h4 class="title">Lulzbot TAZ 4.0</h4>
         <ul>
           <li>
-            Contact <a href="https://www.lulzbot.com/company/contact-us">Lulzbot sales</a> and mention this guide to receive gratis shipping and filament with your TAZ.
+            When you buy a TAZ, contact <a href="https://www.lulzbot.com/company/contact-us">Lulzbot sales</a> and mention this guide to receive an extra roll of filament and gratis shipping to the US, Canada or the EU.
           </li>
 
           <li>
@@ -380,7 +380,7 @@
         <div class="proprietary">
           <div class="product">
             <img class="bad" src="images/bad.png" alt="bad" />
-            <img class="product_img" src="http://upload.wikimedia.org/wikipedia/commons/0/07/Macbook_Pro_PSD.png" alt="Apple Macbook Pro" />
+            <img class="product_img" src="http://static.fsf.org/nosvn/images/macbook_pro.png" alt="Apple Macbook Pro" />
           </div>
 
           <h4 class="title">Apple Macbook Pro</h4>
@@ -671,7 +671,7 @@
     <div class="recommend_wrapper">
 
       <div class="recommended_product">
-        <img class="recommended_product_img" src="images/adaptor-500x500.JPG" alt="Tehnoetic dongle Wi-Fi adapter" />
+        <img class="recommended_product_img" src="http://static.fsf.org/nosvn/images/tehnoetic_adapter.png" alt="Tehnoetic dongle Wi-Fi adapter" />
         <h4 class="title">Tehnoetic dongle Wi-Fi adapter</h4>
         <p>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. Certified to <a href="https://www.fsf.org/ryf">Respects Your Freedom</a>.</p>
         <div class="buy">
@@ -681,7 +681,7 @@
       </div>
 
       <div class="recommended_product">
-        <img class="recommended_product_img" src="http://www.thinkpenguin.com/files/imagecache/product/librecmc-router-v2_0.jpg" alt="ThinkPenguin Wi-Fi N router" />
+        <img class="recommended_product_img" src="http://static.fsf.org/nosvn/images/thinkpenguin_router.jpg" alt="ThinkPenguin Wi-Fi N router" />
         <h4 class="title">ThinkPenguin Wi-Fi N router</h4>
         <p>High speed wireless router running <a href="https://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> LibreCMC operating system. Certified to <a href="https://www.fsf.org/ryf">Respects Your Freedom</a>.</p>
 
@@ -719,8 +719,8 @@
 
     <p>This page 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>
     </p>
-    <p>Lulzbot by FSF 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>
-      <br>Based on a work at <a href="https://static.fsf.org/nosvn/ryf/taz2.jpg">https://static.fsf.org/nosvn/ryf/taz2.jpg.</a>
+    <p>Lulzbot by Aleph Objects 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>
+      <br>Based on a work at <a href="https://www.lulzbot.com/news/press-materials">https://www.lulzbot.com/news/press-materials.</a>
     </p>
 
     <p>Replicator 2 by FSF is licensed under a Creative Commons Attribution 2.0 Generic.
@@ -741,16 +741,18 @@
     <p>Astounding Stories by FSF 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>
       <br>Retrieved from <a href="http://www.gutenberg.org">http://www.gutenberg.org</a>.</p>
 
-    <p>The Amazon.com logo is public domain but is a registered trademark.</p>
+    <p>The Inkscape and GIMP logos are licensed under the <a href="https://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.</p>
 
-    <p>Replicant by Paul Kocialkowski 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>
+    <p>The Amazon, iOS, YouTube, Google Drive and Adobe Photoshop and Illustrator logos are in the public domain but are registered trademarks.</p>
+    
+    <p>Replicant by Paul Kocialkowski is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 3.0 Unported.</a>
       <br>Retrieved from <a href="https://en.wikipedia.org/wiki/File:Replicant_logo_alpha.svg">https://en.wikipedia.org/wiki/File:Replicant_logo_alpha.svg</a>.</p>
 
-    <p>The iOS logo is a registered trademark.</p>
+    <p>Tehnoetic Wi-Fi dongle by Tehnoetic 2014 licensed under CC BY-SA 4.0.
+    
     <p>The Least Authority logo is copyright Least Authority Enterprises.</p>
-    <p>The Google Drive logo is public domain but may be subject to trademark laws.</p>
+
     <p>The Media Goblin graphic is public domain.</p>
-    <p>The YouTube logo is public domain but may be subject to trademark laws.</p>
 
   </div>
   <!-- end licenses-->