diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-08-18 18:01:27 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-08-18 18:01:27 -0400 |
| commit | 0c19c1c66f3a115f5ce710de571552d68fac6358 (patch) | |
| tree | a86cd2ec2cacc34e97a49a0653afa7da53e4e1a4 /doc/build/orm | |
| parent | 633a86bfd4b68bb52e429f53ec34b3a47e787315 (diff) | |
| download | sqlalchemy-0c19c1c66f3a115f5ce710de571552d68fac6358.tar.gz | |
- reorganize docs so expression, schema are broken out into subfiles, they're too big
- fix the targeting of module names moved around by using custom handlers for "Bases", etc.
Diffstat (limited to 'doc/build/orm')
| -rw-r--r-- | doc/build/orm/exceptions.rst | 2 | ||||
| -rw-r--r-- | doc/build/orm/extensions/hybrid.rst | 2 | ||||
| -rw-r--r-- | doc/build/orm/extensions/instrumentation.rst | 2 | ||||
| -rw-r--r-- | doc/build/orm/extensions/mutable.rst | 6 | ||||
| -rw-r--r-- | doc/build/orm/internals.rst | 28 | ||||
| -rw-r--r-- | doc/build/orm/session.rst | 2 |
6 files changed, 20 insertions, 22 deletions
diff --git a/doc/build/orm/exceptions.rst b/doc/build/orm/exceptions.rst index 1dde4248f..7a760e26f 100644 --- a/doc/build/orm/exceptions.rst +++ b/doc/build/orm/exceptions.rst @@ -2,5 +2,5 @@ ORM Exceptions ============== .. automodule:: sqlalchemy.orm.exc - :show-inheritance: + :members:
\ No newline at end of file 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..2337c39fd 100644 --- a/doc/build/orm/extensions/instrumentation.rst +++ b/doc/build/orm/extensions/instrumentation.rst @@ -17,7 +17,7 @@ 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..4b217ca4d 100644 --- a/doc/build/orm/extensions/mutable.rst +++ b/doc/build/orm/extensions/mutable.rst @@ -12,15 +12,15 @@ API Reference :members: _parents, coerce .. autoclass:: Mutable - :show-inheritance: + :members: .. autoclass:: MutableComposite - :show-inheritance: + :members: .. autoclass:: MutableDict - :show-inheritance: + :members: diff --git a/doc/build/orm/internals.rst b/doc/build/orm/internals.rst index b5a491a52..e2f5b7f62 100644 --- a/doc/build/orm/internals.rst +++ b/doc/build/orm/internals.rst @@ -10,66 +10,66 @@ sections, are listed here. .. autoclass:: sqlalchemy.orm.state.AttributeState :members: - :show-inheritance: + :inherited-members: .. autoclass:: sqlalchemy.orm.instrumentation.ClassManager :members: - :show-inheritance: + :inherited-members: .. autoclass:: sqlalchemy.orm.properties.ColumnProperty :members: - :show-inheritance: + :inherited-members: .. autoclass:: sqlalchemy.orm.descriptor_props.CompositeProperty :members: - :show-inheritance: + .. autoclass:: sqlalchemy.orm.attributes.Event :members: - :show-inheritance: + .. autoclass:: sqlalchemy.orm.interfaces._InspectionAttr :members: - :show-inheritance: + .. autoclass:: sqlalchemy.orm.state.InstanceState :members: - :show-inheritance: + .. autoclass:: sqlalchemy.orm.attributes.InstrumentedAttribute :members: __get__, __set__, __delete__ - :show-inheritance: + :undoc-members: .. autoclass:: sqlalchemy.orm.interfaces.MapperProperty :members: - :show-inheritance: + .. autodata:: sqlalchemy.orm.interfaces.NOT_EXTENSION .. autoclass:: sqlalchemy.orm.interfaces.PropComparator :members: - :show-inheritance: + :inherited-members: .. autoclass:: sqlalchemy.orm.properties.RelationshipProperty :members: - :show-inheritance: + :inherited-members: .. autoclass:: sqlalchemy.orm.descriptor_props.SynonymProperty :members: - :show-inheritance: + :inherited-members: .. autoclass:: sqlalchemy.orm.query.QueryContext :members: - :show-inheritance: + .. autoclass:: sqlalchemy.orm.attributes.QueryableAttribute :members: - :show-inheritance: + :inherited-members: diff --git a/doc/build/orm/session.rst b/doc/build/orm/session.rst index 013645464..77bef3c36 100644 --- a/doc/build/orm/session.rst +++ b/doc/build/orm/session.rst @@ -2048,12 +2048,10 @@ Session and sessionmaker() .. autoclass:: sessionmaker :members: - :show-inheritance: :inherited-members: .. autoclass:: sqlalchemy.orm.session.Session :members: - :show-inheritance: :inherited-members: .. autoclass:: sqlalchemy.orm.session.SessionTransaction |
