From 931a5d21a4bec8c553c1a8881fac165bbb7fa976 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sat, 8 Sep 2012 11:44:22 +0200
Subject: [PATCH] Change license in index.html and package.json

---
 index.html   |  2 +-
 package.json | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/index.html b/index.html
index 5031e00f..82fefa8f 100644
--- a/index.html
+++ b/index.html
@@ -126,7 +126,7 @@
                     
                     <h2>Getting the code</h2> 
                     <div class="divider"></div> 
-                    <p>Ace is a community project. We actively encourage and support contributions. The Ace source code is <a href="http://github.com/ajaxorg/ace">hosted on GitHub</a>. It is released under the Mozilla tri-license (MPL/GPL/LGPL). This is the same license used by Firefox. This license is friendly to all kinds of projects, whether open source or not. Take charge of your editor and add your favorite language highlighting and keybindings!
+                    <p>Ace is a community project. We actively encourage and support contributions. The Ace source code is <a href="http://github.com/ajaxorg/ace">hosted on GitHub</a>. Ace is a community project. We actively encourage and support contributions. The Ace source code is hosted on GitHub. It is released under the BSD License. This license is very simple, and is friendly to all kinds of projects, whether open source or not. Take charge of your editor and add your favorite language highlighting and keybindings!
                     <pre>git clone git://github.com/ajaxorg/ace.git</pre></p> 
  
                 </div> 
diff --git a/package.json b/package.json
index 28943867..652611d2 100644
--- a/package.json
+++ b/package.json
@@ -22,14 +22,8 @@
         "ace": "."
     },
     "licenses": [{
-        "type": "MPL",
-        "url": "http://www.mozilla.org/MPL/"
-    }, {
-        "type": "GPL",
-        "url": "http://www.gnu.org/licenses/gpl.html"
-    }, {
-        "type": "LGPL",
-        "url": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"
+        "type": "BSD New",
+        "url": "http://opensource.org/licenses/BSD-3-Clause"
     }],
     "directories": {
         "lib": "lib/ace"
@@ -61,4 +55,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}