diff --git a/docs/model-api.txt b/docs/model-api.txt
index e7afbfd13a..59d415a124 100644
--- a/docs/model-api.txt
+++ b/docs/model-api.txt
@@ -456,6 +456,10 @@ has ``null=True``, that means it has two possible values for "no data":
 possible values for "no data;" Django convention is to use the empty
 string, not ``NULL``.
 
+Due to database limitations when using the Oracle backend, the ``null=True``
+option will be coerced for string-based fields, and the value ``NULL`` will
+be stored to denote the empty string.
+
 ``blank``
 ~~~~~~~~~
 
@@ -550,6 +554,13 @@ scenes.
 If ``True``, ``django-admin.py sqlindexes`` will output a ``CREATE INDEX``
 statement for this field.
 
+``db_tablespace``
+~~~~~~~~~~~~~~~~~
+
+If this field is indexed, the name of the database tablespace to use for the
+index. The default is the ``db_tablespace`` of the model, if any. If the
+backend doesn't support tablespaces, this option is ignored.
+
 ``default``
 ~~~~~~~~~~~
 
@@ -743,7 +754,7 @@ relationship should work. All are optional:
     ``limit_choices_to``     A dictionary of lookup arguments and values (see
                              the `Database API reference`_) that limit the
                              available admin choices for this object. Use this
-                             with functions from the Python ``datetime`` module 
+                             with functions from the Python ``datetime`` module
                              to limit choices of objects by date. For example::
 
                                 limit_choices_to = {'pub_date__lte': datetime.now}
@@ -960,6 +971,12 @@ If your database table name is an SQL reserved word, or contains characters
 that aren't allowed in Python variable names -- notably, the hyphen --
 that's OK. Django quotes column and table names behind the scenes.
 
+``db_tablespace``
+-----------------
+
+The name of the database tablespace to use for the model. If the backend
+doesn't support tablespaces, this option is ignored.
+
 ``get_latest_by``
 -----------------