Merge branch 'master' into ticket_2501ticket_2501

Conflicts:
	lib/sqlalchemy/orm/mapper.py

6 files changed, 31 insertions, 5 deletions

diff --git a/doc/build/orm/extensions/associationproxy.rst b/doc/build/orm/extensions/associationproxy.rst
index 90bb29ebf..9b25c4a68 100644
--- a/doc/build/orm/extensions/associationproxy.rst
+++ b/doc/build/orm/extensions/associationproxy.rst
@@ -15,6 +15,7 @@ the construction of sophisticated collections and dictionary
 views of virtually any geometry, persisted to the database using
 standard, transparently configured relational patterns.
 
+
 Simplifying Scalar Collections
 ------------------------------
 
diff --git a/doc/build/orm/extensions/automap.rst b/doc/build/orm/extensions/automap.rst
new file mode 100644
index 000000000..d1d200609
--- /dev/null
+++ b/doc/build/orm/extensions/automap.rst
@@ -0,0 +1,22 @@
+.. _automap_toplevel:
+
+Automap
+=======
+
+.. automodule:: sqlalchemy.ext.automap
+
+API Reference
+-------------
+
+.. autofunction:: automap_base
+
+.. autoclass:: AutomapBase
+	:members:
+
+.. autofunction:: classname_for_table
+
+.. autofunction:: name_for_scalar_relationship
+
+.. autofunction:: name_for_collection_relationship
+
+.. autofunction:: generate_relationship
diff --git a/doc/build/orm/extensions/declarative.rst b/doc/build/orm/extensions/declarative.rst
index 35895e8df..636bb451b 100644
--- a/doc/build/orm/extensions/declarative.rst
+++ b/doc/build/orm/extensions/declarative.rst
@@ -10,6 +10,8 @@ API Reference
 
 .. autofunction:: declarative_base
 
+.. autofunction:: as_declarative
+
 .. autoclass:: declared_attr
 
 .. autofunction:: sqlalchemy.ext.declarative.api._declarative_constructor
@@ -27,3 +29,4 @@ API Reference
 .. autoclass:: ConcreteBase
 
 .. autoclass:: DeferredReflection
+   :members:
diff --git a/doc/build/orm/extensions/hybrid.rst b/doc/build/orm/extensions/hybrid.rst
index 3ee76fd9b..16cdafebc 100644
--- a/doc/build/orm/extensions/hybrid.rst
+++ b/doc/build/orm/extensions/hybrid.rst
@@ -15,7 +15,7 @@ API Reference
     :members:
 
 .. autoclass:: Comparator
-    :show-inheritance:
+     
 
 .. autodata:: HYBRID_METHOD
 
diff --git a/doc/build/orm/extensions/instrumentation.rst b/doc/build/orm/extensions/instrumentation.rst
index 94946b1ae..16084e319 100644
--- a/doc/build/orm/extensions/instrumentation.rst
+++ b/doc/build/orm/extensions/instrumentation.rst
@@ -10,6 +10,8 @@ API Reference
 
 .. autodata:: INSTRUMENTATION_MANAGER
 
+.. autoclass:: sqlalchemy.orm.instrumentation.InstrumentationFactory
+
 .. autoclass:: InstrumentationManager
     :members:
     :undoc-members:
@@ -17,7 +19,6 @@ API Reference
 .. autodata:: instrumentation_finders
 
 .. autoclass:: ExtendedInstrumentationRegistry
-    :show-inheritance:
     :members:
 
 
diff --git a/doc/build/orm/extensions/mutable.rst b/doc/build/orm/extensions/mutable.rst
index ba3e10542..14875cd3c 100644
--- a/doc/build/orm/extensions/mutable.rst
+++ b/doc/build/orm/extensions/mutable.rst
@@ -12,15 +12,14 @@ API Reference
     :members: _parents, coerce
 
 .. autoclass:: Mutable
-    :show-inheritance:
     :members:
+    :inherited-members:
+    :private-members:
 
 .. autoclass:: MutableComposite
-    :show-inheritance:
     :members:
 
 .. autoclass:: MutableDict
-	:show-inheritance:
 	:members: