add collections module to API ref for completeness. links to the mapper documentation

which is less wordy.

diff --git a/doc/build/Makefile b/doc/build/Makefile
index f7ac2ca576dd349387c7f3a072660e9a8358a546..6dcd0321ee953ac3f58c0fea78b8ad1d1c8368e2 100644 (file)
--- a/doc/build/Makefile
+++ b/doc/build/Makefile
@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
+SPHINXBUILD   = ./bin/sphinx-build
 PAPER         =
 
 # Internal variables.

diff --git a/doc/build/mappers.rst b/doc/build/mappers.rst
index 89db6a0a740e79b6aaf914aa9e031c81f98ec7a7..ff9b1f95bf327c19dbabe648d498bb5daabf20df 100644 (file)
--- a/doc/build/mappers.rst
+++ b/doc/build/mappers.rst
@@ -1285,6 +1285,8 @@ Theres no restriction on how many times you can relate from parent to child.  SQ
                     addresses_table.c.city=='New York')),
     })
 
+.. _alternate_collection_implementations:
+
 Alternate Collection Implementations 
 -------------------------------------
 

diff --git a/doc/build/reference/orm/collections.rst b/doc/build/reference/orm/collections.rst
new file mode 100644 (file)
index 0000000..e8cf678
--- /dev/null
+++ b/doc/build/reference/orm/collections.rst
@@ -0,0 +1,17 @@
+Collection Mapping
+==================
+
+This is an in-depth discussion of collection mechanics.  For simple examples, see :ref:`alternate_collection_implementations`.
+
+.. automodule:: sqlalchemy.orm.collections
+
+.. autofunction:: attribute_mapped_collection
+
+.. autoclass:: collection
+
+.. autofunction:: collection_adapter
+
+.. autofunction:: column_mapped_collection
+
+.. autofunction:: mapped_collection
+

diff --git a/doc/build/reference/orm/index.rst b/doc/build/reference/orm/index.rst
index c7c771d8cd79d4b44b95279c10f40f094a9e52ae..001d7b4eebd7d12c3047b712e159da3fa0d3d3c0 100644 (file)
--- a/doc/build/reference/orm/index.rst
+++ b/doc/build/reference/orm/index.rst
@@ -7,6 +7,7 @@ sqlalchemy.orm
     :glob:
 
     mapping
+    collections
     query
     sessions
     interfaces