From 44f102ed64e2552a0e04714c7574f74ca5ee66e2 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 23 Nov 2009 22:24:44 -0800 Subject: 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 Signed-off-by: Daniel Stone Reviewed-by: Peter Hutterer --- COPYING | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'COPYING') diff --git a/COPYING b/COPYING index 0878c7a76..ef52fb638 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 -- cgit v1.2.3