innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #23281 -- Added "concrete model" to glossary. 

Thanks knowledgepoint-devs for the suggestion.
This commit is contained in:
Tim Graham 2014-09-08 08:41:59 -04:00
parent 4680d25df2
commit 60c38c1a4e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/glossary.txt
View File

@ -6,6 +6,10 @@ Glossary
.. glossary:: .. glossary::
concrete model
A non-abstract (:attr:`abstract=False
<django.db.models.Options.abstract>`) model.
field field
An attribute on a :term:`model`; a given field usually maps directly to An attribute on a :term:`model`; a given field usually maps directly to
a single database column. a single database column.

6
docs/ref/models/fields.txt
View File

@ -1522,7 +1522,7 @@ accepted by :class:`ForeignKey`, plus one extra argument:
.. attribute:: OneToOneField.parent_link .. attribute:: OneToOneField.parent_link
When ``True`` and used in a model which inherits from another 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 link back to the parent class, rather than the extra
``OneToOneField`` which would normally be implicitly created by ``OneToOneField`` which would normally be implicitly created by
subclassing. subclassing.
@ -1631,7 +1631,7 @@ Field API reference
See :ref:`converting-values-to-python-objects` for usage. See :ref:`converting-values-to-python-objects` for usage.
.. note:: .. note::
For performance reasons, ``from_db_value`` is not implemented as a For performance reasons, ``from_db_value`` is not implemented as a
no-op on fields which do not require it (all Django fields). no-op on fields which do not require it (all Django fields).
Consequently you may not call ``super`` in your definition. 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 Fields often receive their values as a different type, either from
serialization or from forms. serialization or from forms.
.. method:: to_python(value) .. method:: to_python(value)
Converts the value into the correct Python object. It acts as the Converts the value into the correct Python object. It acts as the