From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 28 Dec 2014 00:05:08 +0000 (-0500)
Subject: - fix links for loading, add a redirect page
X-Git-Tag: rel_1_0_0b1~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bd632804eae635d793175a959294f49f3538806;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- fix links for loading, add a redirect page

bump

foo
---

diff --git a/doc/build/glossary.rst b/doc/build/glossary.rst
index ab9e92d262..2e5dc67f3f 100644
--- a/doc/build/glossary.rst
+++ b/doc/build/glossary.rst
@@ -146,7 +146,7 @@ Glossary
 
             :term:`N plus one problem`
 
-            :doc:`orm/loading`
+            :doc:`orm/loading_relationships`
 
     mapping
     mapped
@@ -175,7 +175,7 @@ Glossary
 
         .. seealso::
 
-            :doc:`orm/loading`
+            :doc:`orm/loading_relationships`
 
     polymorphic
     polymorphically
diff --git a/doc/build/orm/loading.rst b/doc/build/orm/loading.rst
new file mode 100644
index 0000000000..0aca6cd0c9
--- /dev/null
+++ b/doc/build/orm/loading.rst
@@ -0,0 +1,3 @@
+:orphan:
+
+Moved!   :doc:`/orm/loading_relationships`
\ No newline at end of file
diff --git a/doc/build/requirements.txt b/doc/build/requirements.txt
index bdbd832e4f..c84d342d61 100644
--- a/doc/build/requirements.txt
+++ b/doc/build/requirements.txt
@@ -1,3 +1,3 @@
 changelog>=0.3.4
 sphinx-paramlinks>=0.2.2
-zzzeeksphinx>=1.0.4
+zzzeeksphinx>=1.0.5
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 6cade322a3..d2bdf5a00c 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -811,7 +811,7 @@ class Query(object):
         foreign-key-to-primary-key criterion, will also use an
         operation equivalent to :meth:`~.Query.get` in order to retrieve
         the target value from the local identity map
-        before querying the database.  See :doc:`/orm/loading`
+        before querying the database.  See :doc:`/orm/loading_relationships`
         for further details on relationship loading.
 
         :param ident: A scalar or tuple value representing
@@ -1100,7 +1100,7 @@ class Query(object):
 
         Most supplied options regard changing how column- and
         relationship-mapped attributes are loaded. See the sections
-        :ref:`deferred` and :doc:`/orm/loading` for reference
+        :ref:`deferred` and :doc:`/orm/loading_relationships` for reference
         documentation.
 
         """
diff --git a/lib/sqlalchemy/orm/relationships.py b/lib/sqlalchemy/orm/relationships.py
index 86f1b3f827..d3ae107b90 100644
--- a/lib/sqlalchemy/orm/relationships.py
+++ b/lib/sqlalchemy/orm/relationships.py
@@ -528,7 +528,7 @@ class RelationshipProperty(StrategizedProperty):
 
           .. seealso::
 
-            :doc:`/orm/loading` - Full documentation on relationship loader
+            :doc:`/orm/loading_relationships` - Full documentation on relationship loader
             configuration.
 
             :ref:`dynamic_relationship` - detail on the ``dynamic`` option.