Updated readme to reflect the MIT license. Updated contributors to be a flat list.

git-svn-id: http://code.elgg.org/elgg/trunk@7123 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 163b19d9c19cc19bfaa14f30c41fde360b3ed939..dfdcebe5ef5b5b82c649eaa09e505e94a3c794a5 100644 (file)
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -1,29 +1,28 @@
-CORE ELGG TEAM:
+These developers have developed or contributed significant bodies of code
+to the Elgg Project.  (List in alphabetical order.)
 
-Dave Tosh <dave@elgg.com>
-http://twitter.com/davetosh
+Cash Costello - http://cashcostello.com/
 
-Brett Profitt <brett@elgg.com>
-http://twitter.com/brettprofitt
+Pete Harris - pete@elgg.com
 
-Pete Harris <pete@elgg.com>
+Milan Magudia - http://hedgehogs.net/
 
-Nicholas Whitt <nick@elgg.com>
-http://twitter.com/nogoodnick
+Jon Maul - MITRE http://www.mitre.org/
 
+Marcus Povey - http://marcuspovey.co.uk/
 
-CONTRIBUTING DEVELOPERS
+Brett Profitt - brett.profitt@gmail.com,  http://twitter.com/brettprofitt
 
-Cash Costello - http://cashcostello.com/
-Justin Richer, Nathan Rackliffe, Tom Read, Jon Maul - MITRE http://www.mitre.org/
-Milan Magudia - http://hedgehogs.net/
-Evan Winslow - http://evanwinslow.com/
+Nathan Rackliffe - MITRE http://mitre.org/
+
+Tom Readi - MITRE http://mitre.org/
 
+Justin Richer - MITRE http://mitre.org/
 
-ALUMNI DEVELOPERS
+Dave Tosh - davidgtosh@gmail.com,  http://twitter.com/davetosh
 
-Ben Werdmuller
-http://benwerd.com/
+Ben Werdmuller - http://benwerd.com/
 
-Marcus Povey
-http://marcuspovey.co.uk/
+Nicholas Whitt - nick.whitt@gmail.com,  http://twitter.com/nogoodnick
+
+Evan Winslow - http://evanwinslow.com/

diff --git a/README.txt b/README.txt
index 3f9f5b2349e357d6df58ecc06d348a7a48529c75..5494ff9845788b539d1143e551e109d53882b314 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,5 +1,5 @@
 Elgg version 1.8
-Copyright (c) 2008-2010 Curverider Ltd
+Copyright (c) 2008-2010 See COPYRIGHT.txt
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2 as published by
@@ -21,12 +21,12 @@ ABOUT:
 See CONTRIBUTORS.txt for development credits.
 
 Elgg concept originally by:
-Ben Werdmuller <ben@benwerd.com, http://benwerd.com> and David Tosh <dave@elgg.com>
+Ben Werdmuller <ben@benwerd.com, http://benwerd.com> and David Tosh <davidgtosh@gmail.com>
 
 The open source project site can be found at http://elgg.org/
 
-Elgg is released under the GNU Public License (GPL), which
-is supplied in this distribution as LICENSE.
+Elgg is released under the GNU Public License (GPL) and the Massachusetts 
+Institute of Technology (MIT) License, which is supplied in this 
+distribution as LICENSE.
 
 For installation instructions, please see the INSTALL file.
-