Skip to content

Commit

Permalink
Other: Changed the license to GPL2+ only. See ckeditor/ckeditor5#991.
Browse files Browse the repository at this point in the history
  • Loading branch information
Kamil Piechaczek committed Jul 24, 2018
1 parent 4d74640 commit f4add87
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 30 deletions.
36 changes: 7 additions & 29 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,17 @@
Software License Agreement
==========================

@ckeditor/ckeditor5-react – Official CKEditor 5 React component.
Copyright (c) 2003-2018, CKSource Frederico Knabben. All rights reserved.
**CKEditor 5 Component for React**https://github.com/ckeditor/ckeditor5-react <br>
Copyright (c) 2003-2018, [CKSource](http://cksource.com) Frederico Knabben. All rights reserved.

Licensed under the terms of the MIT License (see Appendix A):

http://en.wikipedia.org/wiki/MIT_License
Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html).

Sources of Intellectual Property Included in CKEditor
-----------------------------------------------------

Where not otherwise indicated, all @ckeditor/jsdoc-plugins content is authored by CKSource engineers and consists of CKSource-owned intellectual property. In some specific instances, @ckeditor/jsdoc-plugins will incorporate work done by developers outside of CKSource with their express permission.

Appendix A: The MIT License
---------------------------

The MIT License (MIT)

Copyright (c) 2003-2018, CKSource – Frederico Knabben

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Where not otherwise indicated, all CKEditor content is authored by CKSource engineers and consists of CKSource-owned intellectual property. In some specific instances, CKEditor will incorporate work done by developers outside of CKSource with their express permission.

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
Trademarks
----------

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
**CKEditor** is a trademark of [CKSource](http://cksource.com) Frederico Knabben. All other brand and product names are trademarks, registered trademarks or service marks of their respective holders.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -394,3 +394,7 @@ It builds a minified version of the package which is ready to publish.
```bash
npm run build
```

## License

Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html). For full details about the license, please check the LICENSE.md file.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"url": "https://github.com/ckeditor/ckeditor5-react.git"
},
"author": "CKSource (http://cksource.com/)",
"license": "MIT",
"license": "GPL-2.0-or-later",
"bugs": {
"url": "https://github.com/ckeditor/ckeditor5-react/issues"
},
Expand Down

0 comments on commit f4add87

Please sign in to comment.