summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/class-based-views/index.txt2
-rw-r--r--docs/topics/performance.txt2
-rw-r--r--docs/topics/testing/index.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/topics/class-based-views/index.txt b/docs/topics/class-based-views/index.txt
index 364746a093..3ec00f7361 100644
--- a/docs/topics/class-based-views/index.txt
+++ b/docs/topics/class-based-views/index.txt
@@ -24,7 +24,7 @@ Basic examples
Django provides base view classes which will suit a wide range of applications.
All views inherit from the :class:`~django.views.generic.base.View` class, which
-handles linking the view in to the URLs, HTTP method dispatching and other
+handles linking the view into the URLs, HTTP method dispatching and other
common features. :class:`~django.views.generic.base.RedirectView` provides a
HTTP redirect, and :class:`~django.views.generic.base.TemplateView` extends the
base class to make it also render a template.
diff --git a/docs/topics/performance.txt b/docs/topics/performance.txt
index 70fcff6e48..585102647e 100644
--- a/docs/topics/performance.txt
+++ b/docs/topics/performance.txt
@@ -86,7 +86,7 @@ Get things right from the start
-------------------------------
Some work in optimization involves tackling performance shortcomings, but some
-of the work can be built in to what you'd do anyway, as part of the good
+of the work can be built-in to what you'd do anyway, as part of the good
practices you should adopt even before you start thinking about improving
performance.
diff --git a/docs/topics/testing/index.txt b/docs/topics/testing/index.txt
index 65f970b0ae..1c7d6394a5 100644
--- a/docs/topics/testing/index.txt
+++ b/docs/topics/testing/index.txt
@@ -21,7 +21,7 @@ inspect your application's output and generally verify your code is doing what
it should be doing.
The preferred way to write tests in Django is using the :mod:`unittest` module
-built in to the Python standard library. This is covered in detail in the
+built-in to the Python standard library. This is covered in detail in the
:doc:`overview` document.
You can also use any *other* Python test framework; Django provides an API and