Merged to 940

git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@941 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/core/db/backends/ado_mssql.py

@@ -102,8 +102,10 @@ def get_limit_offset_sql(limit, offset=None):
     return sql
 
 def get_random_function_sql():
-    # TODO: This is a guess. Make sure this is correct.
-    return "RANDOM()"
+    return "RAND()"
+
+def get_table_list(cursor):
+    raise NotImplementedError
 
 def get_relations(cursor, table_name):
     raise NotImplementedError
@@ -151,3 +153,5 @@ DATA_TYPES = {
     'URLField':          'varchar(200)',
     'USStateField':      'varchar(2)',
 }
+
+DATA_TYPES_REVERSE = {}

django/models/auth.py

@@ -180,7 +180,7 @@ class Message(meta.Model):
 class LogEntry(meta.Model):
     action_time = meta.DateTimeField(auto_now=True)
     user = meta.ForeignKey(User)
-    content_type = meta.ForeignKey(core.ContentType, blank=True, null=True) # TODO: content_type_id name?
+    content_type = meta.ForeignKey(core.ContentType, blank=True, null=True)
     object_id = meta.TextField(blank=True, null=True)
     object_repr = meta.CharField(maxlength=200)
     action_flag = meta.PositiveSmallIntegerField()

docs/model-api.txt

@@ -249,7 +249,7 @@ Here are all available field types:
 
     The admin represents this as an ``<input type="file">`` (a file-upload widget).
 
-    Using a `FieldField` or an ``ImageField`` (see below) in a model takes a few
+    Using a ``FileField` or an ``ImageField`` (see below) in a model takes a few
     steps:
 
         1. In your settings file, you'll need to define ``MEDIA_ROOT`` as the