diff --git a/docs/model-api.txt b/docs/model-api.txt index a0844ea961..b49963d8f5 100644 --- a/docs/model-api.txt +++ b/docs/model-api.txt @@ -149,7 +149,7 @@ and in Django's validation. Django veterans: Note that the argument is now called ``max_length`` to provide consistency throughout Django. There is full legacy support for the old ``maxlength`` argument, but ``max_length`` is preferred. - + ``CommaSeparatedIntegerField`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -678,7 +678,9 @@ set. If ``True``, this field must be unique throughout the table. -This is enforced at the database level and at the Django admin-form level. +This is enforced at the database level and at the Django admin-form level. If +you try to add save a model with a duplicate value in a ``unique`` field, a +``django.db.IntegrityError`` will be raised by the model's ``save()`` method. ``unique_for_date`` ~~~~~~~~~~~~~~~~~~~ @@ -1584,8 +1586,8 @@ Finally, note that in order to use ``list_display_links``, you must define Set ``list_filter`` to activate filters in the right sidebar of the change list page of the admin. This should be a list of field names, and each specified -field should be either a ``BooleanField``, ``CharField``, ``DateField``, -``DateTimeField``, ``IntegerField`` or ``ForeignKey``. +field should be either a ``BooleanField``, ``CharField``, ``DateField``, +``DateTimeField``, ``IntegerField`` or ``ForeignKey``. This example, taken from the ``django.contrib.auth.models.User`` model, shows how both ``list_display`` and ``list_filter`` work::