summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-11-25 19:31:30 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-11-25 19:31:53 +0100
commitf89901dc0525f3ea1ca023aef4fd0862514bf550 (patch)
tree0c50532bb506bfcceb45444181b914631b7a0e91
parenta5d47415f47025b014e580af1533e9023dc32945 (diff)
Fixed two typos.
-rw-r--r--docs/ref/templates/builtins.txt2
-rw-r--r--tests/modeltests/raw_query/models.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index c525162862..dc79b3a7d0 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1040,7 +1040,7 @@ by the context as to the current application.
Don't forget to put quotes around the function path or pattern name!
.. versionchanged:: 1.5
- The first paramater used not to be quoted, which was inconsistent with
+ The first parameter used not to be quoted, which was inconsistent with
other template tags. Since Django 1.5, it is evaluated according to
the usual rules: it can be a quoted string or a variable that will be
looked up in the context.
diff --git a/tests/modeltests/raw_query/models.py b/tests/modeltests/raw_query/models.py
index 823fc76eee..e7e221dc6e 100644
--- a/tests/modeltests/raw_query/models.py
+++ b/tests/modeltests/raw_query/models.py
@@ -13,7 +13,7 @@ class Author(models.Model):
# treated differently than fields.
for k in kwargs:
assert k in [f.attname for f in self._meta.fields], \
- "Author.__init__ got an unexpected paramater: %s" % k
+ "Author.__init__ got an unexpected parameter: %s" % k
class Book(models.Model):
title = models.CharField(max_length=255)