www/philosophy correcting-france-mistake.html

[Pavel Kharitonov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       12/04/27 06:04:14

Modified files:
        philosophy     : correcting-france-mistake.html 

Log message:
        Fix Parent-Version; use &mdash;; s|non-free|nonfree| for consistency;
        fix a typo s|Millenium|Millennium|.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/correcting-france-mistake.html?cvsroot=www&r1=1.3&r2=1.4

Patches:
Index: correcting-france-mistake.html
===================================================================
RCS file: /web/www/www/philosophy/correcting-france-mistake.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- correcting-france-mistake.html      27 Apr 2012 00:29:42 -0000      1.3
+++ correcting-france-mistake.html      27 Apr 2012 06:03:49 -0000      1.4
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: $Revision: 1.3 $ -->
+<!-- Parent-Version: 1.68 -->
 
 <title>Correcting My Mistake about French Law - GNU Project - Free Software 
Foundation</title>
 <!--#include virtual="/server/banner.html" -->
@@ -19,8 +19,8 @@
 <p>That is what Sarkozy's DADVSI law said when it was adopted, but I
 recently learned that the Conseil d'Etat introduced some
 exceptions. In fact, free software to decrypt and play DVDs is
-legally distributed in France -- unlike the US, where it was censored
-by the infamous 1998 law, the Digital Millenium Copyright Act.</p>
+legally distributed in France&mdash;unlike the US, where it was censored
+by the infamous 1998 law, the Digital Millennium Copyright Act.</p>
 
 <p>However, it's not clear whether this will apply to other DRM schemes.
 There is a danger that the complex conditions will specifically
@@ -39,7 +39,7 @@
 to install free DVD-playing software was because of this French law.
 I go to France from time to time, and I was concerned there might be
 some who would wish to have me imprisoned for this so as to terrorize
-other netizens. I refuse to have any non-free software, and the only
+other netizens. I refuse to have any nonfree software, and the only
 option that left me was to have no software for this job. Thus, I
 could not play encrypted DVDs at all.</p>
 
@@ -91,7 +91,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/04/27 00:29:42 $
+$Date: 2012/04/27 06:03:49 $
 <!-- timestamp end -->
 </p>
 </div>