Permalink
Browse files

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

  • Loading branch information...
2 parents f52e7a9 + 5a7c02b commit 11c7b1df2359f6d01f24d055b92aed0c9e961e88 @mitsuhiko mitsuhiko committed Nov 4, 2011
Showing with 3 additions and 3 deletions.
  1. +1 −1 CHANGES
  2. +1 −1 docs/api.rst
  3. +1 −1 docs/config.rst
View
@@ -48,7 +48,7 @@ Released on September 29th 2011, codename Rakija
of a value error which usually would result in a 500 internal server
error if not handled. This is a backwards incompatible change.
- 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
conceptionally only instance depending and outside version control so it's
the perfect place to put configuration files etc. For more information
View
@@ -144,7 +144,7 @@ Response Objects
A :class:`Headers` object representing the response headers.
- .. attribute:: status_code
+ .. attribute:: status
The response status as integer.
View
@@ -375,7 +375,7 @@ file from the instance folder with :meth:`Flask.open_instance_resource`.
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:
config = f.read()

0 comments on commit 11c7b1d

Please sign in to comment.