From 60c38c1a4e482ef86465c9ac40e0b47af175ffa7 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 8 Sep 2014 08:41:59 -0400 Subject: [PATCH] Fixed #23281 -- Added "concrete model" to glossary. Thanks knowledgepoint-devs for the suggestion. --- docs/glossary.txt | 4 ++++ docs/ref/models/fields.txt | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/glossary.txt b/docs/glossary.txt index 0195b9d4c8..8899ae744d 100644 --- a/docs/glossary.txt +++ b/docs/glossary.txt @@ -6,6 +6,10 @@ Glossary .. glossary:: + concrete model + A non-abstract (:attr:`abstract=False + `) model. + field An attribute on a :term:`model`; a given field usually maps directly to a single database column. diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt index 1f96a72323..e7717e9d90 100644 --- a/docs/ref/models/fields.txt +++ b/docs/ref/models/fields.txt @@ -1522,7 +1522,7 @@ accepted by :class:`ForeignKey`, plus one extra argument: .. attribute:: OneToOneField.parent_link When ``True`` and used in a model which inherits from another - (concrete) model, indicates that this field should be used as the + :term:`concrete model`, indicates that this field should be used as the link back to the parent class, rather than the extra ``OneToOneField`` which would normally be implicitly created by subclassing. @@ -1631,7 +1631,7 @@ Field API reference See :ref:`converting-values-to-python-objects` for usage. .. note:: - + For performance reasons, ``from_db_value`` is not implemented as a no-op on fields which do not require it (all Django fields). Consequently you may not call ``super`` in your definition. @@ -1690,7 +1690,7 @@ Field API reference Fields often receive their values as a different type, either from serialization or from forms. - + .. method:: to_python(value) Converts the value into the correct Python object. It acts as the