Browse Source

Fixed typo and added AUTHORS file and license text to docs.

pull/1638/head
Armin Ronacher 15 years ago
parent
commit
3a1e518657
  1. 13
      AUTHORS
  2. 21
      LICENSE
  3. 1
      docs/index.rst
  4. 21
      docs/license.rst
  5. 2
      flask.py

13
AUTHORS

@ -0,0 +1,13 @@
Flask is written and maintained by Armin Ronacher and
various contributors:
Development Lead
````````````````
- Armin Ronacher <armin.ronacher@active-4.com>
Patches and Suggestions
```````````````````````
- Chris Edgemon
- Chris Grindstaff

21
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

1
docs/index.rst

@ -44,6 +44,7 @@ web development.
deploying/index
becomingbig
design
license
Reference
---------

21
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

2
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.

Loading…
Cancel
Save