standardize license and copyright

AUTHORS

@@ -1,12 +0,0 @@
-Flask is developed and maintained by the Pallets team and community
-contributors. It was created by Armin Ronacher. The core maintainers
-are:
-
-- David Lord (davidism)
-- Adrian Mönnich (ThiefMaster)
-- Armin Ronacher (mitsuhiko)
-- Marcus Unterwaditzer (untitaker)
-
-A full list of contributors is available from git with::
-
-    git shortlog -sne

LICENSE

@@ -1,31 +0,0 @@
-Copyright © 2010 by the Pallets team.
-
-Some rights reserved.
-
-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.
-
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-* Neither the name of the copyright holder nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-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 HOLDER 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.

LICENSE.rst

@@ -0,0 +1,28 @@
+Copyright 2010 Pallets
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1.  Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+2.  Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+3.  Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or 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
+HOLDER 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.

artwork/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2010 by Armin Ronacher.
-
-Some rights reserved.
-
-This logo or a modified version may be used by anyone to refer to the
-Flask project, but does not indicate endorsement by the project.
-
-Redistribution and use in source (the SVG file) and binary forms (rendered
-PNG files etc.) of the image, with or without modification, are permitted
-provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright
-  notice and this list of conditions.
-
-* The names of the contributors to the Flask software (see AUTHORS) may
-  not be used to endorse or promote products derived from this software
-  without specific prior written permission.
-
-Note: we would appreciate that you make the image a link to
-http://flask.pocoo.org/ if you use it on a web page.

artwork/LICENSE.rst

@@ -0,0 +1,19 @@
+Copyright 2010 Pallets
+
+This logo or a modified version may be used by anyone to refer to the
+Flask project, but does not indicate endorsement by the project.
+
+Redistribution and use in source (SVG) and binary (renders in PNG, etc.)
+forms, with or without modification, are permitted provided that the
+following conditions are met:
+
+1.  Redistributions of source code must retain the above copyright
+    notice and this list of conditions.
+
+3.  Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+We would appreciate that you make the image a link to
+https://palletsprojects.com/p/flask/ if you use it in a medium that
+supports links.

docs/license.rst

@@ -1,48 +1,19 @@
 License
 =======
 
-Flask is licensed under a three clause BSD License.  It basically means:
+Source License
-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 derivatives
-of the software without written consent.
 
-The full license text can be found below (:ref:`flask-license`).  For the
+This license applies to all files in the Flask repository and source
-documentation and artwork different licenses apply.
+distribution. This includes Flask's source code, the examples, and
+tests, as well as the documentation.
 
-.. _authors:
+.. include:: ../LICENSE.rst
-
-Authors
--------
-
-.. include:: ../AUTHORS
-
-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 source code 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:
+Artwork License
+---------------
 
-Flask Artwork License
+This license applies to Flask's logo.
----------------------
 
-.. include:: ../artwork/LICENSE
+.. include:: ../artwork/LICENSE.rst

flask/__init__.py

@@ -6,8 +6,8 @@
     A microframework based on Werkzeug.  It's extensively documented
     and follows best practice patterns.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 __version__ = '1.0.3'

flask/__main__.py

@@ -5,8 +5,8 @@
 
     Alias for flask.run for the command line.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 if __name__ == '__main__':

flask/_compat.py

@@ -7,8 +7,8 @@
     version of six so we don't have to depend on a specific version
     of it.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import sys

flask/app.py

@@ -5,8 +5,8 @@
 
     This module implements the central WSGI application object.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import os

flask/blueprints.py

@@ -6,8 +6,8 @@
     Blueprints are the recommended way to implement larger or more
     pluggable applications in Flask 0.7 and later.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 from functools import update_wrapper
 

flask/cli.py

@@ -5,8 +5,8 @@
 
     A simple command line application to run flask apps.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 from __future__ import print_function

flask/config.py

@@ -5,8 +5,8 @@
 
     Implements the configuration related objects.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import os

flask/ctx.py

@@ -5,8 +5,8 @@
 
     Implements the objects required to keep the context.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import sys

flask/debughelpers.py

@@ -5,8 +5,8 @@
 
     Various helpers to make the development experience better.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import os

flask/globals.py

@@ -6,8 +6,8 @@
     Defines all the global objects that are proxies to the current
     active context.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 from functools import partial

flask/helpers.py

@@ -5,8 +5,8 @@
 
     Implements various helpers.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import os

flask/json/__init__.py

@@ -3,8 +3,8 @@
 flask.json
 ~~~~~~~~~~
 
-:copyright: © 2010 by the Pallets team.
+:copyright: 2010 Pallets
-:license: BSD, see LICENSE for more details.
+:license: BSD-3-Clause
 """
 import codecs
 import io

flask/json/tag.py

@@ -38,8 +38,8 @@ processes dicts first, so insert the new tag at the front of the order since
 
     app.session_interface.serializer.register(TagOrderedDict, index=0)
 
-:copyright: © 2010 by the Pallets team.
+:copyright: 2010 Pallets
-:license: BSD, see LICENSE for more details.
+:license: BSD-3-Clause
 """
 
 from base64 import b64decode, b64encode

flask/logging.py

@@ -3,8 +3,8 @@
 flask.logging
 ~~~~~~~~~~~~~
 
-:copyright: © 2010 by the Pallets team.
+:copyright: 2010 Pallets
-:license: BSD, see LICENSE for more details.
+:license: BSD-3-Clause
 """
 
 from __future__ import absolute_import

flask/sessions.py

@@ -5,8 +5,8 @@
 
     Implements cookie based sessions based on itsdangerous.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import hashlib

flask/signals.py

@@ -6,8 +6,8 @@
     Implements signals based on blinker if available, otherwise
     falls silently back to a noop.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 signals_available = False

flask/templating.py

@@ -5,8 +5,8 @@
 
     Implements the bridge to Jinja2.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 from jinja2 import BaseLoader, Environment as BaseEnvironment, \

flask/testing.py

@@ -6,8 +6,8 @@
     Implements test support helpers.  This module is lazily imported
     and usually not used in production environments.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import werkzeug

flask/views.py

@@ -5,8 +5,8 @@
 
     This module provides class-based views inspired by the ones in Django.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 from .globals import request

flask/wrappers.py

@@ -5,8 +5,8 @@
 
     Implements the WSGI wrappers (request and response).
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 from werkzeug.exceptions import BadRequest

tests/conftest.py

@@ -3,8 +3,8 @@
     tests.conftest
     ~~~~~~~~~~~~~~
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import gc

tests/test_appctx.py

@@ -5,8 +5,8 @@
 
     Tests the application context.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import pytest

tests/test_basic.py

@@ -5,8 +5,8 @@
 
     The basic functionality.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import re

tests/test_blueprints.py

@@ -5,8 +5,8 @@
 
     Blueprints (and currently modules)
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import functools

tests/test_cli.py

@@ -3,8 +3,8 @@
     tests.test_cli
     ~~~~~~~~~~~~~~
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 # This file was part of Flask-CLI and was modified under the terms of

tests/test_config.py

@@ -3,8 +3,8 @@
     tests.test_config
     ~~~~~~~~~~~~~~~~~
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 from datetime import timedelta

tests/test_helpers.py

@@ -5,8 +5,8 @@
 
     Various helpers.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import datetime

tests/test_instance_config.py

@@ -3,8 +3,8 @@
     tests.test_instance
     ~~~~~~~~~~~~~~~~~~~
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import os

tests/test_json_tag.py

@@ -3,8 +3,8 @@
 tests.test_json_tag
 ~~~~~~~~~~~~~~~~~~~
 
-:copyright: © 2010 by the Pallets team.
+:copyright: 2010 Pallets
-:license: BSD, see LICENSE for more details.
+:license: BSD-3-Clause
 """
 
 from datetime import datetime

tests/test_logging.py

@@ -3,8 +3,8 @@
 tests.test_logging
 ~~~~~~~~~~~~~~~~~~~
 
-:copyright: © 2010 by the Pallets team.
+:copyright: 2010 Pallets
-:license: BSD, see LICENSE for more details.
+:license: BSD-3-Clause
 """
 
 import logging

tests/test_regression.py

@@ -5,8 +5,8 @@
 
     Tests regressions.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import gc

tests/test_reqctx.py

@@ -5,8 +5,8 @@
 
     Tests the request context.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import pytest

tests/test_signals.py

@@ -5,8 +5,8 @@
 
     Signalling.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import pytest

tests/test_subclassing.py

@@ -6,8 +6,8 @@
     Test that certain behavior of flask can be customized by
     subclasses.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import flask

tests/test_templating.py

@@ -5,8 +5,8 @@
 
     Template functionality
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import pytest

tests/test_testing.py

@@ -5,8 +5,8 @@
 
     Test client and more.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 import click
 import pytest

tests/test_user_error_handler.py

@@ -3,8 +3,8 @@
 tests.test_user_error_handler
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-:copyright: © 2010 by the Pallets team.
+:copyright: 2010 Pallets
-:license: BSD, see LICENSE for more details.
+:license: BSD-3-Clause
 """
 
 from werkzeug.exceptions import (

tests/test_views.py

@@ -5,8 +5,8 @@
 
     Pluggable views.
 
-    :copyright: © 2010 by the Pallets team.
+    :copyright: 2010 Pallets
-    :license: BSD, see LICENSE for more details.
+    :license: BSD-3-Clause
 """
 
 import pytest