summaryrefslogtreecommitdiff
path: root/docs/topics
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-02-28 21:03:46 -0500
committerTim Graham <timograham@gmail.com>2014-02-28 21:03:46 -0500
commit1f5f015c32550c1424dd7804e8ee4717bcc5b9b7 (patch)
treeb789093482facf62b5e78d793817ca2687286992 /docs/topics
parent8137215973c8cf97f58f244021b1a4e75923ade8 (diff)
Fixed spelling mistakes in docs.
Diffstat (limited to 'docs/topics')
-rw-r--r--docs/topics/class-based-views/mixins.txt2
-rw-r--r--docs/topics/forms/formsets.txt4
-rw-r--r--docs/topics/migrations.txt2
-rw-r--r--docs/topics/testing/advanced.txt2
4 files changed, 5 insertions, 5 deletions
diff --git a/docs/topics/class-based-views/mixins.txt b/docs/topics/class-based-views/mixins.txt
index f79bf1160e..05644fc787 100644
--- a/docs/topics/class-based-views/mixins.txt
+++ b/docs/topics/class-based-views/mixins.txt
@@ -219,7 +219,7 @@ processing to work on a particular object, identified from the URL,
we'll want the functionality provided by
:class:`~django.views.generic.detail.SingleObjectMixin`.
-We'll demonstrate this with the publisher modelling we used in the
+We'll demonstrate this with the publisher modeling we used in the
:doc:`generic class-based views introduction<generic-display>`.
.. code-block:: python
diff --git a/docs/topics/forms/formsets.txt b/docs/topics/forms/formsets.txt
index 5b2478244d..a1e30b341b 100644
--- a/docs/topics/forms/formsets.txt
+++ b/docs/topics/forms/formsets.txt
@@ -588,8 +588,8 @@ The ``manage_articles.html`` template might look like this:
</table>
</form>
-However the above can be slightly shortcutted and let the formset itself deal
-with the management form:
+However there's a slight shortcut for the above by letting the formset itself
+deal with the management form:
.. code-block:: html+django
diff --git a/docs/topics/migrations.txt b/docs/topics/migrations.txt
index 1d1d278f3f..5d7f9ac5e1 100644
--- a/docs/topics/migrations.txt
+++ b/docs/topics/migrations.txt
@@ -442,7 +442,7 @@ available at the top level of a module it is not serializable.
``kwargs`` should be a dict of keyword arguments to pass to your class'
``__init__`` method. Every value should itself be serializable.
-Django will write out the value as an instatiation of your class with the
+Django will write out the value as an instantiation of your class with the
given arguments, similar to the way it writes out references to Django fields.
diff --git a/docs/topics/testing/advanced.txt b/docs/topics/testing/advanced.txt
index cbf574a29c..1bd15bd1a6 100644
--- a/docs/topics/testing/advanced.txt
+++ b/docs/topics/testing/advanced.txt
@@ -354,7 +354,7 @@ Attributes
the individual tests and format the results. By default it is set to
``unittest.TextTestRunner``. Despite the unfortunate similarity in
naming conventions, this is not the same type of class as
- ``DiscoverRunner``, which covers a broader set of responsibilites. You
+ ``DiscoverRunner``, which covers a broader set of responsibilities. You
can override this attribute to modify the way tests are run and reported.
.. attribute:: DiscoverRunner.test_loader