Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed some awkward wordings from docs/model-api.txt from [5519] and a…

…dded 'new in Django development version' notes

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 8cea4c7c5e4fff7d5dc3adebf33f353d0cab6048 1 parent 4fdbd7e
@adrianholovaty adrianholovaty authored
Showing with 11 additions and 6 deletions.
  1. +11 −6 docs/model-api.txt
View
17 docs/model-api.txt
@@ -493,9 +493,9 @@ possible values for "no data;" Django convention is to use the empty
string, not ``NULL``.
.. note::
- Due to database limitations, when using the Oracle backend the
- ``null=True`` option will be coerced for string-based fields that can
- blank, and the value ``NULL`` will be stored to denote the empty string.
+ When using the Oracle database backend, the ``null=True`` option will
+ be coerced for string-based fields that can blank, and the value
+ ``NULL`` will be stored to denote the empty string.
``blank``
~~~~~~~~~
@@ -594,9 +594,12 @@ 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.
+**New in Django development version**
+
+The name of the database tablespace to use for this field's index, if
+indeed this field is indexed. The default is the ``db_tablespace`` of
+the model, if any. If the backend doesn't support tablespaces, this
+option is ignored.
``default``
~~~~~~~~~~~
@@ -1011,6 +1014,8 @@ that's OK. Django quotes column and table names behind the scenes.
``db_tablespace``
-----------------
+**New in Django development version**
+
The name of the database tablespace to use for the model. If the backend
doesn't support tablespaces, this option is ignored.
Please sign in to comment.
Something went wrong with that request. Please try again.