From: Zak Rogoff <zak@montage.office.fsf.org>
Date: Fri, 19 Dec 2014 15:12:56 +0000 (-0500)
Subject: Revert "Reformatting licensing section a little."
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1d8c34982c2b3f86aab15afabb8e85ce8864f829;p=fsf-giving-guide.git

Revert "Reformatting licensing section a little."

Also trying to undo the weird problems. This reverts commit 68a2a07d0f912b31ac656e736be0d679d26b5cac.
---

diff --git a/givingguide.html b/givingguide.html
index d5c7108..00e77e0 100755
--- a/givingguide.html
+++ b/givingguide.html
@@ -28,14 +28,14 @@
 
         <div class="navbar">
           <ul>
-            <p><a href="https://www.fsf.org/about/">About the FSF</a>
-            </p>
-            <p><a href="https://www.fsf.org/campaigns/">Campaigns</a>
-            </p>
-            <p><a href="https://www.fsf.org/donate/">Donate</a>
-            </p>
-            <p><a href="http://shop.fsf.org/">Shop</a>
-            </p>
+            <li><a href="https://www.fsf.org/about/">About the FSF</a>
+            </li>
+            <li><a href="https://www.fsf.org/campaigns/">Campaigns</a>
+            </li>
+            <li><a href="https://www.fsf.org/donate/">Donate</a>
+            </li>
+            <li><a href="http://shop.fsf.org/">Shop</a>
+            </li>
           </ul>
         </div>
         <!--end navbar-->
@@ -94,17 +94,17 @@
           <ul>
 
 
-            <p>
+            <li>
               <a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, making 3D printing more accessible and encouraging innovation.
-            </p>
+            </li>
 
-            <p>
+            <li>
               Supports tetherless printing, optional Dual Extruder upgrade, and exotic filaments including wood-, rubber- and stone-like materials.
-            </p>
-            <p>Hardware designs available to make modification and improvement easy.</p>
-            <p>
+            </li>
+            <li>Hardware designs available to make modification and improvement easy.</li>
+            <li>
               <span style="font-weight:bold">SAVE!</span> 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 (expires at the end of 2014).
-            </p>
+            </li>
           </ul>
 
         </div>
@@ -117,13 +117,13 @@
 
           <h4 class="title">Makerbot Replicator 2</h4>
           <ul>
-            <p>
+            <li>
               MakerWare software is proprietary, restricting freedom and stifling innovation.
-            </p>
+            </li>
 
-            <p>
+            <li>
               Recently announced an increasingly proprietary approach, further distancing itself from the free software community.
-            </p>
+            </li>
           </ul>
 
         </div>
@@ -160,9 +160,9 @@
           <h4 class="title">Project Gutenberg</h4>
 
           <ul>
-            <p>All of the ebooks are gratis, including classics like Peter Pan and Huck Finn.</p>
-            <p>The original purveyor of eBooks free of <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> (Digital Restrictions Management), <a href="https://www.defectivebydesign.org/guide/ebooks">inspiring many others</a>.</p>
-            <p>Enjoy the freedom to read your ebooks on any device.</p>
+            <li>All of the ebooks are gratis, including classics like Peter Pan and Huck Finn.</li>
+            <li>The original purveyor of eBooks free of <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> (Digital Restrictions Management), <a href="https://www.defectivebydesign.org/guide/ebooks">inspiring many others</a>.</li>
+            <li>Enjoy the freedom to read your ebooks on any device.</li>
           </ul>
 
         </div>
@@ -175,23 +175,23 @@
 
           <h4 class="title">Amazon</h4>
           <ul>
-            <p>
+            <li>
               Amazon can remotely block or delete individual ebooks or your entire library with no warning or explanation (<a href="http://www.defectivebydesign.org/node/2250">they've done
                 it before</a>).
-              </p>
+              </li>
 
-              <p>
+              <li>
                 Amazon uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a>
                 to prevent you from sharing your favorite books with friends or moving them between readers.
-              </p>
+              </li>
 
-              <p>
+              <li>
                 Amazon openly claims
                 <a href="http://www.defectivebydesign.org/amazon-kindle-swindle">
                   you don't actually own or control your
                   ebooks.
                 </a>
-              </p>
+              </li>
             </ul>
 
           </div>
@@ -227,12 +227,12 @@
 
               <ul>
 
-                <p>
+                <li>
                   Comes installed with a free OS, and its Wi-Fi and 3D-accelerated graphics work with any other <a href="https://www.gnu.org/distros/free-distros.html">fully free GNU/Linux distribution</a>.
-                </p>
+                </li>
 
-                <p> While its proprietary boot firmware means it's <a href="https://www.fsf.org/campaigns/free-bios.html">not fully free</a>, this laptop is one of the most freedom-supporting available. Browse more companies that sell <a href="https://www.gnu.org/links/companies">free software-compatible computers</a>.</p>
-                <p><span style="font-weight:bold">SAVE!</span> $5 off any purchase of $50 or more with coupon code FSFGIVING. ThinkPenguin will also donate $5 to the FSF (expires at the end of 2014).</p>
+                <li> While its proprietary boot firmware means it's <a href="https://www.fsf.org/campaigns/free-bios.html">not fully free</a>, this laptop is one of the most freedom-supporting available. Browse more companies that sell <a href="https://www.gnu.org/links/companies">free software-compatible computers</a>.</li>
+                <li><span style="font-weight:bold">SAVE!</span> $5 off any purchase of $50 or more with coupon code FSFGIVING. ThinkPenguin will also donate $5 to the FSF (expires at the end of 2014).</li>
               </ul>
 
             </div>
@@ -246,17 +246,17 @@
 
               <h4 class="title">Apple Macbook Pro</h4>
               <ul>
-                <p>
+                <li>
                   Runs on proprietary software that restricts the user's freedoms.
-                </p>
+                </li>
 
-                <p>
+                <li>
                   Apple's App Store uses <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to restrict what you can do with your purchases.
-                </p>
-                <p>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a>.</p>
-                <p>
+                </li>
+                <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a>.</li>
+                <li>
                   Planned obsolescence: business model forces you to buy new devices frequently.
-                </p>
+                </li>
               </ul>
             </div>
           </div>
@@ -295,10 +295,10 @@
               <h4 class="title">GIMP and Inkscape</h4>
 
               <ul>
-                <p>Free software, with thriving developer communities.</p>
-                <p>Designed for free formats, but can also open files created in other programs.</p>
-                <p>Wide variety of plugins grants limitless features.</p>
-                <p>Easy to install on all major operating systems.</p>
+                <li>Free software, with thriving developer communities.</li>
+                <li>Designed for free formats, but can also open files created in other programs.</li>
+                <li>Wide variety of plugins grants limitless features.</li>
+                <li>Easy to install on all major operating systems.</li>
               </ul>
 
             </div>
@@ -311,9 +311,9 @@
 
               <h4 class="title">Photoshop and Illustrator</h4>
               <ul>
-                <p>Proprietary software controlled by Adobe.</p>
-                <p>Prefers locked-down proprietary formats.</p>
-                <p>Requires costly upgrades to stay up to date.</p>
+                <li>Proprietary software controlled by Adobe.</li>
+                <li>Prefers locked-down proprietary formats.</li>
+                <li>Requires costly upgrades to stay up to date.</li>
               </ul>
 
             </div>
@@ -346,18 +346,18 @@
 
             <h4 class="title">Trisquel GNU/Linux</h4>
             <ul>
-              <p>
+              <li>
                 <a href="http://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> completely free operating system: transparent and modifiable.
-              </p>
+              </li>
 
-              <p>
+              <li>
                 Break the cycle of forced upgrades and planned obsolescence.
-              </p>
+              </li>
 
-              <p>
+              <li>
                 Comes with all the software you need and an easy software manager to find more.
-              </p>
-              <p>Works great with the Wi-Fi adapters in this guide.</p>
+              </li>
+              <li>Works great with the Wi-Fi adapters in this guide.</li>
             </ul>
 
 
@@ -372,17 +372,17 @@
 
             <h4 class="title">Windows</h4>
             <ul>
-              <p>
+              <li>
                 Proprietary software that profits from controlling how you use your computer.
-              </p>
+              </li>
 
-              <p>
+              <li>
                 Invades privacy and exposes personal data to <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInWindows">Microsoft</a>, the NSA, and other malicious attackers.
-              </p>
+              </li>
 
-              <p>
+              <li>
                 Dependent on mandatory upgrades and devices that don't support older versions of Windows.
-              </p>
+              </li>
             </ul>
 
 
@@ -416,9 +416,9 @@
 
               <h4 class="title">FSF Membership Card</h4>
               <ul>
-                <p>Join over 3,000 active members working to make a better world built on free software.</p>
-                <p>Enjoy a host of <a href="https://www.fsf.org/associate/benefits">member benefits</a>, including admission to the <a href="http://libreplanet.org/wiki/LibrePlanet:Conference">yearly LibrePlanet conference</a>.</p>
-                <p>Membership donations are tax-deductible in the US. For a smaller gift, <a href="https://www.fsf.org/donate">donate in a friend's name</a>.</p>
+                <li>Join over 3,000 active members working to make a better world built on free software.</li>
+                <li>Enjoy a host of <a href="https://www.fsf.org/associate/benefits">member benefits</a>, including admission to the <a href="http://libreplanet.org/wiki/LibrePlanet:Conference">yearly LibrePlanet conference</a>.</li>
+                <li>Membership donations are tax-deductible in the US. For a smaller gift, <a href="https://www.fsf.org/donate">donate in a friend's name</a>.</li>
               </ul>
 
             </div>
@@ -431,13 +431,13 @@
 
               <h4 class="title">iTunes Card</h4>
               <ul>
-                <p> <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a>
+                <li> <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a>
                   on everything (except music) controls what you can do with your purchases.
-                </p>
+                </li>
 
-                <p> Apple claims (wrongly) that you don't actually own anything you buy from the iTunes store.</p>
+                <li> Apple claims (wrongly) that you don't actually own anything you buy from the iTunes store.</li>
 
-                <p> Requires proprietary software to use, even to download DRM-free music.</p>
+                <li> Requires proprietary software to use, even to download DRM-free music.</li>
               </ul>
 
             </div>
@@ -471,20 +471,20 @@
 
             <h4 class="title">Replicant</h4>
             <ul>
-              <p>
+              <li>
                 Fully free software, based on Android.
-              </p>
+              </li>
 
-              <p>
+              <li>
                 <a href="http://redmine.replicant.us/projects/replicant/wiki/ReplicantStatus#Replicant-42">
                   Supported devices
                 </a> include both phones and tablets.
-              </p>
+              </li>
 
-              <p>
+              <li>
                 Works on used devices, so your dollars won't go to proprietary OS companies. (All commercially
                 available Android devices ship with some proprietary software.)
-              </p>
+              </li>
             </ul>
 
 
@@ -498,13 +498,13 @@
 
             <h4 class="title">Apple iPhone, iPad and Watch</h4>
             <ul>
-              <p>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</p>
-              <p>
+              <li>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</li>
+              <li>
                 iOS is a fully proprietary operating system, giving Apple control over the software on the devices.
-              </p>
-              <p>
+              </li>
+              <li>
                 Apple uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to block competing software.
-              </p>
+              </li>
 
             </ul>
           </div>
@@ -539,17 +539,17 @@
               <h4 class="title">Least Authority File System</h4>
 
               <ul>
-                <p>
+                <li>
                   Free software system guarantees that you control who sees your data.
-                </p>
+                </li>
 
-                <p>
+                <li>
                   Decentralized infrastructure protects from attacks and give you flexibility in how your data is stored.
-                </p>
+                </li>
 
-                <p>
+                <li>
                   Client side encryption to prevent snooping, unlike Google Drive, Dropbox, Apple iCloud, Microsoft SkyDrive, and Ubuntu One.
-                </p>
+                </li>
               </ul>
 
             </div>
@@ -563,14 +563,14 @@
               <h4 class="title">Google Drive</h4>
               <ul>
 
-                <p>
+                <li>
                   Requires granting Google a virtually unlimited license to any public data, and also having your public and personal data mined for ads.
-                </p>
+                </li>
 
-                <p>
+                <li>
                   Data may be accessed by <a href="http://arstechnica.com/information-technology/2013/10/how-the-nsas-muscular-tapped-googles-and-yahoos-private-networks/">
                     intelligence agencies.</a>
-                  </p>
+                  </li>
 
                 </ul>
 
@@ -607,13 +607,13 @@
                 <h4 class="title">GNU MediaGoblin</h4>
 
                 <ul>
-                  <p>
+                  <li>
                     Soon-to-be federated to allow decentralized sharing.
-                  </p>
+                  </li>
 
-                  <p>Supports free video formats and grants the ability to choose a <a href="https://www.gnu.org/copyleft/">copyleft license</a>.</p>
+                  <li>Supports free video formats and grants the ability to choose a <a href="https://www.gnu.org/copyleft/">copyleft license</a>.</li>
 
-                  <p>Source files can be attached to an upload, making it easy to remix people's work.</p>
+                  <li>Source files can be attached to an upload, making it easy to remix people's work.</li>
 
 
                 </ul>
@@ -628,19 +628,19 @@
 
                 <h4 class="title">YouTube</h4>
                 <ul>
-                  <p>
+                  <li>
                     Uses proprietary Adobe Flash player and patent-encumbered H.264 codec by default.
-                  </p>
-                  <p>
+                  </li>
+                  <li>
                     Even the optional HTML5 player requires proprietary JavaScript.
-                  </p>
-                  <p>
+                  </li>
+                  <li>
                     Implements <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to control access to videos by device and region.
-                  </p>
+                  </li>
 
-                  <p>
+                  <li>
                     Imposes advertising on your uploads and polices copyright harshly.
-                  </p>
+                  </li>
                 </ul>
 
               </div>
@@ -723,10 +723,10 @@
           </div>
           <!-- end recommended-->
 
-          <!-- h-node section-->
-          <div class="hnode">
-            <h1 class="topic_title">More devices on h-node</h1>
-            <p>To learn more about which hardware supports free software and which doesn't, explore the community-run <a href="https://www.h-node.org/">h-node database</a>.</p>
+          <!-- h-node block. Using licenses class as a quick and dirty way to match its formatting. Others are welcome to improve this. -->
+          <div class="licenses">
+          <h1 class="topic_title">More devices on h-node</h1>
+          <p>To learn more about which hardware supports free software and which doesn't, explore the community-run <a href="https://www.h-node.org/">h-node database</a>.</p>
           </div>
           <!-- end h-node block -->
 
@@ -734,20 +734,24 @@
 
           <div class="licenses">
             <h1 class="topic_title">Licenses</h1>
-            <p>This page by the Free Software Foundation is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 Unported.</a></p>
+            <p>This page by the Free Software Foundation is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 Unported.</a>
+            </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>
-            <p><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></p>
-            <p><a href="http://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></p>
-            <p><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></p>
-            <p><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></p>
-            <p><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></p>
-            <p><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></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>The Amazon, iOS, YouTube, Google Drive and Adobe Photoshop and Illustrator logos are in the public domain but are registered trademarks.</p>
-            <p><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></p>
-            <p>Tehnoetic Wi-Fi dongle by Tehnoetic 2014 licensed under CC BY-SA 4.0.</p>
-            <p>The Least Authority logo is copyright Least Authority Enterprises.</p>
-            <p>The Media Goblin graphic is public domain.</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="http://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>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 Least Authority logo is copyright Least Authority Enterprises.</li>
+              <li>The Media Goblin graphic is public domain.</li>
+            </ul>
+
           </div>
           <!-- end licenses-->
 
diff --git a/stylesheet.css b/stylesheet.css
index ccc1f4b..a0418a1 100755
--- a/stylesheet.css
+++ b/stylesheet.css
@@ -70,7 +70,7 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
   background-color: #2CAF8F;
   height: 486px;
   margin: auto;
-  width: 100%;
+  width: 100%;  
   /*width: 1300px;*/
 }
 
@@ -209,8 +209,7 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
 .section_wrapper,
 .buy_avoid,
 .recommended,
-.licenses,
-.hnode {
+.licenses {
   max-width: 750px;
   min-width: 750px;
   margin: auto;
@@ -371,16 +370,12 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
   margin-top: 0.6em;
 }
 
-.licenses p {
-  margin-bottom: 0.6em;
-}
-
 /* Footer */
 
 footer {
   display: block;
   background-color: #1a1a1a;
-  width: 100%;
+  width: 100%;  
   /*width: 1300px;*/
 }