diff options
Diffstat (limited to 'docs/ref/contrib')
| -rw-r--r-- | docs/ref/contrib/comments/models.txt | 5 | ||||
| -rw-r--r-- | docs/ref/contrib/comments/moderation.txt | 6 | ||||
| -rw-r--r-- | docs/ref/contrib/contenttypes.txt | 14 |
3 files changed, 13 insertions, 12 deletions
diff --git a/docs/ref/contrib/comments/models.txt b/docs/ref/contrib/comments/models.txt index e773790d65..78e7b92145 100644 --- a/docs/ref/contrib/comments/models.txt +++ b/docs/ref/contrib/comments/models.txt @@ -11,12 +11,12 @@ The built-in comment models .. attribute:: content_object - A :class:`~django.contrib.contettypes.generic.GenericForeignKey` + A :class:`~django.contrib.contenttypes.generic.GenericForeignKey` attribute pointing to the object the comment is attached to. You can use this to get at the related object (i.e. ``my_comment.content_object``). Since this field is a - :class:`~django.contrib.contettypes.generic.GenericForeignKey`, it's + :class:`~django.contrib.contenttypes.generic.GenericForeignKey`, it's actually syntactic sugar on top of two underlying attributes, described below. @@ -77,4 +77,3 @@ The built-in comment models ``True`` if the comment was removed. Used to keep track of removed comments instead of just deleting them. - diff --git a/docs/ref/contrib/comments/moderation.txt b/docs/ref/contrib/comments/moderation.txt index 39b3ea7913..c042971d39 100644 --- a/docs/ref/contrib/comments/moderation.txt +++ b/docs/ref/contrib/comments/moderation.txt @@ -81,8 +81,8 @@ Built-in moderation options .. attribute:: auto_close_field If this is set to the name of a - :class:`~django.db.models.fields.DateField` or - :class:`~django.db.models.fields.DateTimeField` on the model for which + :class:`~django.db.models.DateField` or + :class:`~django.db.models.DateTimeField` on the model for which comments are being moderated, new comments for objects of that model will be disallowed (immediately deleted) when a certain number of days have passed after the date specified in that field. Must be @@ -117,7 +117,7 @@ Built-in moderation options .. attribute:: enable_field If this is set to the name of a - :class:`~django.db.models.fields.BooleanField` on the model + :class:`~django.db.models.BooleanField` on the model for which comments are being moderated, new comments on objects of that model will be disallowed (immediately deleted) whenever the value of that field is ``False`` on the object diff --git a/docs/ref/contrib/contenttypes.txt b/docs/ref/contrib/contenttypes.txt index dfbeabc302..8f329aa388 100644 --- a/docs/ref/contrib/contenttypes.txt +++ b/docs/ref/contrib/contenttypes.txt @@ -234,13 +234,15 @@ lookup:: .. versionadded:: 1.5 -Prior to Django 1.5 :meth:`~ContentTypeManager.get_for_model()` and -:meth:`~ContentTypeManager.get_for_models()` always returned the -:class:`~django.contrib.contenttypes.models.ContentType` associated with the -concrete model of the specified one(s). That means there was no way to retreive -the :class:`~django.contrib.contenttypes.models.ContentType` of a proxy model +Prior to Django 1.5, +:meth:`~django.contrib.contenttypes.models.ContentTypeManager.get_for_model` and +:meth:`~django.contrib.contenttypes.models.ContentTypeManager.get_for_models` +always returned the :class:`~django.contrib.contenttypes.models.ContentType` +associated with the concrete model of the specified one(s). That means there +was no way to retreive the +:class:`~django.contrib.contenttypes.models.ContentType` of a proxy model using those methods. As of Django 1.5 you can now pass a boolean flag – -respectively ``for_concrete_model`` and ``for_concrete_models`` – to specify +``for_concrete_model`` and ``for_concrete_models`` respectively – to specify wether or not you want to retreive the :class:`~django.contrib.contenttypes.models.ContentType` for the concrete or direct model. |