diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt index de7649efde..4b100ad98d 100644 --- a/docs/ref/models/fields.txt +++ b/docs/ref/models/fields.txt @@ -1386,8 +1386,6 @@ The possible values for :attr:`~ForeignKey.on_delete` are found in If in doubt, leave it to its default of ``True``. -.. _ref-manytomany: - ``ManyToManyField`` ------------------- @@ -1591,8 +1589,6 @@ that control how the relationship functions. :attr:`~Field.null` has no effect since there is no way to require a relationship at the database level. -.. _ref-onetoone: - ``OneToOneField`` ----------------- diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt index ef14a68632..0041b63118 100644 --- a/docs/releases/1.7.txt +++ b/docs/releases/1.7.txt @@ -76,8 +76,8 @@ but a few of the key features are: `. * It is not advised to have apps without migrations depend on (have a - :ref:`ForeignKey ` or :ref:`ManyToManyField ` - to) apps with migrations. + :class:`~django.db.models.ForeignKey` or + :class:`~django.db.models.ManyToManyField` to) apps with migrations. .. _app-loading-refactor-17-release-note: diff --git a/docs/topics/auth/customizing.txt b/docs/topics/auth/customizing.txt index a1f99f9140..711b47c74b 100644 --- a/docs/topics/auth/customizing.txt +++ b/docs/topics/auth/customizing.txt @@ -300,8 +300,8 @@ change to what is stored in the database, you can create a :ref:`proxy model allows for any of the features offered by proxy models including default ordering, custom managers, or custom model methods. -If you wish to store information related to ``User``, you can use a :ref:`one-to-one -relationship ` to a model containing the fields for +If you wish to store information related to ``User``, you can use a +:class:`~django.db.models.OneToOneField` to a model containing the fields for additional information. This one-to-one model is often called a profile model, as it might store non-auth related information about a site user. For example you might create an Employee model:: diff --git a/docs/topics/db/examples/many_to_many.txt b/docs/topics/db/examples/many_to_many.txt index 13c2b96c8f..5c77dc08e4 100644 --- a/docs/topics/db/examples/many_to_many.txt +++ b/docs/topics/db/examples/many_to_many.txt @@ -4,7 +4,8 @@ Many-to-many relationships .. highlight:: pycon -To define a many-to-many relationship, use :ref:`ref-manytomany`. +To define a many-to-many relationship, use +:class:`~django.db.models.ManyToManyField`. In this example, an ``Article`` can be published in multiple ``Publication`` objects, and a ``Publication`` has multiple ``Article`` objects: diff --git a/docs/topics/db/examples/one_to_one.txt b/docs/topics/db/examples/one_to_one.txt index c3060d86bb..dd92c63519 100644 --- a/docs/topics/db/examples/one_to_one.txt +++ b/docs/topics/db/examples/one_to_one.txt @@ -2,7 +2,8 @@ One-to-one relationships ======================== -To define a one-to-one relationship, use :ref:`ref-onetoone`. +To define a one-to-one relationship, use +:class:`~django.db.models.OneToOneField`. In this example, a ``Place`` optionally can be a ``Restaurant``:: diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt index 45fc6360e4..261ce14f44 100644 --- a/docs/topics/db/models.txt +++ b/docs/topics/db/models.txt @@ -387,8 +387,7 @@ For example, if a ``Pizza`` has multiple ``Topping`` objects -- that is, a As with :class:`~django.db.models.ForeignKey`, you can also create :ref:`recursive relationships ` (an object with a many-to-many relationship to itself) and :ref:`relationships to models not yet -defined `; see :ref:`the model field reference -` for details. +defined `. It's suggested, but not required, that the name of a :class:`~django.db.models.ManyToManyField` (``toppings`` in the example above) @@ -610,20 +609,17 @@ restaurant "is a" place; in fact, to handle this you'd typically use :ref:`inheritance `, which involves an implicit one-to-one relation). -As with :class:`~django.db.models.ForeignKey`, a -:ref:`recursive relationship ` -can be defined and -:ref:`references to as-yet undefined models ` -can be made; see :ref:`the model field reference ` for details. +As with :class:`~django.db.models.ForeignKey`, a :ref:`recursive relationship +` can be defined and :ref:`references to as-yet +undefined models ` can be made. .. seealso:: See the :doc:`One-to-one relationship model example ` for a full example. -:class:`~django.db.models.OneToOneField` fields also accept one specific, -optional ``parent_link`` argument described in the :ref:`model field -reference `. +:class:`~django.db.models.OneToOneField` fields also accept an optional +:attr:`~django.db.models.OneToOneField.parent_link` argument. :class:`~django.db.models.OneToOneField` classes used to automatically become the primary key on a model. This is no longer true (although you can manually