From 8bd94875d2d00e40c09407d46d5e9d3a5110e026 Mon Sep 17 00:00:00 2001 From: Gerasimos Maropoulos Date: Thu, 15 Sep 2016 19:25:09 +0300 Subject: [PATCH] Change the License from MIT to Apache 2.0 (github recomemnds this on the page) --- LICENSE | 26 +++++++++----------------- README.md | 15 +++++++++------ 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/LICENSE b/LICENSE index 4503aac2..e582d1c3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,24 +1,16 @@ -The MIT License (MIT) - Copyright (c) 2016 Gerasimos Maropoulos -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: +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 -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + http://www.apache.org/licenses/LICENSE-2.0 -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. +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. Third-party packages licenses, diff --git a/README.md b/README.md index a93da61d..452d5131 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ -

+
Build Status @@ -11,7 +11,8 @@ Platforms -License +License + Built with GoLang @@ -27,7 +28,9 @@ Chat

-The fastest backend web framework for Go. Easy to learn, while it's highly customizable.
+The fastest backend web framework for Go. +
+Easy to learn, while it's highly customizable.
Ideally suited for both experienced and novice Developers.
@@ -35,7 +38,7 @@ Ideally suited for both experienced and novice Developers. -Quick look +Quick Look ------------ ```go @@ -213,13 +216,13 @@ If you are interested in contributing to the Iris project, please see the docume License ------------ -This project is licensed under the MIT License. +This project is licensed under the Apache License, Version 2.0. License can be found [here](LICENSE). [Travis Widget]: https://img.shields.io/travis/kataras/iris.svg?style=flat-square [Travis]: http://travis-ci.org/kataras/iris -[License Widget]: https://img.shields.io/badge/license-MIT%20%20License%20-E91E63.svg?style=flat-square +[License Widget]: https://img.shields.io/badge/license-Apache%202.0%20%20-E91E63.svg?style=flat-square [License]: https://github.com/kataras/iris/blob/master/LICENSE [Release Widget]: https://img.shields.io/badge/release-v4.2.3-blue.svg?style=flat-square [Release]: https://github.com/kataras/iris/releases