Merge branch 'master' into figome-multiple-inheritance

This commit is contained in:
David Lord 2017-04-21 10:33:29 -07:00
commit 0d9d3d8f92
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
115 changed files with 1453 additions and 740 deletions

View file

@ -127,7 +127,7 @@ class MethodViewType(type):
class MethodView(with_metaclass(MethodViewType, View)):
"""Like a regular class-based view but that dispatches requests to
particular methods. For instance if you implement a method called
:meth:`get` it means you will response to ``'GET'`` requests and
:meth:`get` it means it will respond to ``'GET'`` requests and
the :meth:`dispatch_request` implementation will automatically
forward your request to that. Also :attr:`options` is set for you
automatically::