summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Hill <alex@hill.net.au>2013-11-30 17:19:24 +0800
committerTim Graham <timograham@gmail.com>2013-11-30 07:59:32 -0500
commitec73ce5d8a0bc3643188d97629c30d226849bddc (patch)
tree33a4808c248e4f9fdcd50998af8558d375d7538a
parent6310d658b7c8a39747a8cda3e3b8716266cffb0d (diff)
Fixed comment typos.
-rw-r--r--django/db/models/sql/query.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 5f24e488cb..db1a630a66 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -1232,7 +1232,7 @@ class Query(object):
q_object.clone(), q_object.negated)
# For join promotion this case is doing an AND for the added q_object
# and existing conditions. So, any existing inner join forces the join
- # type to remain inner. Exsting outer joins can however be demoted.
+ # type to remain inner. Existing outer joins can however be demoted.
# (Consider case where rel_a is LOUTER and rel_a__col=1 is added - if
# rel_a doesn't produce any rows, then the whole condition must fail.
# So, demotion is OK.
@@ -1279,7 +1279,7 @@ class Query(object):
single name in 'names' can generate multiple PathInfos (m2m for
example).
- 'names' is the path of names to travle, 'opts' is the model Options we
+ 'names' is the path of names to travel, 'opts' is the model Options we
start the name resolving from, 'allow_many' is as for setup_joins().
Returns a list of PathInfo tuples. In addition returns the final field