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

CHANGES

@@ -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

docs/api.rst

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

docs/config.rst

@@ -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()