Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #8705: Corrected some formatting issues in models documentation

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8788 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit f88fb967bd5069034a6d6bdd26129a6dd1953185 1 parent b085ccc
@ubernostrum ubernostrum authored
Showing with 3 additions and 10 deletions.
  1. +3 −10 docs/topics/db/models.txt
View
13 docs/topics/db/models.txt
@@ -143,14 +143,12 @@ optional. They're fully explained in the :ref:`reference
ones:
:attr:`~Field.null`
-
If ``True``, Django will store empty values as ``NULL`` in the database.
Default is ``False``.
:attr:`~Field.blank`
-
If ``True``, the field is allowed to be blank. Default is ``False``.
-
+
Note that this is different than :attr:`~Field.null`.
:attr:`~Field.null` is purely database-related, whereas
:attr:`~Field.blank` is validation-related. If a field has
@@ -159,7 +157,6 @@ ones:
<Field.blank>`, the field will be required.
:attr:`~Field.choices`
-
An iterable (e.g., a list or tuple) of 2-tuples to use as choices for
this field. If this is given, Django's admin will use a select box
instead of the standard text field and will limit choices to the choices
@@ -174,21 +171,18 @@ ones:
('SR', 'Senior'),
('GR', 'Graduate'),
)
-
- :attr:`~Field.default`
+ :attr:`~Field.default`
The default value for the field. This can be a value or a callable
object. If callable it will be called every time a new object is
created.
-
- :attr:`~Field.help_text`
+ :attr:`~Field.help_text`
Extra "help" text to be displayed under the field on the object's admin
form. It's useful for documentation even if your object doesn't have an
admin form.
:attr:`~Field.primary_key`
-
If ``True``, this field is the primary key for the model.
If you don't specify :attr:`primary_key=True <Field.primary_key>` for
@@ -199,7 +193,6 @@ ones:
see :ref:`automatic-primary-key-fields`.
:attr:`~Field.unique`
-
If ``True``, this field must be unique throughout the table.
Again, these are just short descriptions of the most common field options. Full
Please sign in to comment.
Something went wrong with that request. Please try again.