diff --git a/LICENSE.html b/LICENSE.html index 05b6333ba..57e1613e2 100644 --- a/LICENSE.html +++ b/LICENSE.html @@ -8,8 +8,9 @@
This package is Free Software available under the specified - versions of the two licenses below and no other versions:
+This package is Free Software available under any one of the + specified licenses below. All the licenses below are alternatives + and if you select one license, that one alone applies.
This package is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License Version 2.1 as published by the Free Software Foundation - and no other version.
+ or any newer version.This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -43,52 +44,33 @@
NOTE - under Term 3 of the LGPL Version 2.1, you may choose to license the entire package under the GPL. If that option is - chosen, then this package is under the terms of the GPL Version 2 and no - other version of the GPL. See COPYING for the - full GPL license text.
- - -See http://www.mozilla.org/MPL/MPL-1.1.html or MPL.html for the full license text.
- -Under MPL section 13. I declare that all of the Covered Code is -Multiple Licensed:
- -- -+ chosen, then this package is licensed under the terms of the GPL Version 2 + or alternatively, any newer version of the GPL. + See COPYING for the full GPL license text. + + +The contents of this package are subject to the Mozilla Public -License version 1.1 (the "License"); you may not use this package -except in compliance with the License or with any other version -of the MPL. You may obtain a copy of -the License at http://www.mozilla.org/MPL/
- -Software distributed under the License is distributed on an "AS -IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -implied. See the License for the specific language governing -rights and limitations under the License.
- -The Initial Developer of the Original Code is David Beckett. -Portions created by David Beckett -are Copyright (C) 2000-2002 David Beckett, -Institute for Learning and Research Technology, University of Bristol. -All Rights Reserved.
- -Alternatively, the contents of this package may be used under the -terms of the GNU Lesser General Public License (LGPL) Version 2.1, in -which case the provisions of the LGPL License Version 2.1 are -applicable instead of those above. If you wish to allow use of your -version of this package only under the terms of the LGPL License Version -2.1 and not to allow others to use your version of this package under the -MPL Version 1.1, indicate your decision by deleting the provisions -above and replace them with the notice and other provisions required -by the LGPL License Version 2.1. If you do not delete the provisions -above, a recipient may use your version of this package under either the -MPL Version 1.1 or the LGPL License Version 2.1.
- -
See LICENSE-2.0.txt for the full + license text.
+ ++ +Copyright (C) 2000-2004 David Beckett, +Institute for Learning and Research Technology, University of Bristol.
+ +Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at:
+ +http://www.apache.org/licenses/LICENSE-2.0
+ +Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License.
+
This library is free software / open source software released -under the LGPL or MPL licenses. See +under the LGPL (GPL) or Apache 2.0 licenses. See LICENSE.html for full details.