From 2128473938274083aa4416f76c1b8ce09561c068 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Fri, 13 May 2011 21:15:09 -0400 Subject: [PATCH] license/support update --- docs/intro.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/intro.rst b/docs/intro.rst index 66b7f28..971afbd 100644 --- a/docs/intro.rst +++ b/docs/intro.rst @@ -28,13 +28,15 @@ 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 go-to license for your next open source project. -A project that is released as GPL cannot be used in any commercial product without the product itself also being offered as open source. The MIT and BSD licenses are great alternatives to the GPL that allow your open-source software to be used in proprietary, closed-source software. +A project that is released as GPL cannot be used in any commercial product 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 MIT License`_. .. _`GPL Licensed`: http://www.opensource.org/licenses/gpl-license.php .. _`The MIT License`: http://www.opensource.org/licenses/mit-license.php +.. note:: + Tablib will be moved to the `Apache 2 License `_ upon the release of v1.0.0. .. _license: