From cecbfd9ab41ec990d8984c5a6df4bee1ba0d5722 Mon Sep 17 00:00:00 2001
From: Zak Rogoff <atticus@Amdijefri.office.fsf.org>
Date: Tue, 18 Nov 2014 17:28:20 -0500
Subject: [PATCH] Adding some guide items.

---
 givingguide.html | 291 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 235 insertions(+), 56 deletions(-)

diff --git a/givingguide.html b/givingguide.html
index 7ca2154..7428ff9 100755
--- a/givingguide.html
+++ b/givingguide.html
@@ -73,7 +73,7 @@
 
 			 	<div class="comparisons">
 						<div class="section_wrapper">
-							<h3 class="main_title">Operating System: Give the gift of free, flexible, and ethical computing</h3>
+							<h3 class="main_title">Operating System</h3>
 
 							<div class="free">
 								<div class="product">
@@ -81,11 +81,23 @@
 									<img class="product_img" src="images/linux.png" alt="Linux"/>
 								</div>
 
-								<h4 class="title">Fedora</h4>
+								<h4 class="title">Trisquel</h4>
 								<ul>
-									<li>Completely free operating system: transparent and modifiable</li>
-									<li>Break the cycle of forced upgrades and planned obsolescence</li>
-									<li>Comes with all the software you need and an easy software manager to find more.</li>
+									<li>
+                          Completely free operating system:
+                          transparent and modifiable
+                        </li>
+
+                        <li>
+                          Break the cycle of forced upgrades and
+                          planned obsolescence
+                        </li>
+
+                        <li>
+                          Comes with all the software you need and an
+                          easy software manager to find more.
+                        </li>
+                        <li>Works great with the Wi-Fi adapters in this guide.</li>
 								</ul>
 
 								<div class="buy">
@@ -104,10 +116,24 @@
 
 								<h4 class="title">Windows</h4>
 								<ul>
-									<li>Proprietary software that profits from controlling how you use your computer</li>
-									<li>Invades privacy and exposes personal data to Microsoft, <a href="http://www.theguardian.com/world/2013/sep/05/nsa-how-to-remain-secure-surveillance">the NSA</a>, and other malicious attackers</li>
-									<li>Dependent on mandatory upgrades and devices that don't support older versions of Windows</li>
-								</ul>
+                        <li>
+                          Proprietary software that profits from
+                          controlling how you use your computer
+                        </li>
+
+                        <li>
+                          Invades privacy and exposes personal data to
+                          Microsoft,
+                          <a href="http://www.theguardian.com/world/2013/sep/05/nsa-how-to-remain-secure-surveillance">
+                            the NSA,
+                          </a> and other malicious attackers
+                        </li>
+
+                        <li>
+                          Dependent on mandatory upgrades and devices
+                          that don't support older versions of Windows
+                        </li>
+                      </ul>
 
 								<div class="avoid">
 
@@ -116,24 +142,40 @@
 								</div>
 							</div>
 						</div>
-					</div>
 
-					<div class="comparisons">
+
+
 						<div class="section_wrapper">
-							<h3 class="main_title">Operating System: Give the gift of free, flexible, and ethical computing</h3>
+							<h3 class="main_title">3D Printers</h3>
 
 							<div class="free">
 								<div class="product">
 									<img class="good" src="images/good.png" alt="good"/>
-									<img class="product_img" src="images/linux.png" alt="Linux"/>
+									<img class="product_img" src="//static.fsf.org/nosvn/images/taz4.png" alt="TAZ 4.0"/>
 								</div>
 
-								<h4 class="title">Fedora</h4>
+								<h4 class="title">Lulzbot TAZ 4.0</h4>
 								<ul>
-									<li>Completely free operating system: transparent and modifiable</li>
-									<li>Break the cycle of forced upgrades and planned obsolescence</li>
-									<li>Comes with all the software you need and an easy software manager to find more.</li>
-								</ul>
+                        <li>
+                          <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom">
+                            Respects Your Freedom
+                          </a>
+
+                          certified by the Free Software Foundation
+                        </li>
+
+                        <li>
+                          Powered by free software, making 3D printing
+                          more accessible and encouraging innovation
+                        </li>
+
+                        <li>
+                          Learn more about the Lulzbot at
+                          <a href="http://www.lulzbot.com/">
+                            www.lulzbot.com
+                          </a>
+                        </li>
+                      </ul>
 
 								<div class="buy">
 
@@ -146,15 +188,27 @@
 							<div class="proprietary">
 								<div class="product">
 									<img class="bad" src="images/bad.png" alt="bad"/>
-									<img class="product_img" src="images/windows.png" alt="Windows"/>
+									<img class="product_img" src="//static.fsf.org/fsforg/img/MakerbotPrepped.png" alt="Makerbot Replicator 2"/>
 								</div>
 
-								<h4 class="title">Windows</h4>
+								<h4 class="title">Makerbot Replicator 2</h4>
 								<ul>
-									<li>Proprietary software that profits from controlling how you use your computer</li>
-									<li>Invades privacy and exposes personal data to Microsoft, <a href="http://www.theguardian.com/world/2013/sep/05/nsa-how-to-remain-secure-surveillance">the NSA</a>, and other malicious attackers</li>
-									<li>Dependent on mandatory upgrades and devices that don't support older versions of Windows</li>
-								</ul>
+                        <li>
+                          MakerWare software is proprietary,
+                          restricting freedom and stifling innovation
+                        </li>
+
+                        <li>
+                          Hardware patents threaten free printers like
+                          the Lulzbot
+                        </li>
+
+                        <li>
+                          Recently announced an increasingly
+                          proprietary approach, further distancing
+                          itself from the free software community
+                        </li>
+                      </ul>
 
 								<div class="avoid">
 
@@ -162,56 +216,181 @@
 
 								</div>
 							</div>
-						</div>
 				</div>
 
-				<div class="comparisons">
-					<div class="section_wrapper">
-						<h3 class="main_title">Operating System: Give the gift of free, flexible, and ethical computing</h3>
 
-						<div class="free">
-							<div class="product">
-								<img class="good" src="images/good.png" alt="good"/>
-								<img class="product_img" src="images/linux.png" alt="Linux"/>
-							</div>
 
-							<h4 class="title">Fedora</h4>
-							<ul>
-								<li>Completely free operating system: transparent and modifiable</li>
-								<li>Break the cycle of forced upgrades and planned obsolescence</li>
-								<li>Comes with all the software you need and an easy software manager to find more.</li>
-							</ul>
 
-							<div class="buy">
+						<div class="section_wrapper">
+							<h3 class="main_title">Ebooks</h3>
+
+							<div class="free">
+								<div class="product">
+									<img class="good" src="images/good.png" alt="good"/>
+									<img class="product_img" src="//static.fsf.org/fsforg/img/ProjectGutenbergPrepped.png" alt="Project Gutenberg"/>
+								</div>
+
+								<h4 class="title">Project Gutenberg</h4>
+
+                      <ul>
+                        <li>
+                          The original purveyor of DRM-free eBooks
+                        </li>
+
+                        <li>
+                          Enjoy the freedom to read your ebooks on any
+                          device
+                        </li>
+
+                        <li>
+                          All of the ebooks on Project Gutenberg,
+                          including classics like Peter Pan and Huck
+                          Finn, are gratis
+                        </li>
+
+                        <li>
+                          Pick out the perfect books for the whole
+                          family at
+                          <a href="http://www.gutenberg.org/">
+                            www.gutenberg.org
+                          </a>
+                          or from other
+                          <a href="http://www.defectivebydesign.org/guide/ebooks">
+                            DRM-free ebooks sites
+                          </a>
+                        </li>
+                      </ul>
 
-								<a href="http://fedoraproject.org/"><img src="images/download.png" alt="Download" /></a>
+								<div class="buy">
+
+									<a href="http://fedoraproject.org/"><img src="images/buy.png" alt="Buy" /></a>
+
+								</div>
 
 							</div>
 
+							<div class="proprietary">
+								<div class="product">
+									<img class="bad" src="images/bad.png" alt="bad"/>
+									<img class="product_img" src="//static.fsf.org/fsforg/img/amazon.jpg" alt="Amazon"/>
+								</div>
+
+								<h4 class="title">Amazon</h4>
+								<ul>
+                        <li>
+                          Amazon can remotely block or delete
+                          individual ebooks or your entire library
+                          with no warning or explanation (they've done
+                          it before--read about it
+                          <a href="http://www.defectivebydesign.org/node/2250">
+                            here
+                          </a>).
+                        </li>
+
+                        <li>
+                          DRM prevents you from sharing your favorite
+                          books with friends, and Amazon uses DRM to
+                          <a href="http://www.defectivebydesign.org/faq#harm">
+                            maintain their monopoly
+                          </a>
+                        </li>
+
+                        <li>
+                          Amazon claims
+                          <a href="http://www.defectivebydesign.org/amazon-kindle-swindle">
+                            you don't actually own or control your
+                            ebooks
+                          </a>
+                        </li>
+
+                        <li>
+                          Thanks to DRM, you won't be able to transfer
+                          your books to any other reader
+                        </li>
+                      </ul>
+
+								<div class="avoid">
+
+									<img src="images/avoid.png" alt="avoid" />
+
+								</div>
+							</div>
 						</div>
+				
+
+
+						<div class="section_wrapper">
+							<h3 class="main_title">Mobile OS</h3>
+
+							<div class="free">
+								<div class="product">
+									<img class="good" src="images/good.png" alt="good"/>
+									<img class="product_img" src="//static.fsf.org/nosvn/images/Replicant_logo.png" alt="Replicant"/>
+								</div>
+
+								<h4 class="title">Replicant</h4>
+								<ul>
+                        <li>
+                          Fully free software mobile OS based on
+                          Android
+                        </li>
+
+                        <li>
+                          <a href="http://redmine.replicant.us/projects/replicant/wiki/ReplicantImages">
+                            Supported devices
+                          </a>
+                          include both phones and tablets
+                        </li>
+
+                        <li>
+                          Used devices can be purchased, so your
+                          dollars won't go to proprietary OS
+                          companies.
+                        </li>
+                      </ul>
+
+								<div class="buy">
+
+									<a href="http://fedoraproject.org/"><img src="images/buy.png" alt="Buy" /></a>
+
+								</div>
 
-						<div class="proprietary">
-							<div class="product">
-								<img class="bad" src="images/bad.png" alt="bad"/>
-								<img class="product_img" src="images/windows.png" alt="Windows"/>
 							</div>
 
-							<h4 class="title">Windows</h4>
-							<ul>
-								<li>Proprietary software that profits from controlling how you use your computer</li>
-								<li>Invades privacy and exposes personal data to Microsoft, <a href="http://www.theguardian.com/world/2013/sep/05/nsa-how-to-remain-secure-surveillance">the NSA</a>, and other malicious attackers</li>
-								<li>Dependent on mandatory upgrades and devices that don't support older versions of Windows</li>
-							</ul>
+							<div class="proprietary">
+								<div class="product">
+									<img class="bad" src="images/bad.png" alt="bad"/>
+									<img class="product_img" src="//static.fsf.org/nosvn/images/iOS.png" alt="Apple iPhone, iPad and Watch"/>
+								</div>
 
-							<div class="avoid">
+								<h4 class="title">Apple iPhone, iPad and Watch</h4>
+								<ul>
+                        <li>
+                          iOS is a fully proprietary operating system,
+                          giving Apple ultimate control over devices
+                          running it
+                        </li>
+
+                        <li>
+                          Apple uses DRM to block competing software.
+                        </li>
+
+                        <li>
+                          The company claims to take away your freedom
+                          <a href="http://www.defectivebydesign.org/blog/1256">
+                            for your own good
+                          </a>.
+                        </li>
+                      </ul>
+
+								<div class="avoid">
 
-								<img src="images/avoid.png" alt="avoid" />
+									<img src="images/avoid.png" alt="avoid" />
 
+								</div>
 							</div>
 						</div>
-					</div>
-			</div>
-
+</div>
 			<div class="recommended">
 				<h2 class="recommend_title">Recomended Products</h2>
 
-- 
2.25.1