Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:divio/django-cms

  • Loading branch information...
commit f1c243ea8553fc958f6fe7d95477c6ae128e7c94 2 parents 269d97b + d641355
@ojii ojii authored
Showing with 12 additions and 2 deletions.
  1. +12 −2 docs/getting_started/configuration.rst
View
14 docs/getting_started/configuration.rst
@@ -249,6 +249,8 @@ Enable gettext-based translation of CMS content rather than use the standard
administration interface. Requires `django-dbgettext
<http://http://bitbucket.org/drmeers/django-dbgettext>`_.
+.. warning:: This feature is deprecated and will be removed in 2.2.
+
CMS_DBGETTEXT_SLUGS
===================
@@ -260,6 +262,8 @@ stage, as resulting translations cannot be guaranteed to be unique.
For general dbgettext settings, see the `dbgettext documentation
<http://bitbucket.org/drmeers/django-dbgettext/src/tip/docs>`_.
+.. warning:: This feature is deprecated and will be removed in 2.2.
+
**************
Media Settings
@@ -436,8 +440,14 @@ CMS_CONTENT_CACHE_DURATION
Default: ``60``
-Defines how long page content should be cached, in seconds, including navigation and admin
-menu.
+Cache expiration (in seconds) for ``show_placeholder`` and ``page_url`` template tags.
+
+MENU_CACHE_DURATION
+===================
+
+Default: ``3600``
+
+Cache expiration (in seconds) for the menu tree.
CMS_CACHE_PREFIX
================
Please sign in to comment.
Something went wrong with that request. Please try again.