www/philosophy latest-articles.html essays-and-...

[Pavel Kharitonov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       15/11/02 16:27:16

Modified files:
        philosophy     : latest-articles.html essays-and-articles.html 

Log message:
        Revert per #1058142.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/latest-articles.html?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/essays-and-articles.html?cvsroot=www&r1=1.77&r2=1.78

Patches:
Index: latest-articles.html
===================================================================
RCS file: /web/www/www/philosophy/latest-articles.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- latest-articles.html        2 Nov 2015 16:25:13 -0000       1.46
+++ latest-articles.html        2 Nov 2015 16:27:16 -0000       1.47
@@ -26,8 +26,6 @@
 software and the GNU project.</p>
 
 <ul>
- <li><a href="/philosophy/how-apply-free-software-criteria.html">
-  Applying the Free Software Criteria</a></li>
  <li><a href="/philosophy/komongistan.html">The Curious History of 
   Komongistan (Busting the term &ldquo;intellectual property&rdquo;)</a></li>
 <li><a href="/philosophy/free-hardware-designs.html">
@@ -45,6 +43,7 @@
     Surveillance Can Democracy Withstand?</a></li>
 <li><a href="/philosophy/why-call-it-the-swindle.html">
     Why call it the Swindle</a></li>
+<li><a href="/philosophy/proprietary.html">Proprietary Software</a></li>
 <li><a href="/philosophy/is-ever-good-use-nonfree-program.html">
     Is It Ever a Good Thing to Use a Nonfree Program?</a></li>
 <li><a href="/philosophy/funding-art-vs-funding-software.html">
@@ -75,6 +74,15 @@
 <li><a href="/philosophy/government-free-software.html">
     How Should Governments Promote Free Software?</a></li>
 <li><a href="/philosophy/practical.html">The advantages of free 
software</a></li>
+<li><a href="/philosophy/assigning-copyright.html">When a Company
+      Asks For Your Copyright</a></li>
+<li><a href="/philosophy/google-engineering-talk.html">GNU &amp; The Free
+      Software Foundation - Engineering Tech Talk at Google</a></li>
+<li><a 
href="http://www.guardian.co.uk/technology/blog/2010/apr/06/digital-economy-bill-richard-stallman";>
+    Digital economy bill: One clown giveth and the other clown taketh
+    away</a></li>
+<li><a href="/philosophy/who-does-that-server-really-serve.html">
+    Who Does That Server Really Serve?</a></li>
 </ul>
 
 </div><!-- for id="content", starts in the include above -->
@@ -109,7 +117,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -130,14 +138,14 @@
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/11/02 16:25:13 $
+$Date: 2015/11/02 16:27:16 $
 <!-- timestamp end -->
 </p>
 </div>

Index: essays-and-articles.html
===================================================================
RCS file: /web/www/www/philosophy/essays-and-articles.html,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- essays-and-articles.html    2 Nov 2015 16:20:38 -0000       1.77
+++ essays-and-articles.html    2 Nov 2015 16:27:16 -0000       1.78
@@ -93,8 +93,6 @@
       Freedom 0 must not be limited.</li>
   <li><a href="/philosophy/imperfection-isnt-oppression.html">
       Imperfection is not the same as oppression</a></li> 
-  <li><a href="/philosophy/how-apply-free-software-criteria.html">
-      Applying the Free Software Criteria</a></li>
 </ul>
 
 <h3 id="aboutgnu">About the GNU Operating System</h3>
@@ -605,7 +603,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/11/02 16:20:38 $
+$Date: 2015/11/02 16:27:16 $
 <!-- timestamp end -->
 </p>
 </div>