diff options
| author | Cody Scott <cody.j.b.scott@gmail.com> | 2013-10-10 17:52:50 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-10-10 20:57:20 -0400 |
| commit | 3e6d8959123f4155295b0fc0abb9542013f696ff (patch) | |
| tree | 5ae3638070f879367f5e66316db8f5f4b3b7b31f | |
| parent | 9f8a36eb20895d9e542820d5190bfa77ad1b85d9 (diff) | |
[1.5.x] Small improvements to docs/topics/db/models.txt
Backport of 695bc0d191 from master
| -rw-r--r-- | docs/topics/db/models.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt index 58c77bc400..67777d01f9 100644 --- a/docs/topics/db/models.txt +++ b/docs/topics/db/models.txt @@ -4,9 +4,9 @@ Models .. module:: django.db.models -A model is the single, definitive source of data about your data. It contains -the essential fields and behaviors of the data you're storing. Generally, each -model maps to a single database table. +A model is the single, definitive source of information about your data. It +contains the essential fields and behaviors of the data you're storing. +Generally, each model maps to a single database table. The basics: @@ -48,7 +48,7 @@ Some technical notes: * The name of the table, ``myapp_person``, is automatically derived from some model metadata but can be overridden. See :ref:`table-names` for more - details.. + details. * An ``id`` field is added automatically, but this behavior can be overridden. See :ref:`automatic-primary-key-fields`. @@ -110,7 +110,7 @@ determine a few things: * The database column type (e.g. ``INTEGER``, ``VARCHAR``). -* The default :doc:`widget </ref/forms/widgets>` to use when rendering a form +* The default HTML :doc:`widget </ref/forms/widgets>` to use when rendering a form field (e.g. ``<input type="text">``, ``<select>``). * The minimal validation requirements, used in Django's admin and in @@ -234,7 +234,7 @@ sees you've explicitly set :attr:`Field.primary_key`, it won't add the automatic ``id`` column. Each model requires exactly one field to have :attr:`primary_key=True -<Field.primary_key>`. +<Field.primary_key>` (either explicitly declared or automatically added). .. _verbose-field-names: |
