add licenses
authorGreg Farough <gregf@fsf.org>
Wed, 27 Nov 2019 15:03:14 +0000 (10:03 -0500)
committerGreg Farough <gregf@fsf.org>
Wed, 27 Nov 2019 15:03:14 +0000 (10:03 -0500)
v10/givingguide.html

index 2c5a67e..659fefa 100644 (file)
@@ -1164,7 +1164,7 @@ numbers, which aids in password generation and encryption.</p>
                  </div>
           <div class="good col-md-6 col-sm-6">
 <ul class="cons">
-<li>Stay away from: Spotify, iTunes, and all other major streaming services</li>
+<li>Stay away from: Spotify, Apple Music, and all other major streaming services</li>
 <li>Spotify is only one of many offenders when it comes to putting DRM in music: all major streaming services do this, with the support of big record labels.</li>
 <li>In addition to streaming music encumbered by DRM, people who want to use Spotify are required to install additional proprietary software. Even Spotify's client for GNU/Linux relies on proprietary software.</li>
 <li><p>Apple Music is no better, and places heavy restrictions on the music streamed through the platform.</p></li>
@@ -1199,7 +1199,7 @@ numbers, which aids in password generation and encryption.</p>
             <h5 class="text-center">Stay away from: Netflix</h5>
               <ul class="cons">
                                <li><p>Netflix is continuing its <a href="https://defectivebydesign.org/netflix">disturbing trend</a> of making onerous DRM the norm for streaming media.</p>
-<li><p>They're also leveraging their newfound place in the <a href="https://torrentfreak.com/netflix-becomes-a-member-of-the-mpaa/">Motion Picture Association of America</a> (MPAA) to advocate for tighter restrictions on users, and also embedded DRM into the <a href="https://www.defectivebydesign.org/no-drm-in-html5">fabric of the Web</a>.</p</li>
+<li><p>They're also leveraging their newfound place in the <a href="https://torrentfreak.com/netflix-becomes-a-member-of-the-mpaa/">Motion Picture Association of America</a> (MPAA) to advocate for tighter restrictions on users, and were responsible for embedding DRM into the <a href="https://www.defectivebydesign.org/no-drm-in-html5">fabric of the Web</a>.</p</li>
             </ul>
           </div>
           <!--End Bad-->
@@ -1318,7 +1318,37 @@ numbers, which aids in password generation and encryption.</p>
           <!-- End Container -->
         </section>
         <!-- End Promotion details   -->
+        <!-- Begin Licenses -->
+        <section class="licenses">
+          <div class="container">
+            <div class="row">
+              <div class="col-md-12">
+                <div class="panel-default">
+                  <div class="panel-heading">
+                   <h1 class="fix-margin">Licenses</h1>
 
+                  </div>
+                  <div class="panel-body" id="licenses">
+                    <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</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>
+                    <ul style="list-style: none inside none;">
+                                         <li>Purism product image licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution ShareAlike 4.0</a> license.</li>
+                      <li>X200 image in the public domain.</li>
+                                         <li>NeuG image licensed under the <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0</a> license.</li>
+                      <li>ThinkPenguin images are licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution ShareAlike 4.0</a> license.</li> 
+                      <li>Technoethical Replicant S3 image licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li>
+                     <li>Photo of bookshelf by <a href="https://www.flickr.com/photos/seeminglee/4556156477/">See-ming Lee</a> licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> license.</li>
+                  </div>
+                </div>
+              </div>
+              <!-- End Panel -->
+            </div>
+            <!-- End Row -->
+          </div>
+          <!-- End Container -->
+        </section>
+        <!-- End Licenses   -->
         <!--Begin Footer-->
         <footer>
           <div class="container-fluid">