X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=README;h=e95b1e768848c3151ca27f1f9d3ee3f680054a26;hb=e00465ab66d4d59d1e33835c9d2737edb49d019a;hp=7c3651e0634a62e74b3241d2fa5960a1f3148229;hpb=f7c0eaf0fc1fa96a2c6e681d66ae09be954de31d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/README b/README
index 7c3651e063..e95b1e7688 100644
--- a/README
+++ b/README
@@ -36,10 +36,19 @@ The MediaWiki software was written by:
 * Yuri Astrakhan
 * Aryeh Gregor
 * Aaron Schulz
+* Andrew Garrett
+* Raimond Spekking
+* Alexandre Emsenhuber
+* Siebrand Mazeland
+* Chad Horohoe
+* Roan Kattouw
+* Trevor Pascal
+* Bryan Tong Minh
+* Sam Reed
 * Several others (view CREDITS for a more complete list)
 
 The contributors hold the copyright to this work, and it is licensed under the
-terms of the GNU General Public License, version 2 or later[1] (see
+terms of the GNU General Public License, version 2 or later (see
 http://www.fsf.org/licensing/licenses/gpl.html). 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
@@ -48,58 +57,65 @@ details.
 
 The Wikimedia Foundation currently has no legal rights to the software.
 
-[1] Sections of code written exclusively by Lee Crocker or Erik Moeller are also
+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.
 
-[2] MediaWiki makes use of the Sajax Toolkit by modernmethod,
-	http://www.modernmethod.com/sajax/
-    which has the following license:
+MediaWiki makes use of the Sajax Toolkit by modernmethod, 
+http://www.modernmethod.com/sajax/ which has the following license:
 
-       'This work is licensed under the Creative Commons Attribution
-        License. To view a copy of this license, visit
-        http://creativecommons.org/licenses/by/2.0/ or send a letter
-        to Creative Commons, 559 Nathan Abbott Way,
-        Stanford, California 94305, USA.'
+	'This work is licensed under the Creative Commons Attribution
+	License. To view a copy of this license, visit
+	http://creativecommons.org/licenses/by/2.0/ or send a letter
+	to Creative Commons, 559 Nathan Abbott Way,
+	Stanford, California 94305, USA.'
+
+MediaWiki use Creative Commons license marks to points to their online
+licenses. This content is trademarked and used under a specific license
+available at http://creativecommons.org/policies#trademark
+The restricted content is:
+
+* skins/common/images/cc-by-nc-sa.png
+* skins/common/images/cc-by-sa.png
 
 Many thanks to the Wikimedia regulars for testing and suggestions.
 
 The official website for MediaWiki is located at:
 
-  http://www.mediawiki.org/
+	http://www.mediawiki.org/
 
 The code is currently maintained in a Subversion repository at
 svn.wikimedia.org. See http://www.mediawiki.org/wiki/Subversion for details.
 
 Please report bugs and make feature requests in our Bugzilla system:
 
-  https://bugzilla.wikimedia.org/
+* https://bugzilla.wikimedia.org/
 
 Documentation and discussion on new features may be found at:
 
-  http://www.mediawiki.org/wiki/Manual:FAQ
-  http://www.mediawiki.org/wiki/Documentation
-  http://www.mediawiki.org/wiki/Development
+* http://www.mediawiki.org/wiki/Manual:FAQ
+* http://www.mediawiki.org/wiki/Documentation
+* http://www.mediawiki.org/wiki/Development
 
 Extensions are listed at:
 
-  http://www.mediawiki.org/wiki/Category:Extensions
+* http://www.mediawiki.org/wiki/Category:Extensions
 
 If you are setting up your own wiki based on this software, it is highly
 recommended that you subscribe to mediawiki-announce:
 
-  https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce
+* https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce
 
 The mailing list is very low volume, and is intended primarily for announcements
 of new versions, bug fixes, and security issues.
 
 A higher volume support mailing list can be found at:
 
-  https://lists.wikimedia.org/mailman/listinfo/mediawiki-l
+* https://lists.wikimedia.org/mailman/listinfo/mediawiki-l
 
 Developer discussion takes place at:
 
-  https://lists.wikimedia.org/mailman/listinfo/wikitech-l
+* https://lists.wikimedia.org/mailman/listinfo/wikitech-l
 
 There is also a development and support channel #mediawiki on irc.freenode.net,
 and an unoffical support forum at www.mwusers.com.