Commit faabf361 authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

Merge branch 'deprecate-comments'

parents f2f98abb d0561242

django/contrib/comments/__init__.py

+3 −0
Original line number Diff line number Diff line 
import warnings

from django.conf import settings

from django.core import urlresolvers

from django.core.exceptions import ImproperlyConfigured
@@ -5,6 +6,8 @@ from django.contrib.comments.models import Comment 
from django.contrib.comments.forms import CommentForm

from django.utils.importlib import import_module



warnings.warn("django.contrib.comments is deprecated and will be removed before Django 1.8.", PendingDeprecationWarning)



DEFAULT_COMMENTS_APP = 'django.contrib.comments'



def get_comment_app():

docs/index.txt

+0 −1
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ applications: 
* :doc:`Logging <topics/logging>`

* :doc:`Sending emails <topics/email>`

* :doc:`Syndication feeds (RSS/Atom) <ref/contrib/syndication>`

* :doc:`Comments <ref/contrib/comments/index>`, :doc:`comment moderation <ref/contrib/comments/moderation>` and :doc:`custom comments <ref/contrib/comments/custom>`

* :doc:`Pagination <topics/pagination>`

* :doc:`Messages framework <ref/contrib/messages>`

* :doc:`Serialization <topics/serialization>`

docs/internals/deprecation.txt

+2 −0
Original line number Diff line number Diff line
@@ -365,6 +365,8 @@ these changes. 
  - ``django.db.transaction.commit_unless_managed()``

  - ``django.db.transaction.rollback_unless_managed()``



* ``django.contrib.comments`` will be removed.



2.0

---

docs/ref/contrib/comments/custom.txt

+12 −0
Original line number Diff line number Diff line
@@ -4,6 +4,18 @@ Customizing the comments framework 


.. currentmodule:: django.contrib.comments



.. warning::



    Django's comment framework has been deprecated and is no longer supported.

    Most users will be better served with a custom solution, or a hosted

    product like Disqus__.



    The code formerly known as ``django.contrib.comments`` is `still available

    in an external repository`__.



    __ https://disqus.com/

    __ https://github.com/django/django-contrib-comments



If the built-in comment framework doesn't quite fit your needs, you can extend

the comment app's behavior to add custom data and logic. The comments framework

lets you extend the built-in comment model, the built-in comment form, and the

docs/ref/contrib/comments/example.txt

+12 −0
Original line number Diff line number Diff line
@@ -4,6 +4,18 @@ 
Example of using the built-in comments app

===========================================



.. warning::



    Django's comment framework has been deprecated and is no longer supported.

    Most users will be better served with a custom solution, or a hosted

    product like Disqus__.



    The code formerly known as ``django.contrib.comments`` is `still available

    in an external repository`__.



    __ https://disqus.com/

    __ https://github.com/django/django-contrib-comments



Follow the first three steps of the quick start guide in the

:doc:`documentation </ref/contrib/comments/index>`.