SuchABot has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/77257


Change subject: Update COPYING to match proposed new README
......................................................................

Update COPYING to match proposed new README

This updates COPYING to contain more information about licensing, by including 
information removed from README in this patch: 
https://gerrit.wikimedia.org/r/#/c/76643/1

I'm afraid the line-wrapping was done by hand; please feel free to LART me if 
there are errors.

In general, I kept the text essentially the same, but there are a few somewhat 
substantive changes:
- changed URL from GPL (unspecified version, pointing currently to v3) to GPL 
v2, to match the text
- removed statement that the Foundation does not hold any rights in the 
codebase, as it may in some cases have rights through contractors
- added note about looking for information in individual components
- removed incorrect CC information about Sajax (which appears to be 
BSD-licensed, according to its file header in skins/common/ajax.js
- rephrased the CC license information to make more clear and precise

Change-Id: I726608391e58f9e62fdfd97b2b03a20dfef8f58d
GitHub: https://github.com/wikimedia/mediawiki-core/pull/4
---
M COPYING
1 file changed, 38 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/57/77257/1

diff --git a/COPYING b/COPYING
index 019694a..001c80f 100644
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,41 @@
+== License and Copyright Information ==
+
+=== License ===
+
+Mediawiki is licensed under the terms of the GNU General Public License, 
+version 2 or later. Derivative works and later versions of the code must be 
+free software licensed under the same or a compatible license. This includes 
+"extensions" that use MediaWiki functions or variables; see 
+http://www.gnu.org/licenses/gpl-faq.html#GPLAndPlugins for details.
+
+For the full text of version 2 of the license, see 
+https://www.gnu.org/licenses/gpl-2.0.html or '''GNU General Public License''' 
+below.
+
+=== Copyright Owners ===
+
+Mediawiki contributors, including those listed in the CREDITS file, hold the 
+copyright to this work.
+
+=== Additional License Information ===
+
+Some components of Mediawiki imported from other projects may be under other
+Free and Open Source, or Free Culture, licenses. Specific details of their 
+licensing information can be found in those components.
+
+Sections of code written exclusively by Lee Crocker or Erik Moeller are also
+released into the public domain, which does not impair the obligations of users
+under the GPL for use of the whole code or other sections thereof.
+
+MediaWiki uses the following Creative Commons icons to illustrate links to the 
+CC licenses:
+
+* skins/common/images/cc-by-nc-sa.png
+* skins/common/images/cc-by-sa.png
+
+These icons are trademarked, and used subject to the CC trademark license, 
+available at http://creativecommons.org/policies#trademark
+
 == GNU GENERAL PUBLIC LICENSE ==
 
 Version 2, June 1991

-- 
To view, visit https://gerrit.wikimedia.org/r/77257
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I726608391e58f9e62fdfd97b2b03a20dfef8f58d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: SuchABot <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to