X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=LICENSE;h=e9655394176bfd6b807e12637877b17526b573f5;hb=d9e70421a01bc5e23a752ccacf0533d97b1b9381;hp=714f5945c1f46257e8751333552eff5c68b1e234;hpb=9869ae24b88761ab261c4311e24f7383b4af3f02;p=mono.git

diff --git a/LICENSE b/LICENSE
index 714f5945c1f..e9655394176 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
 
@@ -30,10 +30,21 @@ For comments, corrections and updates, please contact mono@novell.com
 
 	This code is dual licensed under the LGPL or commercial licenses. 
 
-	The LGPL ensures that Mono can be used in most scenarios, but 
-	gives Novell the flexibility to relicense the code for embedded
-	systems or commercial settings where the LGPL can not be used. 
-
+	The LGPL ensures that Mono can be used in most scenarios, but
+	gives Novell the flexibility to relicense the code for
+	embedded systems, static linking or commercial settings where
+	the LGPL can not be used.
+
+	We consider non-LGPL use instances where you use this on an
+	embedded system where the end user is not able to upgrade the
+	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
+	on the distribution and access to the code, a phone platform
+	that prevents end users from upgrading Moonlight).
+	
 	Contact mono@novell.com for details on obtaining the Mono
 	runtime under other terms.
 
@@ -43,12 +54,19 @@ 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.
+
 ** 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
 
@@ -90,6 +108,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: