Permalink
Browse files

Merge branch 'master' into current_page_apphooks

  • Loading branch information...
2 parents 8bf3fdc + e3aea0b commit f5dcc090d6ea64f2e3cb927c60a4195d1b6fb7a4 @fivethreeo fivethreeo committed Jan 25, 2011
Showing with 8 additions and 2 deletions.
  1. +8 −2 docs/getting_started/configuration.rst
@@ -436,8 +436,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
================

0 comments on commit f5dcc09

Please sign in to comment.