summaryrefslogtreecommitdiff
path: root/docs/topics
diff options
context:
space:
mode:
authorSzczepan Cieślik <szczepan.cieslik@gmail.com>2014-02-22 18:30:28 +0100
committerTim Graham <timograham@gmail.com>2014-02-25 10:28:32 -0500
commite8161980347da5a68b4224d8a9ffc466630a796d (patch)
tree741d748738f3923d38b6ab69d54a5c26f4fe6b65 /docs/topics
parent65b4626528fc133a09ebc8d19fbaa871bdb7e17d (diff)
Fixed docs typos.
Diffstat (limited to 'docs/topics')
-rw-r--r--docs/topics/auth/customizing.txt2
-rw-r--r--docs/topics/cache.txt10
-rw-r--r--docs/topics/db/models.txt3
-rw-r--r--docs/topics/db/sql.txt2
-rw-r--r--docs/topics/db/transactions.txt4
-rw-r--r--docs/topics/forms/index.txt2
-rw-r--r--docs/topics/performance.txt2
-rw-r--r--docs/topics/testing/tools.txt4
8 files changed, 15 insertions, 14 deletions
diff --git a/docs/topics/auth/customizing.txt b/docs/topics/auth/customizing.txt
index 4c54e8b986..4c14460caa 100644
--- a/docs/topics/auth/customizing.txt
+++ b/docs/topics/auth/customizing.txt
@@ -569,7 +569,7 @@ The following methods are available on any subclass of
.. versionchanged:: 1.6
In Django 1.4 and 1.5, a blank string was unintentionally stored
- as an unsable password as well.
+ as an unusable password as well.
.. method:: models.AbstractBaseUser.check_password(raw_password)
diff --git a/docs/topics/cache.txt b/docs/topics/cache.txt
index c77a7288a5..96e89bc3a5 100644
--- a/docs/topics/cache.txt
+++ b/docs/topics/cache.txt
@@ -10,9 +10,9 @@ processing-overhead perspective, than your standard
read-a-file-off-the-filesystem server arrangement.
For most Web applications, this overhead isn't a big deal. Most Web
-applications aren't washingtonpost.com or slashdot.org; they're simply small-
-to medium-sized sites with so-so traffic. But for medium- to high-traffic
-sites, it's essential to cut as much overhead as possible.
+applications aren't ``washingtonpost.com`` or ``slashdot.org``; they're simply
+small- to medium-sized sites with so-so traffic. But for medium- to
+high-traffic sites, it's essential to cut as much overhead as possible.
That's where caching comes in.
@@ -307,7 +307,7 @@ to ``"django.core.cache.backends.locmem.LocMemCache"``. For example::
}
The cache :setting:`LOCATION <CACHES-LOCATION>` is used to identify individual
-memory stores. If you only have one locmem cache, you can omit the
+memory stores. If you only have one ``locmem`` cache, you can omit the
:setting:`LOCATION <CACHES-LOCATION>`; however, if you have more than one local
memory cache, you will need to assign a name to at least one of them in
order to keep them separate.
@@ -470,7 +470,7 @@ Additionally, the cache middleware automatically sets a few headers in each
:class:`~django.http.HttpResponse`:
* Sets the ``Last-Modified`` header to the current date/time when a fresh
- (uncached) version of the page is requested.
+ (not cached) version of the page is requested.
* Sets the ``Expires`` header to the current date/time plus the defined
:setting:`CACHE_MIDDLEWARE_SECONDS`.
diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt
index a8445a2cf5..f566ae1c80 100644
--- a/docs/topics/db/models.txt
+++ b/docs/topics/db/models.txt
@@ -1022,7 +1022,8 @@ of the model name::
However, if ``p`` in the above example was *not* a ``Restaurant`` (it had been
created directly as a ``Place`` object or was the parent of some other class),
-referring to ``p.restaurant`` would raise a Restaurant.DoesNotExist exception.
+referring to ``p.restaurant`` would raise a ``Restaurant.DoesNotExist``
+exception.
``Meta`` and multi-table inheritance
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/topics/db/sql.txt b/docs/topics/db/sql.txt
index a2c621962b..9dcc98a3cb 100644
--- a/docs/topics/db/sql.txt
+++ b/docs/topics/db/sql.txt
@@ -201,7 +201,7 @@ __ http://en.wikipedia.org/wiki/SQL_injection
In Django 1.5 and earlier, you could pass parameters as dictionaries
when using PostgreSQL or MySQL, although this wasn't documented. Now
- you can also do this whem using Oracle, and it is officially supported.
+ you can also do this when using Oracle, and it is officially supported.
.. _executing-custom-sql:
diff --git a/docs/topics/db/transactions.txt b/docs/topics/db/transactions.txt
index 52a2a66780..9e1c86276f 100644
--- a/docs/topics/db/transactions.txt
+++ b/docs/topics/db/transactions.txt
@@ -44,7 +44,7 @@ transaction. If the response is produced without problems, Django commits the
transaction. If the view produces an exception, Django rolls back the
transaction.
-You may perfom partial commits and rollbacks in your view code, typically with
+You may perform partial commits and rollbacks in your view code, typically with
the :func:`atomic` context manager. However, at the end of the view, either
all the changes will be committed, or none of them.
@@ -622,7 +622,7 @@ behavior is the same, there are two differences.
With the previous API, it was possible to switch to autocommit or to commit
explicitly anywhere inside a view. Since :setting:`ATOMIC_REQUESTS
<DATABASE-ATOMIC_REQUESTS>` relies on :func:`atomic` which enforces atomicity,
-this isn't allowed any longer. However, at the toplevel, it's still possible
+this isn't allowed any longer. However, at the top level, it's still possible
to avoid wrapping an entire view in a transaction. To achieve this, decorate
the view with :func:`non_atomic_requests` instead of :func:`autocommit`.
diff --git a/docs/topics/forms/index.txt b/docs/topics/forms/index.txt
index a4dc0b4776..441ab2eea3 100644
--- a/docs/topics/forms/index.txt
+++ b/docs/topics/forms/index.txt
@@ -115,7 +115,7 @@ There are three possible code paths here:
+------------------+---------------+-----------------------------------------+
| Form submitted? | Data? | What occurs |
+==================+===============+=========================================+
-| Unsubmitted | None yet | Template gets passed unbound instance |
+| Not submitted | None yet | Template gets passed unbound instance |
| | | of ContactForm. |
+------------------+---------------+-----------------------------------------+
| Submitted | Invalid data | Template gets passed bound instance |
diff --git a/docs/topics/performance.txt b/docs/topics/performance.txt
index 052ccbba0d..37c61bc343 100644
--- a/docs/topics/performance.txt
+++ b/docs/topics/performance.txt
@@ -305,7 +305,7 @@ tag, so browsers will reload the asset automatically.
^^^^^^^^^^^^^^
Several third-party Django tools and packages provide the ability to "minify"
-HTML, CSS, and JavaScript. They remove uneccessary whitespace, newlines, and
+HTML, CSS, and JavaScript. They remove unnecessary whitespace, newlines, and
comments, and shorten variable names, and thus reduce the size of the documents
that your site publishes.
diff --git a/docs/topics/testing/tools.txt b/docs/topics/testing/tools.txt
index e31021eaef..a93ef39835 100644
--- a/docs/topics/testing/tools.txt
+++ b/docs/topics/testing/tools.txt
@@ -1255,7 +1255,7 @@ your test suite.
:param empty_value: the expected clean output for inputs in ``empty_values``.
For example, the following code tests that an ``EmailField`` accepts
- "a@a.com" as a valid email address, but rejects "aaa" with a reasonable
+ ``a@a.com`` as a valid email address, but rejects ``aaa`` with a reasonable
error message::
self.assertFieldOutput(EmailField, {'a@a.com': 'a@a.com'}, {'aaa': [u'Enter a valid email address.']})
@@ -1412,7 +1412,7 @@ your test suite.
comparison is based on XML semantics. Similarly to
:meth:`~SimpleTestCase.assertHTMLEqual`, the comparison is
made on parsed content, hence only semantic differences are considered, not
- syntax differences. When unvalid XML is passed in any parameter, an
+ syntax differences. When invalid XML is passed in any parameter, an
``AssertionError`` is always raised, even if both string are identical.
Output in case of error can be customized with the ``msg`` argument.