From 787be7261761d0a3277d730e05cd0376a98f41d5 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sat, 16 Jun 2012 20:54:19 -0400 Subject: [PATCH] some doc fixes --- doc/build/orm/deprecated.rst | 35 ++++++++++++++++++++++++++++++++++- doc/build/orm/interfaces.rst | 35 +---------------------------------- lib/sqlalchemy/ext/sqlsoup.py | 2 +- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/doc/build/orm/deprecated.rst b/doc/build/orm/deprecated.rst index 8388de8d69..9430597470 100644 --- a/doc/build/orm/deprecated.rst +++ b/doc/build/orm/deprecated.rst @@ -1 +1,34 @@ -## In 0.7, move "interfaces" to here. \ No newline at end of file +.. _dep_interfaces_orm_toplevel: + +Deprecated ORM Event Interfaces +================================ + +.. module:: sqlalchemy.orm.interfaces + +This section describes the class-based ORM event interface which first +existed in SQLAlchemy 0.1, which progressed with more kinds of events up +until SQLAlchemy 0.5. The non-ORM analogue is described at :ref:`dep_interfaces_core_toplevel`. + +.. deprecated:: 0.7 + As of SQLAlchemy 0.7, the new event system described in + :ref:`event_toplevel` replaces the extension/proxy/listener system, providing + a consistent interface to all events without the need for subclassing. + +Mapper Events +----------------- + +.. autoclass:: MapperExtension + :members: + +Session Events +----------------- + +.. autoclass:: SessionExtension + :members: + +Attribute Events +-------------------- + +.. autoclass:: AttributeExtension + :members: + diff --git a/doc/build/orm/interfaces.rst b/doc/build/orm/interfaces.rst index 9430597470..bedbeca40f 100644 --- a/doc/build/orm/interfaces.rst +++ b/doc/build/orm/interfaces.rst @@ -1,34 +1 @@ -.. _dep_interfaces_orm_toplevel: - -Deprecated ORM Event Interfaces -================================ - -.. module:: sqlalchemy.orm.interfaces - -This section describes the class-based ORM event interface which first -existed in SQLAlchemy 0.1, which progressed with more kinds of events up -until SQLAlchemy 0.5. The non-ORM analogue is described at :ref:`dep_interfaces_core_toplevel`. - -.. deprecated:: 0.7 - As of SQLAlchemy 0.7, the new event system described in - :ref:`event_toplevel` replaces the extension/proxy/listener system, providing - a consistent interface to all events without the need for subclassing. - -Mapper Events ------------------ - -.. autoclass:: MapperExtension - :members: - -Session Events ------------------ - -.. autoclass:: SessionExtension - :members: - -Attribute Events --------------------- - -.. autoclass:: AttributeExtension - :members: - +This page has moved to :ref:`dep_interfaces_orm_toplevel`. diff --git a/lib/sqlalchemy/ext/sqlsoup.py b/lib/sqlalchemy/ext/sqlsoup.py index 30f3f15e1d..47589acc4c 100644 --- a/lib/sqlalchemy/ext/sqlsoup.py +++ b/lib/sqlalchemy/ext/sqlsoup.py @@ -252,7 +252,7 @@ Advanced Use ============ Sessions, Transactions and Application Integration -------------------------------------------------- +--------------------------------------------------- .. note:: -- 2.47.2