Fixing weird issue with hero image by changing it from a PNG to an SVG.
[fsf-giving-guide.git] / 2015 / givingguide.html
index 078d4c5..9f878fd 100644 (file)
@@ -47,7 +47,7 @@
 
             <div class="intro">
                 <div class="intro_img">
-                    <img src="//static.fsf.org/nosvn/images/givingguide/images/hero.png" alt="Giving Guide" />
+                    <img src="//static.fsf.org/nosvn/images/givingguide/images/hero.svg" style="width:500px;" alt="Giving Guide" />
                 </div>
 
                 <div class="intro_wrapper">
                         <li>Durable hardware is meant to last and easy to repair.</li>
                         <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
                         <li><span style="font-weight:bold">SAVE!</span> 10% off your subtotal price, and Libiquity will donate to the FSF with each purchase. Expires Jan 31, 2016. <a href="#libiquity-discount">Details.</a></li>
-                        <li><em>Libiquity only ships in the USA. For non-US orders, buy an <a href="https://minifree.org/product/libreboot-x200/">X200 from Minifree with <a href="#minifree-discount">this discount.</a></em></li>
+                        <li><em>Libiquity only ships in the USA. For non-US orders, buy an <a href="http://minifree.org/product/libreboot-x200/">X200 from Minifree</a> with <a href="#minifree-discount">this discount.</a></em></li>
                     </ul>
                 </div>
 
                     <h4 class="title">Lenovo U31 with Windows</h4>
                     <ul>
                         <li>Runs on proprietary software that profits from treating the user as a product -- <a href="https://edri.org/microsofts-new-small-print-how-your-personal-data-abused/">each account is assigned an advertising ID</a> to help Microsoft sell user data.</li>
-                        <li>Includes Management Engine, a hardware-based backdoor that gives Intel a permanent backdoor into your computer.</li>
+                        <!-- Commented out pending citation or confirmation <li>Includes Management Engine, a hardware-based backdoor that gives Intel a permanent backdoor into your computer.</li>-->
                         <li>Mandatory Windows updates force users to test potentially unstable new versions. <a href="https://www.fsf.org/campaigns/windows">Read more about Windows's abuses.</a></li>
                     </ul>
                 </div>
                         </li>
 
                         <li>
-                            MakerBot was founded with a more freedom-respecting appraoch, but has since locked down its code and distanced itself from the community that formed around it.
+                            MakerBot was founded with a more freedom-respecting philosophy, but has since announced an increasingly proprietary approach and distanced itself from the community that formed around it.
                         </li>
                     </ul>
 
                             Easily separate privacy-sensitive network traffic from Internet traffic to improve security.
                         </li>
                         <li>As free as can be: runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> LibreCMC operating system on hardware that is certified to Respect Your Freedom.</li>
-                        <li><span style="font-weight:bold">SAVE!</span> 5% off any purchase. Expires Jan 29, 2016. <a href="#thinkpenguin-discount">Details.</a></li>
+                        <li><span style="font-weight:bold">SAVE!</span> 5% off any purchase. Expires Jan 29, 2016. <a href="#thinkpenguin-discount">Details.</a> <a href="https://my.fsf.org/join">FSF members</a> receive 7% off with this code and 5% year-round.</li>
                     </ul>
                 </div>
 
@@ -572,8 +572,8 @@ Software Foundation at <a href="https://smile.amazon.com">smile.amazon.com</a> t
 
                         <li id="minifree-discount"><span style="font-weight: bold">Minifree:</span> Receive &euro;100 off each and every computer you buy. Enter the discount code FSFGIVINGGUIDE at checkout. Minifree donates &euro;20 (approx. $21) to the FSF for each purchase made with the code.</li>
                         <li id="lulzbot-discount"><span style="font-weight: bold">Lulzbot:</span>
-                            Purchase a LulzBot Mini desktop 3D printer through this guide and receive a gratis 1kg reel of standard filament. Email <a href="mailto:sales@lulzbot.com">sales@lulzbot.com</a> before or immediately after purchase and mention the FSF 2015 Giving Guide to receive this promotion. Specify if you'd like HIPS, PLA, or ABS filament. Promotion subject to inventory availability.</li>
-                            <li id="thinkpenguin-discount"><span style="font-weight: bold">ThinkPenguin:</span> Use coupon code FSFGIVING15 at checkout. Applies to all items.</li>
+                            Purchase a LulzBot Mini desktop 3D printer through this guide and receive a gratis 1kg reel of standard filament. Email <a href="mailto:sales@lulzbot.com">sales@lulzbot.com</a> before or during purchasing and mention the FSF 2015 Giving Guide to receive this promotion. Specify if you'd like HIPS, PLA, or ABS filament. Promotion subject to inventory availability.</li>
+                            <li id="thinkpenguin-discount"><span style="font-weight: bold">ThinkPenguin:</span> Use coupon code FSFGIVING15 at checkout. <a href="https://my.fsf.org/join">FSF members</a> receive 7% off with this code and 5% year-round. Applies to all items.</li>
                             <li id="libiquity-discount"><span style="font-weight: bold">Libiquity:</span> This is a rebate, not a discount at point of sale. After purchase, email your order number to
                                 <a href="mailto:sales@libiquity.com">sales@libiquity.com</a> and mention the secret password FSFGIVING in your message. You'll receive a refund of 10% of your subtotal price. Libiquity will donate 5% of each purchase's subtotal price to the FS. Applies to all items.</li>
                             </ul>
@@ -594,16 +594,18 @@ Software Foundation at <a href="https://smile.amazon.com">smile.amazon.com</a> t
                             </p>
                             <p>The graphics and photos used on this page have been modified by the Free Software Foundation and are licensed separately under the following terms: </p>
                             <ul style="list-style: none inside none;">
-                                <li><a href="https://www.lulzbot.com/news/press-materials">Lulzbot 3D printer photo</a> 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></li>
-                                <li><a href="//static.fsf.org/nosvn/dontcardomebro.jpg">FSF USB membership card</a> 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></li>
-                                <li><a href="http://www.flickr.com/photos/bmiphone/4640570159/">iTunes gift card</a> 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><a href="https://www.thinkpenguin.com/gnu-linux/royal-penguin-gnu-linux-notebook">ThinkPenguin with GNU</a> 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><a href="http://commons.wikimedia.org/wiki/File:Macbook_Pro_PSD.png">Macbook Pro</a> PSD by andrew-gw 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><a href="http://www.gutenberg.org">Astounding Stories</a> 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>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="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                                <li>FSF USB membership card 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></li>
+                                <li>iTunes gift card 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>ThinkPenguin with GNU and both ThinkPenguin router images by ThinkPenguin are 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>Macbook Pro PSD by andrew-gw 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>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 in the public domain but are registered trademarks.</li>
-                                <li><a href="https://en.wikipedia.org/wiki/File:Replicant_logo_alpha.svg">Replicant</a> 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></li>
-                                <li>Tehnoetic Wi-Fi Dongle by Tehnoetic 2014 licensed under CC BY-SA 4.0.</li>
+                                <li>The Amazon, iOS, YouTube, Google Drive and Adobe Photoshop and Illustrator logos are registered trademarks.</li>
+                                <li>Tehnoetic Replicant s2 and Wi-Fi Dongle by Tehnoetic 2014 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>The MakerBot logo is copyright MakerBot Industries.</li>
                                 <li>The Least Authority logo is copyright Least Authority Enterprises.</li>
                             </ul>
                         </div>