summaryrefslogtreecommitdiff
path: root/doc/build/intro.rst
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-02-25 23:15:39 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2010-02-25 23:15:39 +0000
commitf60a5fbd5d52c74a33441ea834ede839584595fc (patch)
tree52ba2fd130217f68f50d6c9a5cc5ebc6d04469d0 /doc/build/intro.rst
parentc4be0b84a58ec9162c45fc57a6baa9e5fb7c966f (diff)
downloadsqlalchemy-f60a5fbd5d52c74a33441ea834ede839584595fc.tar.gz
- merge -r6823:6841 of branches/chrisw_mixin
- declarative now accepts mixin classes directly, as a means to provide common functional and column-based elements on all subclasses, as well as a means to propagate a fixed set of __table_args__ or __mapper_args__ to subclasses. For custom combinations of __table_args__/__mapper_args__ from an inherited mixin to local, descriptors can now be used. New details are all up in the Declarative documentation. Thanks to Chris Withers for putting up with my strife on this. [ticket:1707]
Diffstat (limited to 'doc/build/intro.rst')
-rw-r--r--doc/build/intro.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/build/intro.rst b/doc/build/intro.rst
index d4fdfccdf..dd4a97507 100644
--- a/doc/build/intro.rst
+++ b/doc/build/intro.rst
@@ -52,7 +52,7 @@ Installing SQLAlchemy from scratch is most easily achieved with `setuptools <htt
This command will download the latest version of SQLAlchemy from the `Python Cheese Shop <http://pypi.python.org/pypi/SQLAlchemy>`_ and install it to your system.
-* `setuptools <http://peak.telecommunity.com/DevCenter/setuptools>`_
+* setuptools_
* `install setuptools <http://peak.telecommunity.com/DevCenter/EasyInstall#installation-instructions>`_
* `pypi <http://pypi.python.org/pypi/SQLAlchemy>`_