queryset-refactor: Merged to [6130]

git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6330 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 2 insertions, 2 deletions

diff --git a/docs/db-api.txt b/docs/db-api.txt
index d1646ba6ea..f5da56ddf9 100644
--- a/docs/db-api.txt
+++ b/docs/db-api.txt
@@ -481,7 +481,7 @@ In SQL terms, that evaluates to::
     WHERE NOT (pub_date > '2005-1-3' AND headline = 'Hello')
 
 This example excludes all entries whose ``pub_date`` is later than 2005-1-3
-AND whose headline is NOT "Hello"::
+OR whose headline is "Hello"::
 
     Entry.objects.exclude(pub_date__gt=datetime.date(2005, 1, 3)).exclude(headline='Hello')
 
diff --git a/docs/newforms.txt b/docs/newforms.txt
index 36c627b398..32c4441eb2 100644
--- a/docs/newforms.txt
+++ b/docs/newforms.txt
@@ -1887,7 +1887,7 @@ field on the model, you could define the callback::
     ...     else:
     ...         return field.formfield(**kwargs)
 
-    >>> ArticleForm = form_for_model(formfield_callback=my_callback)
+    >>> ArticleForm = form_for_model(Article, formfield_callback=my_callback)
 
 Note that your callback needs to handle *all* possible model field types, not
 just the ones that you want to behave differently to the default. That's why