Merge branch 'master' into module-support

flask.py

@@ -94,14 +94,16 @@ class _RequestGlobals(object):
 
 
 class Session(SecureCookie):
-    """Expands the session for support for switching between permanent
+    """Expands the session with support for switching between permanent
     and non-permanent sessions.
     """
 
     def _get_permanent(self):
         return self.get('_permanent', False)
+
     def _set_permanent(self, value):
         self['_permanent'] = bool(value)
+
     permanent = property(_get_permanent, _set_permanent)
     del _get_permanent, _set_permanent
 
@@ -581,7 +583,7 @@ class Flask(_PackageBoundObject):
         #: :meth:`before_request` decorator.
         self.after_request_funcs = {}
 
-        #: a dictionary with list of functions that are called without arguments
+        #: a dictionary with list of functions that are called without argument
         #: to populate the template context.  They key of the dictionary is the
         #: name of the module this function is active for, `None` for all
         #: requests.  Each returns a dictionary that the template context is