From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 17 Oct 2010 04:07:13 +0000 (-0400)
Subject: edit
X-Git-Tag: rel_0_6_5~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8fff06cb4ffbfe8ba8d5f22ad4154f7fe088b06;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

edit
---

diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py
index 57dff857ca..debfdfe571 100755
--- a/lib/sqlalchemy/ext/declarative.py
+++ b/lib/sqlalchemy/ext/declarative.py
@@ -589,7 +589,8 @@ keys, as a :class:`ForeignKey` itself contains references to columns
 which can't be properly recreated at this level.  For columns that 
 have foreign keys, as well as for the variety of mapper-level constructs
 that require destination-explicit context, the
-:func:`~.declared_attr` decorator is provided so that
+:func:`~.declared_attr` decorator (renamed from ``sqlalchemy.util.classproperty`` in 0.6.5) 
+is provided so that
 patterns common to many classes can be defined as callables::
 
     from sqlalchemy.ext.declarative import declared_attr
@@ -1370,7 +1371,7 @@ class declared_attr(property):
     a mapped property or special declarative member name.
 
     .. note:: @declared_attr is available as 
-      sqlalchemy.util.classproperty for SQLAlchemy versions
+      ``sqlalchemy.util.classproperty`` for SQLAlchemy versions
       0.6.2, 0.6.3, 0.6.4.
       
     @declared_attr turns the attribute into a scalar-like