p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[1.5.x] Fixed two typos. 

Backport of f89901d from master.
This commit is contained in:
Aymeric Augustin 2012-11-25 19:31:30 +01:00
parent 6945f60c2b
commit 72231610b3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/ref/templates/builtins.txt
View File

@ -1029,7 +1029,7 @@ by the context as to the current application.
Don't forget to put quotes around the function path or pattern name! Don't forget to put quotes around the function path or pattern name!
.. versionchanged:: 1.5 .. 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 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 the usual rules: it can be a quoted string or a variable that will be
looked up in the context. looked up in the context.

2
tests/modeltests/raw_query/models.py
View File

@ -13,7 +13,7 @@ class Author(models.Model):
# treated differently than fields. # treated differently than fields.
for k in kwargs: for k in kwargs:
assert k in [f.attname for f in self._meta.fields], \ 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): class Book(models.Model):
title = models.CharField(max_length=255) title = models.CharField(max_length=255)