From 3a1e51865786474c44a04c0d422515047dd27223 Mon Sep 17 00:00:00 2001 From: Armin Ronacher Date: Tue, 20 Apr 2010 13:29:54 +0200 Subject: [PATCH] Fixed typo and added AUTHORS file and license text to docs. --- AUTHORS | 13 +++++++++++++ LICENSE | 21 +++++++++++---------- docs/index.rst | 1 + docs/license.rst | 21 +++++++++++++++++++++ flask.py | 2 +- 5 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 AUTHORS create mode 100644 docs/license.rst diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 00000000..92379c48 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,13 @@ +Flask is written and maintained by Armin Ronacher and +various contributors: + +Development Lead +```````````````` + +- Armin Ronacher + +Patches and Suggestions +``````````````````````` + +- Chris Edgemon +- Chris Grindstaff diff --git a/LICENSE b/LICENSE index 6ed65ec8..6a8df19e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ -Copyright (c) 2010 by Armin Ronacher. +Copyright (c) 2010 by Armin Ronacher and contributors. See AUTHORS +for more details. Some rights reserved. @@ -6,17 +7,17 @@ Redistribution and use in source and binary forms, 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 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. +* 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. - * The names of the contributors may not be used to endorse or - promote products derived from this software without specific - prior written permission. +* The names of the contributors may not 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 diff --git a/docs/index.rst b/docs/index.rst index 5d3ddb2d..9b2f132b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -44,6 +44,7 @@ web development. deploying/index becomingbig design + license Reference --------- diff --git a/docs/license.rst b/docs/license.rst new file mode 100644 index 00000000..918a75b1 --- /dev/null +++ b/docs/license.rst @@ -0,0 +1,21 @@ +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. + +.. _BSD License: + http://en.wikipedia.org/wiki/BSD_licenses#3-clause_license_.28.22New_BSD_License.22.29 + +Authors +------- + +.. include:: ../AUTHORS + +License Text +------------ + +.. include:: ../LICENSE diff --git a/flask.py b/flask.py index bc99bee0..05197c81 100644 --- a/flask.py +++ b/flask.py @@ -358,7 +358,7 @@ class Flask(object): self.before_request_funcs = [] #: a list of functions that are called at the end of the - #: request. Tha function is passed the current response + #: request. The function is passed the current response #: object and modify it in place or replace it. #: To register a function here use the :meth:`after_request` #: decorator.