diff options
-rw-r--r-- | LICENSE.html | 80 | ||||
-rw-r--r-- | README.html | 2 |
2 files changed, 32 insertions, 50 deletions
diff --git a/LICENSE.html b/LICENSE.html index 05b6333b..57e1613e 100644 --- a/LICENSE.html +++ b/LICENSE.html @@ -8,8 +8,9 @@ <h1 style="text-align:center">Raptor RDF Parser Toolkit - License</h1> - <p>This package is Free Software available under the specified - versions of the two licenses below and no other versions:</p> + <p>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.</p> <h2>1. The GNU Lesser General Public License (LGPL) Version 2.1</h2> @@ -25,7 +26,7 @@ All Rights Reserved.</p> <p>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.</p> + or any newer version.</p> <p>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 @@ All Rights Reserved.</p> <p><b>NOTE</b> - 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 <a href="COPYING">COPYING</a> for the - full GPL license text.</p> - - - <h2>2. The Mozilla Public License V1.1</h2> - -<p>See <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a> or <a href="MPL.html">MPL.html</a> for the full license text.</p> - -<p>Under MPL section 13. I declare that all of the Covered Code is -Multiple Licensed:</p> - - <hr /> - - <blockquote> - -<p>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 <a href="http://www.mozilla.org/MPL/">http://www.mozilla.org/MPL/</a></p> - -<p>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.</p> - -<p>The Initial Developer of the Original Code is <a href="http://purl.org/net/dajobe/">David Beckett</a>. -Portions created by <a href="http://purl.org/net/dajobe/">David Beckett</a> -are Copyright (C) 2000-2002 <a href="http://purl.org/net/dajobe/">David Beckett</a>, -<a href="http://www.ilrt.bristol.ac.uk/">Institute for Learning and Research Technology</a>, <a href="http://www.bristol.ac.uk/">University of Bristol</a>. -All Rights Reserved.</p> - -<p>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.</p> - - </blockquote> + chosen, then this package is licensed under the terms of the GPL Version 2 + or alternatively, any newer version of the GPL. + See <a href="COPYING">COPYING</a> for the full GPL license text.</p> + + + <h2>2. The Apache License V2.0</h2> + + <p>See <a href="LICENSE-2.0.txt">LICENSE-2.0.txt</a> for the full + license text.</p> + + <blockquote> + + <p>Copyright (C) 2000-2004 <a href="http://purl.org/net/dajobe/">David Beckett</a>, +<a href="http://www.ilrt.bristol.ac.uk/">Institute for Learning and Research Technology</a>, <a href="http://www.bristol.ac.uk/">University of Bristol</a>.</p> + + <p>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:</p> + + <p><a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a></p> + + <p>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.</p> + </blockquote> <hr /> diff --git a/README.html b/README.html index 15c2732d..8a7f7c02 100644 --- a/README.html +++ b/README.html @@ -122,7 +122,7 @@ There are <h2>License</h2> <p>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 <a href="LICENSE.html">LICENSE.html</a> for full details.</p> |