[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses copyleft.ca.html copyleft.el.html ...
|
From: |
GNUN |
|
Subject: |
www/licenses copyleft.ca.html copyleft.el.html ... |
|
Date: |
Wed, 02 Dec 2015 17:31:48 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/12/02 17:31:47
Modified files:
licenses : copyleft.ca.html copyleft.el.html
copyleft.ml.html copyleft.zh-cn.html
licenses/po : copyleft.ca-diff.html copyleft.el-diff.html
copyleft.zh-cn-diff.html
Added files:
licenses/po : copyleft.ml-diff.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/copyleft.ca.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/copyleft.el.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/copyleft.ml.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/copyleft.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/copyleft.ca-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/copyleft.el-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/copyleft.zh-cn-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/copyleft.ml-diff.html?cvsroot=www&rev=1.1
Patches:
Index: copyleft.ca.html
===================================================================
RCS file: /web/www/www/licenses/copyleft.ca.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- copyleft.ca.html 3 Oct 2015 17:04:25 -0000 1.1
+++ copyleft.ca.html 2 Dec 2015 17:31:41 -0000 1.2
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/licenses/copyleft.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/licenses/po/copyleft.ca.po">
+ http://www.gnu.org/licenses/po/copyleft.ca.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/licenses/copyleft.html"
+ --><!--#set var="DIFF_FILE" value="/licenses/po/copyleft.ca-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-10-03" --><!--#set
var="ENGLISH_PAGE" value="/licenses/copyleft.en.html" -->
<!--#include virtual="/server/header.ca.html" -->
<!-- Parent-Version: 1.77 -->
@@ -9,6 +14,7 @@
<!--#include virtual="/licenses/po/copyleft.translist" -->
<!--#include virtual="/server/banner.ca.html" -->
+<!--#include virtual="/server/outdated.ca.html" -->
<h2>Què és el copyleft?</h2>
<p>
@@ -250,7 +256,7 @@
<p class="unprintable"><!-- timestamp start -->
Updated:
-$Date: 2015/10/03 17:04:25 $
+$Date: 2015/12/02 17:31:41 $
<!-- timestamp end -->
</p>
Index: copyleft.el.html
===================================================================
RCS file: /web/www/www/licenses/copyleft.el.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- copyleft.el.html 3 Oct 2015 17:04:25 -0000 1.1
+++ copyleft.el.html 2 Dec 2015 17:31:42 -0000 1.2
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/licenses/copyleft.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/licenses/po/copyleft.el.po">
+ http://www.gnu.org/licenses/po/copyleft.el.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/licenses/copyleft.html"
+ --><!--#set var="DIFF_FILE" value="/licenses/po/copyleft.el-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-10-03" --><!--#set
var="ENGLISH_PAGE" value="/licenses/copyleft.en.html" -->
<!--#include virtual="/server/header.el.html" -->
<!-- Parent-Version: 1.77 -->
@@ -9,6 +14,7 @@
<!--#include virtual="/licenses/po/copyleft.translist" -->
<!--#include virtual="/server/banner.el.html" -->
+<!--#include virtual="/server/outdated.el.html" -->
<h2>Τι είναι Ïο copyleft;</h2>
<p>
@@ -268,7 +274,7 @@
<p class="unprintable"><!-- timestamp start -->
ÎνημεÏÏθηκε:
-$Date: 2015/10/03 17:04:25 $
+$Date: 2015/12/02 17:31:42 $
<!-- timestamp end -->
</p>
Index: copyleft.ml.html
===================================================================
RCS file: /web/www/www/licenses/copyleft.ml.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- copyleft.ml.html 3 Oct 2015 17:04:28 -0000 1.1
+++ copyleft.ml.html 2 Dec 2015 17:31:43 -0000 1.2
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/licenses/copyleft.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/licenses/po/copyleft.ml.po">
+ http://www.gnu.org/licenses/po/copyleft.ml.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/licenses/copyleft.html"
+ --><!--#set var="DIFF_FILE" value="/licenses/po/copyleft.ml-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-10-03" --><!--#set
var="ENGLISH_PAGE" value="/licenses/copyleft.en.html" -->
<!--#include virtual="/server/header.ml.html" -->
<!-- Parent-Version: 1.77 -->
@@ -11,6 +16,7 @@
<!--#include virtual="/licenses/po/copyleft.translist" -->
<!--#include virtual="/server/banner.ml.html" -->
+<!--#include virtual="/server/outdated.ml.html" -->
<h2>à´à´¨àµà´¤à´¾à´£àµ à´ªà´à´°àµâà´ªàµà´ªàµà´ªàµà´àµà´·?</h2>
<p>
@@ -261,7 +267,7 @@
<p class="unprintable"><!-- timestamp start -->
à´ªàµà´¤àµà´àµà´à´¿à´¯à´¤àµ:
-$Date: 2015/10/03 17:04:28 $
+$Date: 2015/12/02 17:31:43 $
<!-- timestamp end -->
</p>
Index: copyleft.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/copyleft.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- copyleft.zh-cn.html 3 Oct 2015 17:04:29 -0000 1.1
+++ copyleft.zh-cn.html 2 Dec 2015 17:31:45 -0000 1.2
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/licenses/copyleft.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/licenses/po/copyleft.zh-cn.po">
+ http://www.gnu.org/licenses/po/copyleft.zh-cn.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/licenses/copyleft.html"
+ --><!--#set var="DIFF_FILE" value="/licenses/po/copyleft.zh-cn-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-10-03" --><!--#set
var="ENGLISH_PAGE" value="/licenses/copyleft.en.html" -->
<!--#include virtual="/server/header.zh-cn.html" -->
<!-- Parent-Version: 1.77 -->
@@ -9,6 +14,7 @@
<!--#include virtual="/licenses/po/copyleft.translist" -->
<!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/server/outdated.zh-cn.html" -->
<h2>ä»ä¹æ¯Copyleftï¼</h2>
<p>
@@ -179,7 +185,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2015/10/03 17:04:29 $
+$Date: 2015/12/02 17:31:45 $
<!-- timestamp end -->
</p>
Index: po/copyleft.ca-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/copyleft.ca-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/copyleft.ca-diff.html 3 Oct 2015 17:04:31 -0000 1.1
+++ po/copyleft.ca-diff.html 2 Dec 2015 17:31:46 -0000 1.2
@@ -11,7 +11,7 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: <span
class="removed"><del><strong>1.76</strong></del></span> <span
class="inserted"><ins><em>1.77</em></ins></span> -->
+<!-- Parent-Version: 1.77 -->
<title>What is Copyleft? - GNU Project - Free Software
Foundation</title>
<meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation,
Linux, Copyleft" />
@@ -212,7 +212,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 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
@@ -228,19 +228,18 @@
Information document, www.gnu.org/prep/maintain. -->
<p>Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2008, <span
class="removed"><del><strong>2009</strong></del></span> <span
class="inserted"><ins><em>2009, 2014</em></ins></span> Free Software
Foundation, Inc.</p>
+2005, 2006, 2007, 2008, 2009, <span
class="removed"><del><strong>2014</strong></del></span> <span
class="inserted"><ins><em>2014, 2015</em></ins></span> Free Software
Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">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</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
-<span
class="removed"><del><strong><p></p><p</strong></del></span>
-
-<span class="inserted"><ins><em><p</em></ins></span>
class="unprintable">Updated:
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/03 17:04:31 $
+$Date: 2015/12/02 17:31:46 $
<!-- timestamp end -->
</p>
</div>
Index: po/copyleft.el-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/copyleft.el-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/copyleft.el-diff.html 3 Oct 2015 17:04:33 -0000 1.1
+++ po/copyleft.el-diff.html 2 Dec 2015 17:31:47 -0000 1.2
@@ -11,12 +11,12 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<span class="inserted"><ins><em><!-- Parent-Version: 1.77
--></em></ins></span>
-<title>What is Copyleft? - GNU Project - Free Software <span
class="removed"><del><strong>Foundation
(FSF)</title></strong></del></span> <span
class="inserted"><ins><em>Foundation</title></em></ins></span>
+<!-- Parent-Version: 1.77 -->
+<title>What is Copyleft? - GNU Project - Free Software
Foundation</title>
<meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation,
Linux, Copyleft" />
-<!--#include <span
class="removed"><del><strong>virtual="/server/banner.html"</strong></del></span>
<span
class="inserted"><ins><em>virtual="/licenses/po/copyleft.translist"</em></ins></span>
-->
-<!--#include <span
class="removed"><del><strong>virtual="/licenses/po/copyleft.translist"</strong></del></span>
<span
class="inserted"><ins><em>virtual="/server/banner.html"</em></ins></span> -->
+<!--#include virtual="/licenses/po/copyleft.translist" -->
+<!--#include virtual="/server/banner.html" -->
<h2>What is Copyleft?</h2>
@@ -105,7 +105,7 @@
assignments from contributors</a>.</p>
<p>
-An alternate form of copyleft, the <a <span
class="inserted"><ins><em>href="/licenses/agpl.html">GNU
+An alternate form of copyleft, the <a href="/licenses/agpl.html">GNU
Affero General Public License (AGPL) (available in
HTML</a>, <a href="/licenses/agpl.txt">text</a>,
and <a href="/licenses/agpl.texi">Texinfo</a> format), is designed
for
@@ -114,7 +114,7 @@
are released as source code to the public.</p>
<p>
-A compromise form of copyleft, the <a</em></ins></span>
href="/licenses/lgpl.html">GNU
+A compromise form of copyleft, the <a href="/licenses/lgpl.html">GNU
Lesser General Public License (LGPL) (available in HTML</a>, <a
href="/licenses/lgpl.txt">text</a>, and <a
href="/licenses/lgpl.texi">Texinfo</a> format), applies to a few (but
not
@@ -161,13 +161,11 @@
<p>
If you would like to copyleft your manual with the GNU FDL, please
see the instructions at the
-<a <span
class="removed"><del><strong>href="/copyleft/fdl.html#SEC4">end</a></strong></del></span>
<span
class="inserted"><ins><em>href="/copyleft/fdl.html#addendum">end</a></em></ins></span>
of the FDL text, and
+<a href="/copyleft/fdl.html#addendum">end</a> of the FDL text, and
the <a href="/copyleft/fdl-howto.html">GFDL instructions page</a>.
Again,
partial copies are not permitted.</p>
-<span class="removed"><del><strong></div></strong></del></span>
-
-<span class="inserted"><ins><em><p>
+<p>
It is a legal mistake to use a backwards C in a circle instead of a
copyright symbol. Copyleft is based legally on copyright, so the work
should have a copyright notice. A copyright notice requires either
@@ -182,23 +180,16 @@
careful how you represent it in a web page!</a>
</p>
-</div><!-- for id="content", starts in the include above
--></em></ins></span>
+</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
-<span class="removed"><del><strong><p>
-Please</strong></del></span>
-<span class="inserted"><ins><em><div class="unprintable">
+<div class="unprintable">
-<p>Please</em></ins></span> send <span
class="inserted"><ins><em>general</em></ins></span> FSF & GNU inquiries to
-<a <span
class="removed"><del><strong>href="mailto:address@hidden"><em>address@hidden</em></a>.</strong></del></span>
<span
class="inserted"><ins><em>href="mailto:address@hidden"><address@hidden></a>.</em></ins></span>
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:address@hidden"><address@hidden></a>.
There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<span class="removed"><del><strong><br />
-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 <a <span
class="removed"><del><strong>href="mailto:address@hidden"><em>address@hidden</em></a>.
-</p>
-
-<p></strong></del></span> <span
class="inserted"><ins><em>href="mailto:address@hidden"><address@hidden></a>.</p>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a
href="mailto:address@hidden"><address@hidden></a>.</p>
<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
replace it with the translation of these two:
@@ -212,20 +203,16 @@
<p>For information on coordinating and submitting translations of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
- README</a>. --></em></ins></span>
+ README</a>. -->
Please see the <a
href="/server/standards/README.translations.html">Translations
README</a> for information on coordinating and submitting translations
-of this <span class="removed"><del><strong>article.
-</p>
-
-<p>
-Copyright</strong></del></span> <span
class="inserted"><ins><em>article.</p>
+of this article.</p>
</div>
<!-- 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
@@ -240,29 +227,22 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright</em></ins></span> © 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2008, <span
class="removed"><del><strong>2009</strong></del></span> <span
class="inserted"><ins><em>2009, 2014</em></ins></span> Free Software
Foundation, <span
class="removed"><del><strong>Inc.,</p></strong></del></span> <span
class="inserted"><ins><em>Inc.</p></em></ins></span>
+<p>Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+2005, 2006, 2007, 2008, 2009, <span
class="removed"><del><strong>2014</strong></del></span> <span
class="inserted"><ins><em>2014, 2015</em></ins></span> Free Software
Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States <span
class="removed"><del><strong>License</a>.
-</p></strong></del></span> <span
class="inserted"><ins><em>License</a>.</p></em></ins></span>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">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</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
-<span class="removed"><del><strong><p>Updated:</strong></del></span>
-
-<span class="inserted"><ins><em><p
class="unprintable">Updated:</em></ins></span>
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/03 17:04:33 $
+$Date: 2015/12/02 17:31:47 $
<!-- timestamp end -->
</p>
</div>
-<span class="removed"><del><strong><!-- All pages on the GNU web server
should have the section about -->
-<!-- verbatim copying. Please do NOT remove this without talking -->
-<!-- with the webmasters first. -->
-<!-- Please make sure the copyright date is consistent with the document
-->
-<!-- and that it is like this "2001, 2002" not this "2001-2002."
--></strong></del></span>
</div>
</body>
</html>
Index: po/copyleft.zh-cn-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/copyleft.zh-cn-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/copyleft.zh-cn-diff.html 3 Oct 2015 17:04:39 -0000 1.1
+++ po/copyleft.zh-cn-diff.html 2 Dec 2015 17:31:47 -0000 1.2
@@ -11,12 +11,12 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<span class="inserted"><ins><em><!-- Parent-Version: 1.77
--></em></ins></span>
-<title>What is Copyleft? - GNU Project - Free Software <span
class="removed"><del><strong>Foundation
(FSF)</title></strong></del></span> <span
class="inserted"><ins><em>Foundation</title></em></ins></span>
+<!-- Parent-Version: 1.77 -->
+<title>What is Copyleft? - GNU Project - Free Software
Foundation</title>
<meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation,
Linux, Copyleft" />
-<!--#include <span
class="removed"><del><strong>virtual="/server/banner.html"</strong></del></span>
<span
class="inserted"><ins><em>virtual="/licenses/po/copyleft.translist"</em></ins></span>
-->
-<!--#include <span
class="removed"><del><strong>virtual="/licenses/po/copyleft.translist"</strong></del></span>
<span
class="inserted"><ins><em>virtual="/server/banner.html"</em></ins></span> -->
+<!--#include virtual="/licenses/po/copyleft.translist" -->
+<!--#include virtual="/server/banner.html" -->
<h2>What is Copyleft?</h2>
@@ -105,7 +105,7 @@
assignments from contributors</a>.</p>
<p>
-An alternate form of copyleft, the <a <span
class="inserted"><ins><em>href="/licenses/agpl.html">GNU
+An alternate form of copyleft, the <a href="/licenses/agpl.html">GNU
Affero General Public License (AGPL) (available in
HTML</a>, <a href="/licenses/agpl.txt">text</a>,
and <a href="/licenses/agpl.texi">Texinfo</a> format), is designed
for
@@ -114,7 +114,7 @@
are released as source code to the public.</p>
<p>
-A compromise form of copyleft, the <a</em></ins></span>
href="/licenses/lgpl.html">GNU
+A compromise form of copyleft, the <a href="/licenses/lgpl.html">GNU
Lesser General Public License (LGPL) (available in HTML</a>, <a
href="/licenses/lgpl.txt">text</a>, and <a
href="/licenses/lgpl.texi">Texinfo</a> format), applies to a few (but
not
@@ -161,13 +161,11 @@
<p>
If you would like to copyleft your manual with the GNU FDL, please
see the instructions at the
-<a <span
class="removed"><del><strong>href="/copyleft/fdl.html#SEC4">end</a></strong></del></span>
<span
class="inserted"><ins><em>href="/copyleft/fdl.html#addendum">end</a></em></ins></span>
of the FDL text, and
+<a href="/copyleft/fdl.html#addendum">end</a> of the FDL text, and
the <a href="/copyleft/fdl-howto.html">GFDL instructions page</a>.
Again,
partial copies are not permitted.</p>
-<span class="removed"><del><strong></div></strong></del></span>
-
-<span class="inserted"><ins><em><p>
+<p>
It is a legal mistake to use a backwards C in a circle instead of a
copyright symbol. Copyleft is based legally on copyright, so the work
should have a copyright notice. A copyright notice requires either
@@ -182,23 +180,16 @@
careful how you represent it in a web page!</a>
</p>
-</div><!-- for id="content", starts in the include above
--></em></ins></span>
+</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
-<span class="removed"><del><strong><p>
-Please</strong></del></span>
-<span class="inserted"><ins><em><div class="unprintable">
+<div class="unprintable">
-<p>Please</em></ins></span> send <span
class="inserted"><ins><em>general</em></ins></span> FSF & GNU inquiries to
-<a <span
class="removed"><del><strong>href="mailto:address@hidden"><em>address@hidden</em></a>.</strong></del></span>
<span
class="inserted"><ins><em>href="mailto:address@hidden"><address@hidden></a>.</em></ins></span>
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:address@hidden"><address@hidden></a>.
There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<span class="removed"><del><strong><br />
-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 <a <span
class="removed"><del><strong>href="mailto:address@hidden"><em>address@hidden</em></a>.
-</p>
-
-<p></strong></del></span> <span
class="inserted"><ins><em>href="mailto:address@hidden"><address@hidden></a>.</p>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a
href="mailto:address@hidden"><address@hidden></a>.</p>
<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
replace it with the translation of these two:
@@ -212,20 +203,16 @@
<p>For information on coordinating and submitting translations of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
- README</a>. --></em></ins></span>
+ README</a>. -->
Please see the <a
href="/server/standards/README.translations.html">Translations
README</a> for information on coordinating and submitting translations
-of this <span class="removed"><del><strong>article.
-</p>
-
-<p>
-Copyright</strong></del></span> <span
class="inserted"><ins><em>article.</p>
+of this article.</p>
</div>
<!-- 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
@@ -240,29 +227,22 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright</em></ins></span> © 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2008, <span
class="removed"><del><strong>2009</strong></del></span> <span
class="inserted"><ins><em>2009, 2014</em></ins></span> Free Software
Foundation, <span
class="removed"><del><strong>Inc.,</p></strong></del></span> <span
class="inserted"><ins><em>Inc.</p></em></ins></span>
+<p>Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+2005, 2006, 2007, 2008, 2009, <span
class="removed"><del><strong>2014</strong></del></span> <span
class="inserted"><ins><em>2014, 2015</em></ins></span> Free Software
Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States <span
class="removed"><del><strong>License</a>.
-</p></strong></del></span> <span
class="inserted"><ins><em>License</a>.</p></em></ins></span>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">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</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
-<span class="removed"><del><strong><p>Updated:</strong></del></span>
-
-<span class="inserted"><ins><em><p
class="unprintable">Updated:</em></ins></span>
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/03 17:04:39 $
+$Date: 2015/12/02 17:31:47 $
<!-- timestamp end -->
</p>
</div>
-<span class="removed"><del><strong><!-- All pages on the GNU web server
should have the section about -->
-<!-- verbatim copying. Please do NOT remove this without talking -->
-<!-- with the webmasters first. -->
-<!-- Please make sure the copyright date is consistent with the document
-->
-<!-- and that it is like this "2001, 2002" not this "2001-2002."
--></strong></del></span>
</div>
</body>
</html>
Index: po/copyleft.ml-diff.html
===================================================================
RCS file: po/copyleft.ml-diff.html
diff -N po/copyleft.ml-diff.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ po/copyleft.ml-diff.html 2 Dec 2015 17:31:47 -0000 1.1
@@ -0,0 +1,249 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>/licenses/copyleft.html-diff</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<title>What is Copyleft? - GNU Project - Free Software
Foundation</title>
+<meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation,
Linux, Copyleft" />
+
+<!--#include virtual="/licenses/po/copyleft.translist" -->
+<!--#include virtual="/server/banner.html" -->
+
+<h2>What is Copyleft?</h2>
+
+<p>
+Copyleft is a general method for making a program (or
+other work) free, and requiring all modified and extended versions of the
+program to be free as well.</p>
+
+<p>
+The simplest way to make a program free software is to put it in the
+<a href="/philosophy/categories.html#PublicDomainSoftware">public
+domain</a>, uncopyrighted. This allows people to
+share the program and their improvements, if they are so minded. But
+it also allows uncooperative people to convert the program into
+<a href="/philosophy/categories.html#ProprietarySoftware">proprietary
+software</a>. They can make changes, many or few,
+and distribute the result as a proprietary product. People who
+receive the program in that modified form do not have the freedom that
+the original author gave them; the middleman has stripped it away.</p>
+
+<p>
+In the <a href="/gnu/thegnuproject.html">GNU project</a>, our aim
is
+to give <em>all</em> users the freedom to redistribute and change
GNU
+software. If middlemen could strip off the freedom, we might have
+many users, but those users would not have freedom. So instead of
+putting GNU software in the public domain, we “copyleft”
+it. Copyleft says that anyone who redistributes the software, with or
+without changes, must pass along the freedom to further copy and
+change it. Copyleft guarantees that every user has freedom.</p>
+
+<p>
+Copyleft also provides an
+<a href="/philosophy/pragmatic.html">incentive</a>
+for other programmers to add to free software.
+Important free programs such as the GNU C++ compiler exist
+only because of this.</p>
+
+<p>
+Copyleft also helps programmers who want to contribute
+<a href="/prep/tasks.html">improvements</a> to
+<a href="/philosophy/free-sw.html">free software</a> get
permission to
+do so. These programmers often work for companies or universities
+that would do almost anything to get more money. A programmer may
+want to contribute her changes to the community, but her employer may
+want to turn the changes into a proprietary software product.</p>
+
+<p>
+When we explain to the employer that it is illegal to distribute the
+improved version except as free software, the employer usually decides
+to release it as free software rather than throw it away.</p>
+
+<p>
+To copyleft a program, we first state that it is copyrighted; then we
+add distribution terms, which are a legal instrument that gives
+everyone the rights to use, modify, and redistribute the program's
+code, <em>or any program derived from it</em>, but only if the
+distribution terms are unchanged. Thus, the code and the freedoms
+become legally inseparable.</p>
+
+<p>
+Proprietary software developers use copyright to take away the users'
+freedom; we use copyright to guarantee their freedom. That's why we
+reverse the name, changing “copyright” into
+“copyleft.”</p>
+
+<p>
+Copyleft is a way of using of the copyright on the program. It
+doesn't mean abandoning the copyright; in fact, doing so would make
+copyleft impossible. The “left” in
+“copyleft” is not a reference to the verb “to
+leave”—only to the direction which is the inverse of
+“right”.</p>
+
+<p>
+Copyleft is a general concept, and you can't use a general concept
+directly; you can only use a specific implementation of the concept.
+In the GNU Project, the specific distribution terms that we use for
+most software are contained in the
+<a href="/copyleft/gpl.html">GNU General Public License (available in
+HTML</a>, <a href="/copyleft/gpl.txt">text</a>, and
+<a href="/copyleft/gpl.texi">Texinfo</a> format). The GNU General
+Public License is often called the GNU GPL for short. There is also a
+<a href="/copyleft/gpl-faq.html">Frequently Asked Questions</a>
page
+about the GNU GPL. You can also read about
+<a href="/copyleft/why-assign.html">why the FSF gets copyright
+assignments from contributors</a>.</p>
+
+<p>
+An alternate form of copyleft, the <a href="/licenses/agpl.html">GNU
+Affero General Public License (AGPL) (available in
+HTML</a>, <a href="/licenses/agpl.txt">text</a>,
+and <a href="/licenses/agpl.texi">Texinfo</a> format), is designed
for
+programs that are likely to be used on servers. It ensures that
+modified versions used to implement services available to the public
+are released as source code to the public.</p>
+
+<p>
+A compromise form of copyleft, the <a href="/licenses/lgpl.html">GNU
+Lesser General Public License (LGPL) (available in HTML</a>, <a
+href="/licenses/lgpl.txt">text</a>, and <a
+href="/licenses/lgpl.texi">Texinfo</a> format), applies to a few (but
not
+all) GNU libraries. To learn more about properly using the LGPL, please
+read the article <a href="/philosophy/why-not-lgpl.html"><cite>Why
you
+shouldn't use the Lesser GPL for your next
library</cite></a>.</p>
+
+<p>
+The <a href="/copyleft/fdl.html">GNU Free Documentation License (FDL)
+(available in HTML</a>, <a href="/copyleft/fdl.txt">text</a>
and
+<a href="/copyleft/fdl.texi">Texinfo)</a> is a form of copyleft
intended
+for use on a manual, textbook or other document to assure everyone the
+effective freedom to copy and redistribute it, with or without
+modifications, either commercially or noncommercially.</p>
+
+<p>
+The appropriate license is included in many manuals and in each GNU
+source code distribution.</p>
+
+<p>
+All these licenses are designed so that you can easily apply them to
+your own works, assuming you are the copyright holder. You don't have
+to modify the license to do this, just include a copy of the license
+in the work, and add notices in the source files that refer properly
+to the license.</p>
+
+<p>
+Using the same distribution terms for many different programs makes it
+easy to copy code between various different programs. When they all
+have the same distribution terms, there is no problem. The Lesser
+GPL, version 2, includes a provision that lets you alter the
+distribution terms to the ordinary GPL, so that you can copy code into
+another program covered by the GPL. Version 3 of the Lesser GPL is
+built as an exception added to GPL version 3, making the compatibility
+automatic.</p>
+
+<p>
+If you would like to copyleft your program with the GNU GPL or the GNU
+LGPL, please see the <a href="/copyleft/gpl-howto.html">license
+instructions page</a> for advice. Please note that you must use the
entire
+text of the license you choose. Each is an integral whole, and
+partial copies are not permitted.</p>
+
+<p>
+If you would like to copyleft your manual with the GNU FDL, please
+see the instructions at the
+<a href="/copyleft/fdl.html#addendum">end</a> of the FDL text, and
+the <a href="/copyleft/fdl-howto.html">GFDL instructions page</a>.
Again,
+partial copies are not permitted.</p>
+
+<p>
+It is a legal mistake to use a backwards C in a circle instead of a
+copyright symbol. Copyleft is based legally on copyright, so the work
+should have a copyright notice. A copyright notice requires either
+the copyright symbol (a C in a circle) or the word
+“Copyright”.</p>
+
+<p>
+A backwards C in a circle has no special legal significance, so it
+doesn't make a copyright notice. It may be amusing in book covers,
+posters, and such, but
+<a href="https://en.wikipedia.org/wiki/Copyleft#Symbol"> be
+careful how you represent it in a web page!</a>
+</p>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:address@hidden"><address@hidden></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a
href="mailto:address@hidden"><address@hidden></a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden">
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<!-- 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 <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
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+2005, 2006, 2007, 2008, 2009, <span
class="removed"><del><strong>2014</strong></del></span> <span
class="inserted"><ins><em>2014, 2015</em></ins></span> Free Software
Foundation, Inc.</p>
+
+<p>This page is licensed under a <a rel="license"
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">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</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2015/12/02 17:31:47 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
+</pre></body></html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses copyleft.ca.html copyleft.el.html ...,
GNUN <=