maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Merge branch 'master' of github.com:mitsuhiko/flask

Browse source
This commit is contained in:
Armin Ronacher 2011-11-04 02:46:44 +01:00
commit 11c7b1df23
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -48,7 +48,7 @@ Released on September 29th 2011, codename Rakija
of a value error which usually would result in a 500 internal server of a value error which usually would result in a 500 internal server
error if not handled. This is a backwards incompatible change. error if not handled. This is a backwards incompatible change.
- Applications now not only have a root path where the resources and modules - Applications now not only have a root path where the resources and modules
are located but also an instane path which is the designated place to are located but also an instance path which is the designated place to
drop files that are modified at runtime (uploads etc.). Also this is drop files that are modified at runtime (uploads etc.). Also this is
conceptionally only instance depending and outside version control so it's conceptionally only instance depending and outside version control so it's
the perfect place to put configuration files etc. For more information the perfect place to put configuration files etc. For more information

2
docs/api.rst
View file

@ -144,7 +144,7 @@ Response Objects
A :class:`Headers` object representing the response headers. A :class:`Headers` object representing the response headers.
.. attribute:: status_code .. attribute:: status
The response status as integer. The response status as integer.

2
docs/config.rst
View file

@ -375,7 +375,7 @@ file from the instance folder with :meth:`Flask.open_instance_resource`.
Example usage for both:: Example usage for both::
filename = os.path.join(app.instance_root, 'application.cfg') filename = os.path.join(app.instance_path, 'application.cfg')
with open(filename) as f: with open(filename) as f:
config = f.read() config = f.read()