Mike Bayer avatar Mike Bayer committed e3d1058

some doc fixes

Comments (0)

Files changed (3)

doc/build/orm/deprecated.rst

-## In 0.7, move "interfaces" to here.
+.. _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:
+

doc/build/orm/interfaces.rst

-.. _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`.

lib/sqlalchemy/ext/sqlsoup.py

 ============
 
 Sessions, Transactions and Application Integration
--------------------------------------------------
+---------------------------------------------------
 
 .. note::
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.