queryset-refactor: Merged to [6130]

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

AUTHORS

@@ -122,6 +122,7 @@ answer newbie questions, and generally made Django that much better:
     gandalf@owca.info
     Marc Garcia <marc.garcia@accopensys.com>
     Baishampayan Ghose
+    Dimitris Glezos <dimitris@glezos.com>
     glin@seznam.cz
     martin.glueck@gmail.com
     GomoX <gomo@datafull.com>

django/conf/locale/ko/LC_MESSAGES/django.po

@@ -825,12 +825,12 @@ msgstr "%d 자 이상 입력해 주세요."
 #: newforms/fields.py:130
 #, python-format
 msgid "Ensure this value is less than or equal to %s."
-msgstr "%s 자 이하로 입력해 주세요."
+msgstr "%s 이하의 값을 입력해 주세요."
 
 #: newforms/fields.py:132
 #, python-format
 msgid "Ensure this value is greater than or equal to %s."
-msgstr "%s 자 이상 입력해 주세요."
+msgstr "%s 이상의 값을 입력해 주세요."
 
 #: newforms/fields.py:165
 msgid "Enter a valid date."

django/conf/project_template/settings.py

@@ -24,7 +24,7 @@ DATABASE_PORT = ''             # Set to empty string for default. Not used with
 TIME_ZONE = 'America/Chicago'
 
 # Language code for this installation. All choices can be found here:
-# http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
+# http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'en-us'
 
 SITE_ID = 1

django/contrib/sites/models.py

@@ -38,6 +38,9 @@ class RequestSite(object):
     def __init__(self, request):
         self.domain = self.name = request.META['SERVER_NAME']
 
+    def __unicode__(self):
+        return self.domain
+
     def save(self):
         raise NotImplementedError('RequestSite cannot be saved.')
 

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')
 

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