some doc fixes

diff --git a/doc/build/orm/deprecated.rst b/doc/build/orm/deprecated.rst
index 8388de8d696e4f9095ed4890961d02405ae24d63..943059747023518eb5a6a9e4c287daf6640d1bb6 100644 (file)
--- 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 943059747023518eb5a6a9e4c287daf6640d1bb6..bedbeca40fccc5785e4c2af65cb0a313d51f083f 100644 (file)
--- 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 30f3f15e1d9eb518870cbd7996441a963b3a6405..47589acc4c3ce4ede5d91c8ea3bebfa58ff638e1 100644 (file)
--- a/lib/sqlalchemy/ext/sqlsoup.py
+++ b/lib/sqlalchemy/ext/sqlsoup.py
@@ -252,7 +252,7 @@ Advanced Use
 ============
 
 Sessions, Transactions and Application Integration
--------------------------------------------------
+---------------------------------------------------
 
 .. note::