From 6001ba016a3db4701d56abc6d30868d4e5d88dbf Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Mon, 9 Aug 2010 21:22:37 +0000 Subject: [soc2010/query-refactor] Merged up to trunk r13556, resolved merge conflicts git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13565 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/topics/db/models.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/topics/db/models.txt') diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt index 6d7a7a4374..78c578d61a 100644 --- a/docs/topics/db/models.txt +++ b/docs/topics/db/models.txt @@ -353,7 +353,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-one relationship to itself) and :ref:`relationships to models not yet +many-to-many relationship to itself) and :ref:`relationships to models not yet defined `; see :ref:`the model field reference ` for details. -- cgit v1.3