Removed allow_column_override documentation. Fixes #1381.

diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py
index 7e64bda7ab6ed07ce13d68aeeacb52fcb5696133..7b840a50da4782e2d2f08d0d9f0ac304045562d6 100644 (file)
--- a/lib/sqlalchemy/orm/__init__.py
+++ b/lib/sqlalchemy/orm/__init__.py
@@ -614,11 +614,6 @@ def mapper(class_, local_table=None, *args, **params):
         alternative, see the method `populate_existing()` on
         :class:`~sqlalchemy.orm.query.Query`.
 
-      allow_column_override
-        If True, allows the usage of a ``relation()`` which has the
-        same name as a column in the mapped table.  The table column
-        will no longer be mapped.
-
       allow_null_pks
         Indicates that composite primary keys where one or more (but not all)
         columns contain NULL is a valid primary key.  Primary keys which