[1.1.X] Fixed #12837 -- Clarified the naming strategy for m2m intermediate tables. Thanks to Ramiro Morales for the report and patch.

Backport of r12516 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12521 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 7 insertions, 6 deletions

diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index 6204065958..b25bcb1dc2 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -878,12 +878,13 @@ the model is related. This works exactly the same as it does for
 Database Representation
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-Behind the scenes, Django creates an intermediary join table to represent the
-many-to-many relationship. By default, this table name is generated using the
-names of the two tables being joined. Since some databases don't support table
-names above a certain length, these table names will be automatically
-truncated to 64 characters and a uniqueness hash will be used. This means you
-might see table names like ``author_books_9cdf4``; this is perfectly normal.
+Behind the scenes, Django creates an intermediary join table to
+represent the many-to-many relationship. By default, this table name
+is generated using the name of the many-to-many field and the model
+that contains it. Since some databases don't support table names above
+a certain length, these table names will be automatically truncated to
+64 characters and a uniqueness hash will be used. This means you might
+see table names like ``author_books_9cdf4``; this is perfectly normal.
 You can manually provide the name of the join table using the
 :attr:`~ManyToManyField.db_table` option.