diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-03-17 21:13:14 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-03-17 21:13:14 -0400 |
commit | 2136054ca86284bbfabc9f39787aae88667acbcd (patch) | |
tree | 67c93be37219b2c24f26b14a11eb1ccd71aadd9e /lib/sqlalchemy/orm/descriptor_props.py | |
parent | 0e9f0b5c79e7737125a8e304d9ba432114cec6e5 (diff) | |
download | sqlalchemy-2136054ca86284bbfabc9f39787aae88667acbcd.tar.gz |
- some doc reorg
- change engine.Connection to _connection_cls so sphinx doesn't get upset
- globally add "." to all :class:`Foo`
- start naming sections that are mostly docstrings "API Documentation - blah blah"
- move some ad-hoc docstrings into "API" sections, there is some inconsistency here
and it may be that we just have to leave it that way
- add "internals" rsts to core, orm, I'm not super thrilled how these look but they are
targeted by some of the public api docs, users typically become aware of these anyway
Diffstat (limited to 'lib/sqlalchemy/orm/descriptor_props.py')
-rw-r--r-- | lib/sqlalchemy/orm/descriptor_props.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/descriptor_props.py b/lib/sqlalchemy/orm/descriptor_props.py index 634da34f1..5ad148a7e 100644 --- a/lib/sqlalchemy/orm/descriptor_props.py +++ b/lib/sqlalchemy/orm/descriptor_props.py @@ -19,7 +19,7 @@ from sqlalchemy.sql import expression properties = util.importlater('sqlalchemy.orm', 'properties') class DescriptorProperty(MapperProperty): - """:class:`MapperProperty` which proxies access to a + """:class:`.MapperProperty` which proxies access to a user-defined descriptor.""" doc = None @@ -290,7 +290,7 @@ class CompositeProperty(DescriptorProperty): return str(self.parent.class_.__name__) + "." + self.key class ConcreteInheritedProperty(DescriptorProperty): - """A 'do nothing' :class:`MapperProperty` that disables + """A 'do nothing' :class:`.MapperProperty` that disables an attribute on a concrete subclass that is only present on the inherited mapper, not the concrete classes' mapper. |