Index: modeltests/reverse_lookup/models.py
===================================================================
--- modeltests/reverse_lookup/models.py	(revision 5061)
+++ modeltests/reverse_lookup/models.py	(working copy)
@@ -55,5 +55,5 @@
 >>> Poll.objects.get(choice__name__exact="This is the answer")
 Traceback (most recent call last):
     ...
-TypeError: Cannot resolve keyword 'choice' into field
+TypeError: Cannot resolve keyword 'choice' into field, choices are: poll_choice, related_choice, id, question, creator
 """}
Index: modeltests/lookup/models.py
===================================================================
--- modeltests/lookup/models.py	(revision 5061)
+++ modeltests/lookup/models.py	(working copy)
@@ -223,11 +223,11 @@
 >>> Article.objects.filter(pub_date_year='2005').count()
 Traceback (most recent call last):
     ...
-TypeError: Cannot resolve keyword 'pub_date_year' into field
+TypeError: Cannot resolve keyword 'pub_date_year' into field, choices are: id, headline, pub_date
 
 >>> Article.objects.filter(headline__starts='Article')
 Traceback (most recent call last):
     ...
-TypeError: Cannot resolve keyword 'headline__starts' into field
+TypeError: Cannot resolve keyword 'headline__starts' into field, choices are: id, headline, pub_date
 
 """}
Index: modeltests/many_to_one/models.py
===================================================================
--- modeltests/many_to_one/models.py	(revision 5061)
+++ modeltests/many_to_one/models.py	(working copy)
@@ -174,13 +174,13 @@
 >>> Article.objects.filter(reporter_id__exact=1)
 Traceback (most recent call last):
     ...
-TypeError: Cannot resolve keyword 'reporter_id' into field
+TypeError: Cannot resolve keyword 'reporter_id' into field, choices are: id, headline, pub_date, reporter
 
 # You need to specify a comparison clause
 >>> Article.objects.filter(reporter_id=1)
 Traceback (most recent call last):
     ...
-TypeError: Cannot resolve keyword 'reporter_id' into field
+TypeError: Cannot resolve keyword 'reporter_id' into field, choices are: id, headline, pub_date, reporter
 
 # You can also instantiate an Article by passing
 # the Reporter's ID instead of a Reporter object.
Index: modeltests/custom_columns/models.py
===================================================================
--- modeltests/custom_columns/models.py	(revision 5061)
+++ modeltests/custom_columns/models.py	(working copy)
@@ -71,7 +71,7 @@
 >>> Author.objects.filter(firstname__exact='John')
 Traceback (most recent call last):
     ...
-TypeError: Cannot resolve keyword 'firstname' into field
+TypeError: Cannot resolve keyword 'firstname' into field, choices are: article, id, first_name, last_name
 
 >>> a = Author.objects.get(last_name__exact='Smith')
 >>> a.first_name
Index: regressiontests/null_queries/models.py
===================================================================
--- regressiontests/null_queries/models.py	(revision 5061)
+++ regressiontests/null_queries/models.py	(working copy)
@@ -32,7 +32,7 @@
 >>> Choice.objects.filter(foo__exact=None) 
 Traceback (most recent call last):
 ...
-TypeError: Cannot resolve keyword 'foo' into field
+TypeError: Cannot resolve keyword 'foo' into field, choices are: id, poll, choice
 
 # Can't use None on anything other than __exact
 >>> Choice.objects.filter(id__gt=None)