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)