Updating NOTICE.txt with new year + license urls

1 files changed, 17 insertions, 5 deletions

diff --git a/NOTICE.txt b/NOTICE.txt
index 8cda6d5719..817de69dbf 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,12 +1,24 @@
 ==============================================================
- Jetty Web Container 
+ Jetty Web Container
  Copyright 1995-2009 Mort Bay Consulting Pty Ltd
+           2009-2012 Webtide LLC
+           2011-2012 Intalio Inc
 ==============================================================
 
 The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
-unless otherwise noted. It is dual licensed under the apache 2.0
-license and eclipse 1.0 license. Jetty may be distributed under
-either license.
+unless otherwise noted.
+
+Jetty is dual licensed under both
+
+  * The Apache 2.0 License
+    http://www.apache.org/licenses/LICENSE-2.0.html
+
+      and
+
+  * The Eclipse Public 1.0 License
+    http://www.eclipse.org/legal/epl-v10.html
+
+Jetty may be distributed under either license.
 
 The javax.servlet package used was sourced from the Apache
 Software Foundation and is distributed under the apache 2.0
@@ -15,7 +27,7 @@ license.
 The UnixCrypt.java code implements the one way cryptography used by
 Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,
 modified April 2001  by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt 
+Permission to use, copy, modify and distribute UnixCrypt
 for non-commercial or commercial purposes and without fee is
 granted provided that the copyright notice appears in all copies.