diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/index.rst | 2 | ||||
| -rw-r--r-- | docs/intro.rst | 38 |
2 files changed, 23 insertions, 17 deletions
diff --git a/docs/index.rst b/docs/index.rst index f45dc64..e0e4166 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -22,7 +22,7 @@ Release v\ |version|. (:ref:`Installation <install>`) .. * :ref:`search` -Tablib is an :ref:`Apache Licensed <apache>` format-agnostic tabular dataset library, written in Python. It allows you to import, export, and manipulate tabular data sets. Advanced features include, segregation, dynamic columns, tags & filtering, and seamless format import & export. +Tablib is an :ref:`MIT Licensed <mit>` format-agnostic tabular dataset library, written in Python. It allows you to import, export, and manipulate tabular data sets. Advanced features include, segregation, dynamic columns, tags & filtering, and seamless format import & export. :: diff --git a/docs/intro.rst b/docs/intro.rst index 5ac92b8..c3413f3 100644 --- a/docs/intro.rst +++ b/docs/intro.rst @@ -24,10 +24,10 @@ Tablib was developed with a few :pep:`20` idioms in mind. All contributions to Tablib should keep these important rules in mind. -.. _apache: +.. mit: -Apache License v2 ------------------ +MIT License +----------- A large number of open source projects you find today are `GPL Licensed`_. While the GPL has its time and place, it should most certainly not be your @@ -38,10 +38,10 @@ without the product itself also being offered as open source. The MIT, BSD, and ISC licenses are great alternatives to the GPL that allow your open-source software to be used in proprietary, closed-source software. -Tablib is released under terms of `The Apache License v2`_. +Tablib is released under terms of `The MIT License`_. .. _`GPL Licensed`: http://www.opensource.org/licenses/gpl-license.php -.. _`The Apache License v2`: http://opensource.org/licenses/Apache-2.0 +.. _`The MIT License`: http://www.opensource.org/licenses/mit-license.php .. _license: @@ -51,17 +51,23 @@ Tablib License Copyright 2011 Kenneth Reitz -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. +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: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +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. .. _pythonsupport: |