Skip to content

Commit a84bd1a

Browse files
committed
Update LICENSE
Use the "Annotator contributors" copyright assignment, as this is the most accurate thing for the inheritance of Annotator and conveys the intention to have contributors maintain copyright over their own contributions. However, as there is no significant code remaining that has not undergone a recent rewrite, change the license on the code as it now stands, incorporating any remaining derivation under the terms of its original licensing as MIT (in addition to GPL).
1 parent ef0e16e commit a84bd1a

File tree

1 file changed

+17
-22
lines changed

1 file changed

+17
-22
lines changed

Diff for: LICENSE

+17-22
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
1-
# xpath-range licensing terms
1+
The MIT License (MIT)
2+
Copyright © 2015 The Annotator project contributors
23

3-
xpath-range is free software, and you may use it under the terms of either
4-
the MIT or the GNU GPL licenses:
4+
Permission is hereby granted, free of charge, to any person obtaining a copy
5+
of this software and associated documentation files (the “Software”), to deal
6+
in the Software without restriction, including without limitation the rights
7+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
copies of the Software, and to permit persons to whom the Software is
9+
furnished to do so, subject to the following conditions:
510

6-
## GNU GPLv3
11+
The above copyright notice and this permission notice shall be included in
12+
all copies or substantial portions of the Software.
713

8-
You can redistribute this program and/or modify it under the terms of the
9-
GNU General Public License as published by the Free Software Foundation,
10-
either version 3 of the License, or (at your option) any later version.
11-
12-
This program is distributed in the hope that it will be useful,
13-
but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
GNU General Public License for more details.
16-
17-
You should have received a copy of the GNU General Public License
18-
along with this program. See LICENSE-GPL, or, if this file is missing,
19-
<http://www.gnu.org/licenses/>.
20-
21-
## MIT
22-
23-
You may use the software under the terms of the MIT license, which can be
24-
found in LICENSE-MIT, or, if this file is missing,
25-
<http://www.opensource.org/licenses/mit-license>.
14+
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20+
THE SOFTWARE.

0 commit comments

Comments
 (0)