? boost-613806.patch Index: README.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/boost/README.txt,v retrieving revision 1.2.2.1.2.5.2.10 diff -u -p -r1.2.2.1.2.5.2.10 README.txt --- README.txt 21 Oct 2009 23:52:57 -0000 1.2.2.1.2.5.2.10 +++ README.txt 30 Oct 2009 08:10:49 -0000 @@ -110,9 +110,9 @@ directory, and set the permissions so it is writeable. On the [Administer > Site configuration > Performance > Boost settings] - page is the Default minimum cache lifetime setting. As cached pages are + page is the Default maximum cache lifetime setting. As cached pages are created, they are given an expire by date and time, which is the current - date and time plus the minimum cache lifetime. These dates and times are + date and time plus the maximum cache lifetime. These dates and times are checked on each cron run; and if a page is expired, the cache is cleared, and a new cached version will be created the next time the page is called upon by an anonymous user (including bots). The page will be @@ -182,7 +182,7 @@ * Page configuration Block This block allows the administrator to set pages individually. - Including setting for minimum cache lifetime(select box), preemptive + Including setting for maximum cache lifetime(select box), preemptive cache(on or off), scope(page ID, content type or content container). * Stats Block Index: boost.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/boost/boost.admin.inc,v retrieving revision 1.1.2.1.2.3.2.96 diff -u -p -r1.1.2.1.2.3.2.96 boost.admin.inc --- boost.admin.inc 28 Oct 2009 04:25:04 -0000 1.1.2.1.2.3.2.96 +++ boost.admin.inc 30 Oct 2009 08:10:50 -0000 @@ -74,7 +74,7 @@ function boost_admin_boost_performance_p Global $base_path; $period = drupal_map_assoc(array(0, 60, 180, 300, 600, 900, 1800, 2700, 3600, 10800, 21600, 32400, 43200, 64800, 86400, 2*86400, 3*86400, 4*86400, 5*86400, 6*86400, 604800, 2*604800, 3*604800, 4*604800, 8*604800, 16*604800, 52*604800), 'format_interval'); - $period[0] = '<' . t('none') . '>'; + //$period[0] = '<' . t('none') . '>'; $form['boost'] = array( '#type' => 'fieldset', @@ -100,26 +100,26 @@ function boost_admin_boost_performance_p ); $form['boost']['boost_cache_lifetime'] = array( '#type' => 'select', - '#title' => t('Boost - HTML - Default minimum cache lifetime'), + '#title' => t('Boost - HTML - Default maximum cache lifetime'), '#default_value' => BOOST_CACHE_LIFETIME, '#options' => $period, - '#description' => !BOOST_CACHE_HTML ? t('Enable the caching of this content type to enable this selection box.') : t('The minimum cache lifetime is the minimum amount of time that will elapse before the cache is emptied. Cache lifetime gets checked on cron runs.'), + '#description' => !BOOST_CACHE_HTML ? t('Enable the caching of this content type to enable this selection box.') : t('The maximum cache lifetime is the maximum amount of time that will elapse before the cache is emptied. Cache lifetime gets checked on cron runs. Flushing the content before it is expired can happen like for example when a node is edited.'), '#disabled' => !BOOST_CACHE_HTML, ); $form['boost']['boost_cache_xml_lifetime'] = array( '#type' => 'select', - '#title' => t('Boost - XML - Default minimum cache lifetime'), + '#title' => t('Boost - XML - Default maximum cache lifetime'), '#default_value' => BOOST_CACHE_XML_LIFETIME, '#options' => $period, - '#description' => !BOOST_CACHE_XML ? t('Enable the caching of this content type to enable this selection box.') : t('The minimum cache lifetime is the minimum amount of time that will elapse before the cache is emptied. Cache lifetime gets checked on cron runs.'), + '#description' => !BOOST_CACHE_XML ? t('Enable the caching of this content type to enable this selection box.') : t('The maximum cache lifetime is the maximum amount of time that will elapse before the cache is emptied. Cache lifetime gets checked on cron runs. Flushing the content before it is expired can happen like for example when a node is edited.'), '#disabled' => !BOOST_CACHE_XML, ); $form['boost']['boost_cache_json_lifetime'] = array( '#type' => 'select', - '#title' => t('Boost - JSON - Default minimum cache lifetime'), + '#title' => t('Boost - JSON - Default maximum cache lifetime'), '#default_value' => BOOST_CACHE_JSON_LIFETIME, '#options' => $period, - '#description' => !BOOST_CACHE_JSON ? t('Enable the caching of this content type to enable this selection box.') : t('The minimum cache lifetime is the minimum amount of time that will elapse before the cache is emptied. Cache lifetime gets checked on cron runs.'), + '#description' => !BOOST_CACHE_JSON ? t('Enable the caching of this content type to enable this selection box.') : t('The maximum cache lifetime is the maximum amount of time that will elapse before the cache is emptied. Cache lifetime gets checked on cron runs. Flushing the content before it is expired can happen like for example when a node is edited.'), '#disabled' => !BOOST_CACHE_JSON, ); $form['boost']['boost_clear'] = array( Index: boost.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/boost/boost.module,v retrieving revision 1.3.2.2.2.5.2.210 diff -u -p -r1.3.2.2.2.5.2.210 boost.module --- boost.module 29 Oct 2009 10:38:26 -0000 1.3.2.2.2.5.2.210 +++ boost.module 30 Oct 2009 08:10:51 -0000 @@ -860,7 +860,7 @@ function boost_block_db_settings_form() // create form $form['boost_db_settings']['lifetime'] = array( '#type' => 'select', - '#title' => t('Minimum cache lifetime'), + '#title' => t('Maximum cache lifetime'), '#default_value' => $info['lifetime'], '#options' => $period, '#description' => t('Default: %default', array('%default' => format_interval(BOOST_CACHE_LIFETIME))), Index: help/install.html =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/boost/help/Attic/install.html,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 install.html --- help/install.html 27 Oct 2009 05:40:26 -0000 1.1.2.1 +++ help/install.html 30 Oct 2009 08:10:51 -0000 @@ -15,27 +15,27 @@ and must be writeable by the web server: directory, and set the permissions so it is writeable.

5. On the [Administer > Site configuration > Performance > Boost settings]
-page is the Default minimum cache lifetime setting. As cached pages are
+page is the Default maximum cache lifetime setting. As cached pages are
created, they are given an expire by date and time, which is the current
-date and time plus the minimum cache lifetime. These dates and times are
+date and time plus the maximum cache lifetime. These dates and times are
checked on each cron run; and if a page is expired, the cache is cleared,
-and a new cached version will be created the next time the page is
-called upon by an anonymous user (including bots). The page will be
+and a new cached version will be created the next time the page is
+called upon by an anonymous user (including bots). The page will be
regenerated by the Boost crawler if enabled on the Boost settings page.

6. IMPORTANT:
--- This step is easy and required for Boost to work! ---
Back up the original .htaccess file from your Drupal installation directory
for safe keeping. Copy the custom generated htaccess rule from
-[Administer > Site configuration > Performance > htaccess rules generation]
+[Administer > Site configuration > Performance > htaccess rules generation]
page and paste the rules into the Drupal htaccess file as shown below.

-