From 30e4b186f2f9ec00eb9b9fbab4463894a730f57f Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 22 Sep 2010 23:48:17 -0400 Subject: doc edits --- doc/build/core/expression_api.rst | 2 ++ doc/build/core/tutorial.rst | 10 ++++++---- doc/build/orm/mapper_config.rst | 4 ++-- doc/build/orm/relationships.rst | 2 ++ doc/build/orm/tutorial.rst | 6 ++++-- 5 files changed, 16 insertions(+), 8 deletions(-) (limited to 'doc') diff --git a/doc/build/core/expression_api.rst b/doc/build/core/expression_api.rst index c01f84c2c..c39701a59 100644 --- a/doc/build/core/expression_api.rst +++ b/doc/build/core/expression_api.rst @@ -1,3 +1,5 @@ +.. _expression_api_toplevel: + SQL Statements and Expressions ============================== diff --git a/doc/build/core/tutorial.rst b/doc/build/core/tutorial.rst index 23190a143..bf3920198 100644 --- a/doc/build/core/tutorial.rst +++ b/doc/build/core/tutorial.rst @@ -1187,12 +1187,14 @@ Finally, a delete. Easy enough: Further Reference ================== -API docs: :mod:`sqlalchemy.sql.expression` +Expression Language Reference: :ref:`expression_api_toplevel` -Table Metadata Reference: :ref:`metadata_toplevel` +Database Metadata Reference: :ref:`metadata_toplevel` -Engine/Connection/Execution Reference: :ref:`engines_toplevel` +Engine Reference: :ref:`engines_toplevel` -SQL Types: :ref:`types` +Connection Reference: :ref:`connections_toplevel` + +Types Reference: :ref:`types_toplevel` diff --git a/doc/build/orm/mapper_config.rst b/doc/build/orm/mapper_config.rst index 574646ca7..15377436f 100644 --- a/doc/build/orm/mapper_config.rst +++ b/doc/build/orm/mapper_config.rst @@ -1,7 +1,7 @@ -.. _mapper_config_toplevel: - .. module:: sqlalchemy.orm +.. _mapper_config_toplevel: + Mapper Configuration ==================== diff --git a/doc/build/orm/relationships.rst b/doc/build/orm/relationships.rst index 342847328..f9337a5f6 100644 --- a/doc/build/orm/relationships.rst +++ b/doc/build/orm/relationships.rst @@ -1,5 +1,7 @@ .. module:: sqlalchemy.orm +.. _relationship_config_toplevel: + Relationship Configuration ========================== diff --git a/doc/build/orm/tutorial.rst b/doc/build/orm/tutorial.rst index 6f38a35c9..1ac212961 100644 --- a/doc/build/orm/tutorial.rst +++ b/doc/build/orm/tutorial.rst @@ -1436,6 +1436,8 @@ Further Reference Query Reference: :ref:`query_api_toplevel` -Further information on mapping setups are in :ref:`datamapping_toplevel`. +Mapper Reference: :ref:`mapper_config_toplevel` -Further information on working with Sessions: :ref:`session_toplevel`. +Relationship Reference: :ref:`relationship_config_toplevel` + +Session Reference: :ref:`session_toplevel`. -- cgit v1.2.1