Merge branch 'master' into develop

[philo.git] / docs / models / entities.rst

diff --git a/docs/models/entities.rst b/docs/models/entities.rst
index 4127f56..b39a253 100644 (file)
--- a/docs/models/entities.rst
+++ b/docs/models/entities.rst
@@ -1,7 +1,7 @@
 Entities and Attributes
 =======================
 
 Entities and Attributes
 =======================
 

-.. automodule:: philo.models.base
+.. module:: philo.models.base

 
 One of the core concepts in Philo is the relationship between the :class:`Entity` and :class:`Attribute` classes. :class:`Attribute`\ s represent an arbitrary key/value pair by having one :class:`GenericForeignKey` to an :class:`Entity` and another to an :class:`AttributeValue`.
 
 
 One of the core concepts in Philo is the relationship between the :class:`Entity` and :class:`Attribute` classes. :class:`Attribute`\ s represent an arbitrary key/value pair by having one :class:`GenericForeignKey` to an :class:`Entity` and another to an :class:`AttributeValue`.
 


@@ -16,6 +16,7 @@ Attributes
        :members:
 
 .. automodule:: philo.models.base
        :members:
 
 .. automodule:: philo.models.base

+       :noindex:

        :members: attribute_value_limiter
 
 .. autoclass:: JSONValue
        :members: attribute_value_limiter
 
 .. autoclass:: JSONValue


@@ -39,18 +40,16 @@ Entities
 
 .. autoclass:: Entity
        :members:
 
 .. autoclass:: Entity
        :members:

-       :exclude-members: attribute_set

 
 

-.. autoclass:: TreeManager
+.. autoclass:: TreeEntityManager

        :members:
 
 .. autoclass:: TreeEntity
        :show-inheritance:
        :members:
        :members:
 
 .. autoclass:: TreeEntity
        :show-inheritance:
        :members:

-       :exclude-members: attribute_set

 
        .. attribute:: objects
 
 
        .. attribute:: objects
 

-               An instance of :class:`TreeManager`.
+               An instance of :class:`TreeEntityManager`.

        
        .. automethod:: get_path
\ No newline at end of file
        
        .. automethod:: get_path
\ No newline at end of file