Merge branch 'release' of git://github.com/melinath/philo into release/0.9.1

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

diff --git a/docs/models/fields.rst b/docs/models/fields.rst
index 91164a3..3092fa4 100644 (file)
--- a/docs/models/fields.rst
+++ b/docs/models/fields.rst
@@ -3,9 +3,19 @@ Custom Fields
 
 .. automodule:: philo.models.fields
        :members:
 
 .. automodule:: philo.models.fields
        :members:

+       :exclude-members: JSONField, SlugMultipleChoiceField
+       
+       .. autoclass:: JSONField()
+               :members:
+       
+       .. autoclass:: SlugMultipleChoiceField()
+               :members:

 
 

-EntityProxyFields
-=================
+AttributeProxyFields
+--------------------

 
 .. automodule:: philo.models.fields.entities
 
 .. automodule:: philo.models.fields.entities

-       :members:
\ No newline at end of file
+       :members:
+       
+       .. autoclass:: AttributeProxyField(attribute_key=None, verbose_name=None, help_text=None, default=NOT_PROVIDED, editable=True, choices=None, *args, **kwargs)
+               :members:
\ No newline at end of file