Skip to content

Commit

Permalink
Merge pull request #387 from FND/docs
Browse files Browse the repository at this point in the history
documentation: minor stylistic adjustments
  • Loading branch information
rduplain committed Jan 23, 2012
2 parents b786eac + 2792dcf commit fbbe147
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docs/patterns/appdispatch.rst
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Dispatch by Subdomain

Sometimes you might want to use multiple instances of the same application
with different configurations. Assuming the application is created inside
a function and you can call that function to instanciate it, that is
a function and you can call that function to instantiate it, that is
really easy to implement. In order to develop your application to support
creating new instances in functions have a look at the
:ref:`app-factories` pattern.
Expand Down
2 changes: 1 addition & 1 deletion docs/views.rst
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ enough to explain the basic principle. When you have a class based view
the question comes up what `self` points to. The way this works is that
whenever the request is dispatched a new instance of the class is created
and the :meth:`~flask.views.View.dispatch_request` method is called with
the parameters from the URL rule. The class itself is instanciated with
the parameters from the URL rule. The class itself is instantiated with
the parameters passed to the :meth:`~flask.views.View.as_view` function.
For instance you can write a class like this::

Expand Down
10 changes: 5 additions & 5 deletions flask/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ def dispatch_request(self):

@classmethod
def as_view(cls, name, *class_args, **class_kwargs):
"""Converts the class into an actual view function that can be
used with the routing system. What it does internally is generating
a function on the fly that will instanciate the :class:`View`
on each request and call the :meth:`dispatch_request` method on it.
"""Converts the class into an actual view function that can be used
with the routing system. Internally this generates a function on the
fly which will instantiate the :class:`View` on each request and call
the :meth:`dispatch_request` method on it.
The arguments passed to :meth:`as_view` are forwarded to the
constructor of the class.
Expand All @@ -90,7 +90,7 @@ def view(*args, **kwargs):

# we attach the view class to the view function for two reasons:
# first of all it allows us to easily figure out what class based
# view this thing came from, secondly it's also used for instanciating
# view this thing came from, secondly it's also used for instantiating
# the view class so you can actually replace it with something else
# for testing purposes and debugging.
view.view_class = cls
Expand Down

0 comments on commit fbbe147

Please sign in to comment.