Browse files

Added upgrading notes

  • Loading branch information...
1 parent b3f342e commit 7503fc81752d4917fc4a9da808ee6bc37f474ff1 @mitsuhiko mitsuhiko committed Jun 19, 2010
Showing with 65 additions and 24 deletions.
  1. +15 −14 LICENSE
  2. +1 −1 docs/contents.rst.inc
  3. +36 −9 docs/license.rst
  4. +13 −0 docs/upgrading.rst
View
29 LICENSE
@@ -3,9 +3,9 @@ for more details.
Some rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+Redistribution and use in source and binary forms of the software as well
+as documentation, with or without modification, are permitted provided
+that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
@@ -19,14 +19,15 @@ met:
promote products derived from this software without specific
prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
View
2 docs/contents.rst.inc
@@ -44,6 +44,6 @@ Design notes, legal information and changelog are here for the interested.
security
unicode
extensiondev
- license
upgrading
changelog
+ license
View
45 docs/license.rst
@@ -1,21 +1,48 @@
License
=======
-Flask is licensed under a three clause `BSD License`_. It basically
-means: do whatever you want with it as long as the copyright in Flask
-sticks around, the conditions are not modified and the disclaimer is
-present. Furthermore you must not use the names of the authors to promote
-derivates of the software without written consent.
+Flask is licensed under a three clause BSD License. It basically means:
+do whatever you want with it as long as the copyright in Flask sticks
+around, the conditions are not modified and the disclaimer is present.
+Furthermore you must not use the names of the authors to promote derivates
+of the software without written consent.
-.. _BSD License:
- http://en.wikipedia.org/wiki/BSD_licenses#3-clause_license_.28.22New_BSD_License.22.29
+The full license text can be found below (:ref:`flask-license`). For the
+documentation and artwork different licenses apply.
+
+.. _authors:
Authors
-------
.. include:: ../AUTHORS
-License Text
-------------
+General License Definitions
+---------------------------
+
+The following section contains the full license texts for Flask and the
+documentation.
+
+- "AUTHORS" hereby refers to all the authors listed in the
+ :ref:`authors` section.
+
+- The ":ref:`flask-license`" applies to all the sourcecode shipped as
+ part of Flask (Flask itself as well as the examples and the unittests)
+ as well as documentation.
+
+- The ":ref:`artwork-license`" applies to the project's Horn-Logo.
+
+.. _flask-license:
+
+Flask License
+-------------
.. include:: ../LICENSE
+
+
+.. _artwork-license:
+
+Flask Artwork License
+---------------------
+
+.. include:: ../artwork/LICENSE
View
13 docs/upgrading.rst
@@ -14,6 +14,19 @@ This section of the documentation enumerates all the changes in Flask from
release to release and how you can change your code to have a painless
updating experience.
+If you want to use the `easy_install` command to upgrade your Flask
+installation, make sure to pass it the ``-U`` parameter::
+
+ $ easy_install -U Flask
+
+Version 0.4
+-----------
+
+For application developers there are no changes that require changes in
+your code. In case you are developing on a Flask extension however, and
+that extension has a unittest-mode you might want to link the activation
+of that mode to the new ``TESTING`` flag.
+
Version 0.3
-----------

0 comments on commit 7503fc8

Please sign in to comment.