summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-11-23 22:24:44 -0800
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-12-18 17:11:41 -0800
commit02abf3dab6a4c331e1f64ef9a3c55d6dd64a2787 (patch)
treefe48547c4efcd38de04679036ecf885a41566acb
parent044b374c06db73ddb26275498ccb0c4fdf93d0f0 (diff)
COPYING: Update license preamble
Update the comment about "a modification is currently under discussion" since there hasn't been any such discussion for some time and this is the consensus agreed upon preferred format. Also throw in a pointer to the OSI discussion page about the MIT license. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--COPYING14
1 files changed, 8 insertions, 6 deletions
diff --git a/COPYING b/COPYING
index 5dc8c1dfb..74a3dd107 100644
--- a/COPYING
+++ b/COPYING
@@ -1,10 +1,12 @@
The following is the 'standard copyright' agreed upon by most contributors,
-and is currently the canonical license, though a modification is currently
-under discussion. Copyright holders of new code should use this license
-statement where possible, and append their name to this list. Please sort
-by surname for people, and by the full name for other entities (e.g.
-Juliusz Chroboczek sorts before Intel Corporation sorts before Daniel
-Stone).
+and is currently the canonical license preferred by the X.Org Foundation.
+This is a slight variant of the common MIT license form published by the
+Open Source Initiative at http://www.opensource.org/licenses/mit-license.php
+
+Copyright holders of new code should use this license statement where
+possible, and insert their name to this list. Please sort by surname
+for people, and by the full name for other entities (e.g. Juliusz
+Chroboczek sorts before Intel Corporation sorts before Daniel Stone).
Copyright © 2000-2001 Juliusz Chroboczek
Copyright © 1998 Egbert Eich