www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/philosophy misinterpreting-copyright.nl.htm...


From: GNUN
Subject: www/philosophy misinterpreting-copyright.nl.htm...
Date: Sun, 01 Nov 2015 12:14:54 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/11/01 12:14:54

Modified files:
        philosophy     : misinterpreting-copyright.nl.html 
                         misinterpreting-copyright.zh-cn.html 
        philosophy/po  : misinterpreting-copyright.nl-diff.html 
                         misinterpreting-copyright.zh-cn-diff.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/misinterpreting-copyright.nl.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/misinterpreting-copyright.zh-cn.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/misinterpreting-copyright.nl-diff.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/misinterpreting-copyright.zh-cn-diff.html?cvsroot=www&r1=1.5&r2=1.6

Patches:
Index: misinterpreting-copyright.nl.html
===================================================================
RCS file: /web/www/www/philosophy/misinterpreting-copyright.nl.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- misinterpreting-copyright.nl.html   9 Feb 2015 21:03:00 -0000       1.17
+++ misinterpreting-copyright.nl.html   1 Nov 2015 12:14:41 -0000       1.18
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" 
value="/philosophy/misinterpreting-copyright.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/misinterpreting-copyright.nl.po">
+ http://www.gnu.org/philosophy/po/misinterpreting-copyright.nl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" 
value="/philosophy/misinterpreting-copyright.html"
+ --><!--#set var="DIFF_FILE" 
value="/philosophy/po/misinterpreting-copyright.nl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-09-02" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/misinterpreting-copyright.en.html" -->
 
 <!--#include virtual="/server/header.nl.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -9,6 +14,7 @@
 
 <!--#include virtual="/philosophy/po/misinterpreting-copyright.translist" -->
 <!--#include virtual="/server/banner.nl.html" -->
+<!--#include virtual="/server/outdated.nl.html" -->
 <h2>Verkeerd Uitleg van Auteursrecht&mdash;Een Serie Fouten</h2>
 
 <p>door <a href="http://stallman.org/";><strong>Richard 
Stallman</strong></a></p>
@@ -655,7 +661,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Bijgewerkt:
 
-$Date: 2015/02/09 21:03:00 $
+$Date: 2015/11/01 12:14:41 $
 
 <!-- timestamp end -->
 </p>

Index: misinterpreting-copyright.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/misinterpreting-copyright.zh-cn.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- misinterpreting-copyright.zh-cn.html        12 Jul 2014 12:59:08 -0000      
1.32
+++ misinterpreting-copyright.zh-cn.html        1 Nov 2015 12:14:45 -0000       
1.33
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" 
value="/philosophy/misinterpreting-copyright.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/misinterpreting-copyright.zh-cn.po">
+ http://www.gnu.org/philosophy/po/misinterpreting-copyright.zh-cn.po</a>'
+ --><!--#set var="ORIGINAL_FILE" 
value="/philosophy/misinterpreting-copyright.html"
+ --><!--#set var="DIFF_FILE" 
value="/philosophy/po/misinterpreting-copyright.zh-cn-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-09-02" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/misinterpreting-copyright.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
 
 <!--#include virtual="/philosophy/po/misinterpreting-copyright.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/server/outdated.zh-cn.html" -->
 <h2>对版权的误解&mdash;一系列的错误</h2>
 
 <p><a href="http://stallman.org/";><strong>Richard Stallman</strong></a> 著</p>
@@ -319,7 +325,7 @@
 <p class="unprintable"><!-- timestamp start -->
 更新:
 
-$Date: 2014/07/12 12:59:08 $
+$Date: 2015/11/01 12:14:45 $
 
 <!-- timestamp end -->
 </p>

Index: po/misinterpreting-copyright.nl-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/misinterpreting-copyright.nl-diff.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/misinterpreting-copyright.nl-diff.html   12 Apr 2014 13:59:15 -0000      
1.5
+++ po/misinterpreting-copyright.nl-diff.html   1 Nov 2015 12:14:49 -0000       
1.6
@@ -11,21 +11,13 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.77 
--&gt;</em></ins></span>
+&lt;!-- Parent-Version: 1.77 --&gt;
 &lt;title&gt;Misinterpreting Copyright
-- GNU Project - Free Software <span class="removed"><del><strong>Foundation 
(FSF)&lt;/title&gt;</strong></del></span> <span 
class="inserted"><ins><em>Foundation&lt;/title&gt;</em></ins></span>
+- GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/philosophy/po/misinterpreting-copyright.translist" 
--&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
 &lt;h2&gt;Misinterpreting Copyright&mdash;A Series of Errors&lt;/h2&gt;
 
-<span class="removed"><del><strong>&lt;!-- This document uses XHTML 1.0 
Strict, but may be served as --&gt;
-&lt;!-- text/html.  Please ensure that markup style considers --&gt;
-&lt;!-- appendex C of the XHTML 1.0 standard. See validator.w3.org. --&gt;
-
-&lt;!-- Please ensure links are consistent with Apache's MultiView. --&gt;
-&lt;!-- Change include statements to be consistent with the relevant --&gt;
-&lt;!-- language, where necessary. --&gt;</strong></del></span>
-
 &lt;p&gt;by &lt;a href="http://stallman.org/"&gt;&lt;strong&gt;Richard 
Stallman&lt;/strong&gt;&lt;/a&gt;&lt;/p&gt;
 
 &lt;p&gt;
@@ -329,7 +321,9 @@
 possible benefit to the public, since there is no way to retroactively
 increase now the number of books published back then.  Yet it cost the
 public a freedom that is meaningful today&mdash;the freedom to
-redistribute books from that era.&lt;/p&gt;
+redistribute books from that <span 
class="removed"><del><strong>era.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>era.  Note the use of the propaganda
+term, &ldquo;&lt;a href="/philosophy/words-to-avoid.html#Protect"
+&gt;protect&lt;/a&gt;,&rdquo; which embodies the second of the three 
errors.&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 The bill also extended the copyrights of works yet to be written.  For
 works made for hire, copyright would last 95 years instead of the
@@ -367,9 +361,12 @@
 to be nice.  Previously this was not a crime in the US at all.&lt;/p&gt;
 &lt;p&gt;
 An even worse law, the Digital Millennium Copyright Act (DMCA), was
-designed to bring back copy protection (which computer users detest)
-by making it a crime to break copy protection, or even publish
-information about how to break it.  This law ought to be called the
+designed to bring back <span class="removed"><del><strong>copy protection 
(which computer</strong></del></span> <span class="inserted"><ins><em>what was 
then called &ldquo;copy
+protection&rdquo; &mdash; now known
+as &lt;a href="/proprietary/proprietary-drm.html"&gt;DRM&lt;/a&gt; (Digital
+Restrictions Management) &mdash; which</em></ins></span> users <span 
class="removed"><del><strong>detest)</strong></del></span> <span 
class="inserted"><ins><em>already detested,</em></ins></span>
+by making it a crime to <span class="removed"><del><strong>break copy 
protection,</strong></del></span> <span class="inserted"><ins><em>defeat the 
restrictions,</em></ins></span> or even publish
+information about how to <span class="removed"><del><strong>break 
it.</strong></del></span> <span class="inserted"><ins><em>defeat 
them.</em></ins></span>  This law ought to be called the
 &ldquo;Domination by Media Corporations Act&rdquo; because it
 effectively offers publishers the chance to write their own copyright
 law.  It says they can impose any restrictions whatsoever on the use
@@ -619,37 +616,21 @@
 &lt;/ol&gt;
 
 &lt;hr /&gt;
-<span class="removed"><del><strong>&lt;h4&gt;This</strong></del></span>
-<span class="inserted"><ins><em>&lt;blockquote id="fsfs"&gt;&lt;p 
class="big"&gt;This</em></ins></span> essay is published
+&lt;blockquote id="fsfs"&gt;&lt;p class="big"&gt;This essay is published
 in &lt;a 
href="http://shop.fsf.org/product/free-software-free-society/"&gt;&lt;cite&gt;Free
 Software, Free Society: The Selected Essays of Richard
-M. <span 
class="removed"><del><strong>Stallman&lt;/cite&gt;&lt;/a&gt;&lt;/h4&gt;
-
-&lt;!-- If needed, change the copyright block at the bottom. In general, --&gt;
-&lt;!-- all pages on the GNU web server should have the section about    --&gt;
-&lt;!-- verbatim copying.  Please do NOT remove this without talking     --&gt;
-&lt;!-- with the webmasters first. --&gt; 
-&lt;!-- Please make sure the copyright date is consistent with the document 
--&gt;
-&lt;!-- and that it is like this "2001, 2002" not this "2001-2002." 
--&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/cite&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;</em></ins></span>
+M. Stallman&lt;/cite&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
 &lt;div id="footer"&gt;
+&lt;div class="unprintable"&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;
-Please</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="unprintable"&gt;
-
-&lt;p&gt;Please</em></ins></span> send <span 
class="inserted"><ins><em>general</em></ins></span> FSF &amp; GNU inquiries to
+&lt;p&gt;Please send general FSF &amp; GNU inquiries to
 &lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
 There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
-the FSF.
-<span class="removed"><del><strong>&lt;br /&gt;
-Please send broken</strong></del></span>  <span 
class="inserted"><ins><em>Broken</em></ins></span> links and other corrections 
or suggestions <span class="inserted"><ins><em>can be sent</em></ins></span>
-to &lt;a <span 
class="removed"><del><strong>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
-&lt;/p&gt;
-
-&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+the FSF.  Broken links and other corrections or suggestions can be sent
+to &lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
         replace it with the translation of these two:
@@ -663,20 +644,16 @@
         &lt;p&gt;For information on coordinating and submitting translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
-        README&lt;/a&gt;. --&gt;</em></ins></span>
+        README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
 README&lt;/a&gt; for information on coordinating and submitting translations
-of this <span class="removed"><del><strong>article.
-&lt;/p&gt;
-
-&lt;p&gt;
-Copyright</strong></del></span> <span 
class="inserted"><ins><em>article.&lt;/p&gt;
+of this article.&lt;/p&gt;
 &lt;/div&gt;
 
 &lt;!-- 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 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND <span class="removed"><del><strong>3.0 
US.</strong></del></span> <span 
class="inserted"><ins><em>4.0.</em></ins></span>  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
@@ -691,21 +668,18 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright</em></ins></span> &copy; 2002, 2003, 2007 Free Software 
Foundation, <span class="removed"><del><strong>Inc.
-&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>Inc.&lt;/p&gt;</em></ins></span>
+&lt;p&gt;Copyright &copy; 2002, 2003, <span 
class="removed"><del><strong>2007</strong></del></span> <span 
class="inserted"><ins><em>2007, 2015</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
-Commons Attribution-NoDerivs 3.0 United States <span 
class="removed"><del><strong>License&lt;/a&gt;.
-&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>License&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
+<span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
+<span 
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United 
States</strong></del></span> <span 
class="inserted"><ins><em>Attribution-NoDerivatives 4.0 
International</em></ins></span> License&lt;/a&gt;.&lt;/p&gt;
 
 &lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;Updated:</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
+&lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2014/04/12 13:59:15 $
+$Date: 2015/11/01 12:14:49 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/misinterpreting-copyright.zh-cn-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/misinterpreting-copyright.zh-cn-diff.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/misinterpreting-copyright.zh-cn-diff.html        12 Apr 2014 13:59:16 
-0000      1.5
+++ po/misinterpreting-copyright.zh-cn-diff.html        1 Nov 2015 12:14:52 
-0000       1.6
@@ -11,21 +11,13 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.77 
--&gt;</em></ins></span>
+&lt;!-- Parent-Version: 1.77 --&gt;
 &lt;title&gt;Misinterpreting Copyright
-- GNU Project - Free Software <span class="removed"><del><strong>Foundation 
(FSF)&lt;/title&gt;</strong></del></span> <span 
class="inserted"><ins><em>Foundation&lt;/title&gt;</em></ins></span>
+- GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/philosophy/po/misinterpreting-copyright.translist" 
--&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
 &lt;h2&gt;Misinterpreting Copyright&mdash;A Series of Errors&lt;/h2&gt;
 
-<span class="removed"><del><strong>&lt;!-- This document uses XHTML 1.0 
Strict, but may be served as --&gt;
-&lt;!-- text/html.  Please ensure that markup style considers --&gt;
-&lt;!-- appendex C of the XHTML 1.0 standard. See validator.w3.org. --&gt;
-
-&lt;!-- Please ensure links are consistent with Apache's MultiView. --&gt;
-&lt;!-- Change include statements to be consistent with the relevant --&gt;
-&lt;!-- language, where necessary. --&gt;</strong></del></span>
-
 &lt;p&gt;by &lt;a href="http://stallman.org/"&gt;&lt;strong&gt;Richard 
Stallman&lt;/strong&gt;&lt;/a&gt;&lt;/p&gt;
 
 &lt;p&gt;
@@ -329,7 +321,9 @@
 possible benefit to the public, since there is no way to retroactively
 increase now the number of books published back then.  Yet it cost the
 public a freedom that is meaningful today&mdash;the freedom to
-redistribute books from that era.&lt;/p&gt;
+redistribute books from that <span 
class="removed"><del><strong>era.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>era.  Note the use of the propaganda
+term, &ldquo;&lt;a href="/philosophy/words-to-avoid.html#Protect"
+&gt;protect&lt;/a&gt;,&rdquo; which embodies the second of the three 
errors.&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 The bill also extended the copyrights of works yet to be written.  For
 works made for hire, copyright would last 95 years instead of the
@@ -367,9 +361,12 @@
 to be nice.  Previously this was not a crime in the US at all.&lt;/p&gt;
 &lt;p&gt;
 An even worse law, the Digital Millennium Copyright Act (DMCA), was
-designed to bring back copy protection (which computer users detest)
-by making it a crime to break copy protection, or even publish
-information about how to break it.  This law ought to be called the
+designed to bring back <span class="removed"><del><strong>copy protection 
(which computer</strong></del></span> <span class="inserted"><ins><em>what was 
then called &ldquo;copy
+protection&rdquo; &mdash; now known
+as &lt;a href="/proprietary/proprietary-drm.html"&gt;DRM&lt;/a&gt; (Digital
+Restrictions Management) &mdash; which</em></ins></span> users <span 
class="removed"><del><strong>detest)</strong></del></span> <span 
class="inserted"><ins><em>already detested,</em></ins></span>
+by making it a crime to <span class="removed"><del><strong>break copy 
protection,</strong></del></span> <span class="inserted"><ins><em>defeat the 
restrictions,</em></ins></span> or even publish
+information about how to <span class="removed"><del><strong>break 
it.</strong></del></span> <span class="inserted"><ins><em>defeat 
them.</em></ins></span>  This law ought to be called the
 &ldquo;Domination by Media Corporations Act&rdquo; because it
 effectively offers publishers the chance to write their own copyright
 law.  It says they can impose any restrictions whatsoever on the use
@@ -619,37 +616,21 @@
 &lt;/ol&gt;
 
 &lt;hr /&gt;
-<span class="removed"><del><strong>&lt;h4&gt;This</strong></del></span>
-<span class="inserted"><ins><em>&lt;blockquote id="fsfs"&gt;&lt;p 
class="big"&gt;This</em></ins></span> essay is published
+&lt;blockquote id="fsfs"&gt;&lt;p class="big"&gt;This essay is published
 in &lt;a 
href="http://shop.fsf.org/product/free-software-free-society/"&gt;&lt;cite&gt;Free
 Software, Free Society: The Selected Essays of Richard
-M. <span 
class="removed"><del><strong>Stallman&lt;/cite&gt;&lt;/a&gt;&lt;/h4&gt;
-
-&lt;!-- If needed, change the copyright block at the bottom. In general, --&gt;
-&lt;!-- all pages on the GNU web server should have the section about    --&gt;
-&lt;!-- verbatim copying.  Please do NOT remove this without talking     --&gt;
-&lt;!-- with the webmasters first. --&gt; 
-&lt;!-- Please make sure the copyright date is consistent with the document 
--&gt;
-&lt;!-- and that it is like this "2001, 2002" not this "2001-2002." 
--&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/cite&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;</em></ins></span>
+M. Stallman&lt;/cite&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
 &lt;div id="footer"&gt;
+&lt;div class="unprintable"&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;
-Please</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="unprintable"&gt;
-
-&lt;p&gt;Please</em></ins></span> send <span 
class="inserted"><ins><em>general</em></ins></span> FSF &amp; GNU inquiries to
+&lt;p&gt;Please send general FSF &amp; GNU inquiries to
 &lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
 There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
-the FSF.
-<span class="removed"><del><strong>&lt;br /&gt;
-Please send broken</strong></del></span>  <span 
class="inserted"><ins><em>Broken</em></ins></span> links and other corrections 
or suggestions <span class="inserted"><ins><em>can be sent</em></ins></span>
-to &lt;a <span 
class="removed"><del><strong>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
-&lt;/p&gt;
-
-&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+the FSF.  Broken links and other corrections or suggestions can be sent
+to &lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
         replace it with the translation of these two:
@@ -663,20 +644,16 @@
         &lt;p&gt;For information on coordinating and submitting translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
-        README&lt;/a&gt;. --&gt;</em></ins></span>
+        README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
 README&lt;/a&gt; for information on coordinating and submitting translations
-of this <span class="removed"><del><strong>article.
-&lt;/p&gt;
-
-&lt;p&gt;
-Copyright</strong></del></span> <span 
class="inserted"><ins><em>article.&lt;/p&gt;
+of this article.&lt;/p&gt;
 &lt;/div&gt;
 
 &lt;!-- 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 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND <span class="removed"><del><strong>3.0 
US.</strong></del></span> <span 
class="inserted"><ins><em>4.0.</em></ins></span>  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
@@ -691,21 +668,18 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright</em></ins></span> &copy; 2002, 2003, 2007 Free Software 
Foundation, <span class="removed"><del><strong>Inc.
-&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>Inc.&lt;/p&gt;</em></ins></span>
+&lt;p&gt;Copyright &copy; 2002, 2003, <span 
class="removed"><del><strong>2007</strong></del></span> <span 
class="inserted"><ins><em>2007, 2015</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
-Commons Attribution-NoDerivs 3.0 United States <span 
class="removed"><del><strong>License&lt;/a&gt;.
-&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>License&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
+<span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
+<span 
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United 
States</strong></del></span> <span 
class="inserted"><ins><em>Attribution-NoDerivatives 4.0 
International</em></ins></span> License&lt;/a&gt;.&lt;/p&gt;
 
 &lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;Updated:</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
+&lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2014/04/12 13:59:16 $
+$Date: 2015/11/01 12:14:52 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]