summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Apolloner <apollo13@users.noreply.github.com>2015-04-19 17:29:44 +0200
committerFlorian Apolloner <apollo13@users.noreply.github.com>2015-04-19 17:29:44 +0200
commitcc493d3c061e876d56152c9e951effb9f330fcfe (patch)
tree96d717f8cf8ac6b688092a55f4a23fcbac05f583
parentf54c0ec06e390dc5bce95fdccbcb51d6423da4f9 (diff)
parentbae72bdd2aa93472617ed28fc3d5a01f0920ea6e (diff)
Merge pull request #4531 from marco-santamaria/ticket11078
Fixed #11078 -- documentation update.
-rw-r--r--docs/topics/db/models.txt3
1 files changed, 0 insertions, 3 deletions
diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt
index 2a9193c805..c21f231808 100644
--- a/docs/topics/db/models.txt
+++ b/docs/topics/db/models.txt
@@ -1189,9 +1189,6 @@ provide any connection between the rows in the different database tables. A
proxy model can inherit from any number of abstract model classes, providing
they do *not* define any model fields.
-Proxy models inherit any ``Meta`` options that they don't define from their
-non-abstract model parent (the model they are proxying for).
-
Proxy model managers
~~~~~~~~~~~~~~~~~~~~