X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=LICENSE;h=0cb310e112686e2e4eafcfcf4274d5c5fa2cd9c0;hb=11723d484d0e8ddfb185c98be4e86e3344dfc833;hp=724330960ab347deb085b03230fcbb4e30390082;hpb=6f94553690b1cd6487bcc206aec7f58c99f77adb;p=mono.git

diff --git a/LICENSE b/LICENSE
index 724330960ab..0cb310e1126 100644
--- a/LICENSE
+++ b/LICENSE
@@ -22,7 +22,7 @@ For comments, corrections and updates, please contact mono@novell.com
 	Contributions for other modules should be under the same license
 	terms as the rest of the module, or under MIT X11 terms. 
 
-	If you ned further information, please contact mono@novell.com
+	If you need further information, please contact mono@novell.com
 
 * The Modules
 
@@ -37,8 +37,8 @@ For comments, corrections and updates, please contact mono@novell.com
 
 	We consider non-LGPL use instances where you use this on an
 	embedded system where the end user is not able to upgrade the
-	Moonlight installation or distribution that is part of your
-	product (Section 6 and 7), you would have to obtain a
+	Mono VM or Moonlight installation or distribution that is part
+	of your product (Section 6 and 7), you would have to obtain a
 	commercial license from Novell (consider software burned into
 	a ROM, systems where end users would not be able to upgrade,
 	an embedded console, a game console that imposes limitations
@@ -54,12 +54,24 @@ For comments, corrections and updates, please contact mono@novell.com
 	the terms of the MIT X11, this means that this code can be
 	used for any purposes by anyone.
 
+** mono/metadata/sgen*: Mono's Copying Collector
+
+	This new garbage collector is licensed under the terms of
+	the MIT X11 license, in hopes that the GC could be reused
+	by third party projects, follows the same spirit than the
+	Boehm GC.
+
+** mono/arch/*/XXX-codegen.h
+
+	This are C macros that are useful when generating native
+	code on various platforms.   This code is MIT X11 licensed.
+
 ** mcs/mcs, mcs/gmcs
 
   	The C# Compilers (1.0 and 2.0)
 
-	These compilers are dual licensed under the GPL and commercial
-	terms.
+	These compilers are dual licensed under the GPL and MIT X11
+	license terms.
 
 ** tests
 
@@ -86,6 +98,13 @@ For comments, corrections and updates, please contact mono@novell.com
             ICSharpCode.SharpZipLib, GPL with exceptions.
 		See: mcs/class/ICSharpCode.SharpZipLib/README
 
+** mcs/class/System.Core/System/TimeZoneInfo.Android.cs
+
+	This is a port of Apache 2.0-licensed Android code, and thus is
+	licensed under the Apache 2.0 license:
+
+	    http://www.apache.org/licenses/LICENSE-2.0
+
 	     
 ** mcs/tools
 
@@ -101,6 +120,10 @@ For comments, corrections and updates, please contact mono@novell.com
 
 	Manual pages and Mono documentation are covered by the MIT X11 license. 
 
+* samples
+
+	The code in the "samples" directory is released under the MIT X11 license.
+
 * The Licenses
 
 	These are the licenses used in Mono, the files are located: