[slf4j-dev] svn commit: r667 - slf4j/trunk/slf4j-site/src/site/xdocs

[ceki at slf4j.org]

Author: ceki
Date: Thu Dec 14 22:05:32 2006
New Revision: 667

Modified:
   slf4j/trunk/slf4j-site/src/site/xdocs/license.xml

Log:


Modified: slf4j/trunk/slf4j-site/src/site/xdocs/license.xml
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/xdocs/license.xml	(original)
+++ slf4j/trunk/slf4j-site/src/site/xdocs/license.xml	Thu Dec 14 22:05:32 2006
@@ -15,42 +15,42 @@
   </p>
 
   <div class="source">
- Copyright (c) 2004-2005 SLF4J.ORG
- Copyright (c) 2004-2005 QOS.ch
+ Copyright (c) 2004-2006 SLF4J.ORG
+ Copyright (c) 2004-2006 QOS.ch
 
  All rights reserved.
  
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to  deal in  the Software without  restriction, including
- without limitation  the rights to  use, copy, modify,  merge, publish,
- distribute, and/or sell copies of  the Software, and to permit persons
- to whom  the Software is furnished  to do so, provided  that the above
- copyright notice(s) and this permission notice appear in all copies of
- the  Software and  that both  the above  copyright notice(s)  and this
- permission notice appear in supporting documentation.
- 
- THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
- EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR  A PARTICULAR PURPOSE AND NONINFRINGEMENT
- OF  THIRD PARTY  RIGHTS. IN  NO EVENT  SHALL THE  COPYRIGHT  HOLDER OR
- HOLDERS  INCLUDED IN  THIS  NOTICE BE  LIABLE  FOR ANY  CLAIM, OR  ANY
- SPECIAL INDIRECT  OR CONSEQUENTIAL DAMAGES, OR  ANY DAMAGES WHATSOEVER
- RESULTING FROM LOSS  OF USE, DATA OR PROFITS, WHETHER  IN AN ACTION OF
- CONTRACT, NEGLIGENCE  OR OTHER TORTIOUS  ACTION, ARISING OUT OF  OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- 
- Except as  contained in  this notice, the  name of a  copyright holder
- shall not be used in advertising or otherwise to promote the sale, use
- or other dealings in this Software without prior written authorization
- of the copyright holder.
-  </div>
-  
-  <p>These terms are <em>identical</em> to those of the X11 License,
-  which is a simple, permissive non-copyleft free software license,
-  <em>compatible</em> with the <a
-  href="http://www.fsf.org/licensing/licenses/license-list.html#GPLCompatibleLicenses">
-  GNU GPL</a> as well as the <a
+ Permissqion  is  hereby  granted,  free  of  charge,  to  any  person
+ obtaining a copy of  this software and associated documentation files
+ (the  "Software"),  to  deal  in the  Software  without  restriction,
+ including without limitation the  rights to use, copy, modify, merge,
+ publish,  distribute, and/or  sell  copies of  the  Software, and  to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The  above  copyright notice  and  this  permission  notice shall  be
+ included in all copies or substantial portions of the Software.
+
+ THE  SOFTWARE IS  PROVIDED "AS  IS",  WITHOUT WARRANTY  OF ANY  KIND,
+ EXPRESS OR  IMPLIED, INCLUDING BUT  NOT LIMITED TO THE  WARRANTIES OF
+ MERCHANTABILITY,    FITNESS   FOR    A    PARTICULAR   PURPOSE    AND
+ NONINFRINGEMENT. IN  NO EVENT SHALL THE AUTHORS  OR COPYRIGHT HOLDERS
+ BE LIABLE  FOR ANY CLAIM, DAMAGES  OR OTHER LIABILITY,  WHETHER IN AN
+ ACTION OF  CONTRACT, TORT  OR OTHERWISE, ARISING  FROM, OUT OF  OR IN
+ CONNECTION  WITH THE SOFTWARE  OR THE  USE OR  OTHER DEALINGS  IN THE
+ SOFTWARE.
+  </div> 
+
+  <p>These terms are <em>identical</em> to those of the <a
+  href="http://en.wikipedia.org/wiki/MIT_License">MIT License</a>,
+  also called the X License or the X11 License, X11 License, which is
+  a simple, permissive non-copyleft free software license. It is
+  deemed compatible with virtually all types of licenses, commercial
+  or otherwise. In particular, the Free Software Foundation has
+  declared it compatible with
+  <a href="http://www.fsf.org/licensing/licenses/license-list.html#GPLCompatibleLicenses">
+  GNU GPL</a>. It is also known to be approved by the Apache Software
+  Foundation as compatible with <a
   href="http://www.apache.org/licenses/">Apache Software License</a>.
   </p>