summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorCody Scott <cody.j.b.scott@gmail.com>2013-10-10 17:52:50 -0400
committerTim Graham <timograham@gmail.com>2013-10-10 20:57:16 -0400
commit2069dfeaefb1958838aece091bb815d18a25cc33 (patch)
treefffc07195ab56c43e19a22e89bae385d6b987771 /docs
parent8765eddf2e8470b2d359ea8c4c55ee009b89dbcb (diff)
[1.6.x] Small improvements to docs/topics/db/models.txt
Backport of 695bc0d191 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/db/models.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt
index 2b565758e7..2d61bf44a6 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`.
@@ -112,7 +112,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
@@ -236,7 +236,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: