Index: UPGRADE.txt =================================================================== RCS file: /cvs/drupal/drupal/UPGRADE.txt,v retrieving revision 1.14 diff -u -p -r1.14 UPGRADE.txt --- UPGRADE.txt 19 Apr 2009 19:10:07 -0000 1.14 +++ UPGRADE.txt 11 Aug 2009 14:19:02 -0000 @@ -43,7 +43,7 @@ Let's begin! 3. Place the site in "Offline" mode, to let the database updates run without interruption and avoid displaying errors to end users of the site. This - option is at http://www.example.com/?q=admin/settings/maintenance-mode + option is at http://www.example.com/?q=admin/config/development/maintenance (replace www.example.com with your installation's domain name and path). 4. If using a custom or contributed theme, switch @@ -103,7 +103,7 @@ Let's begin! 14. Finally, return your site to "Online" mode so your visitors may resume browsing. As in step #3, this option is available in your administration - screens at http://www.example.com/?q=admin/settings/maintenance-mode + screens at http://www.example.com/?q=admin/config/development/maintenance (replace www.example.com with your installation's domain name and path). For more information on upgrading visit Index: update.php =================================================================== RCS file: /cvs/drupal/drupal/update.php,v retrieving revision 1.295 diff -u -p -r1.295 update.php --- update.php 11 Aug 2009 12:20:25 -0000 1.295 +++ update.php 11 Aug 2009 14:19:03 -0000 @@ -207,7 +207,7 @@ function update_info_page() { $output .= "
    \n"; $output .= "
  1. Back up your database. This process will change your database values and in case of emergency you may need to revert to a backup.
    2. \n"; $output .= "
  2. Back up your code. Hint: when backing up module code, do not leave that backup in the 'modules' or 'sites/*/modules' directories as this may confuse Drupal's auto-discovery mechanism.
    3. \n"; - $output .= '
  3. Put your site into maintenance mode.
    4. ' . "\n"; + $output .= '
  4. Put your site into maintenance mode.
    5. ' . "\n"; $output .= "
  5. Install your new files in the appropriate location, as described in the handbook.
    6. \n"; $output .= "
\n"; $output .= "

When you have performed the steps above, you may proceed.

\n"; Index: includes/menu.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/menu.inc,v retrieving revision 1.332 diff -u -p -r1.332 menu.inc --- includes/menu.inc 11 Aug 2009 07:45:45 -0000 1.332 +++ includes/menu.inc 11 Aug 2009 14:19:03 -0000 @@ -2745,8 +2745,8 @@ function _menu_site_is_offline() { // Ensure that the offline message is displayed only once [allowing for // page redirects], and specifically suppress its display on the site // maintenance page. - if (drupal_get_normal_path($_GET['q']) != 'admin/settings/maintenance-mode') { - drupal_set_message(t('Operating in maintenance mode. Go online.', array('@url' => url('admin/settings/maintenance-mode'))), 'status', FALSE); + if (drupal_get_normal_path($_GET['q']) != 'admin/config/development/maintenance') { + drupal_set_message(t('Operating in maintenance mode. Go online.', array('@url' => url('admin/config/development/maintenance'))), 'status', FALSE); } } else { Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.738 diff -u -p -r1.738 system.module --- modules/system/system.module 11 Aug 2009 11:52:46 -0000 1.738 +++ modules/system/system.module 11 Aug 2009 14:19:04 -0000 @@ -96,7 +96,7 @@ function system_help($path, $arg) { $output .= '
  • ' . t('support for enabling and disabling themes, which determine the design and presentation of your site. Drupal comes packaged with several core themes and additional contributed themes are available at the Drupal.org theme page.', array('@themes' => url('admin/appearance'), '@drupal-themes' => 'http://drupal.org/project/themes')) . '
    • '; $output .= '
  • ' . t('a robust caching system that allows the efficient re-use of previously-constructed web pages and web page components. Drupal stores the pages requested by anonymous users in a compressed format; depending on your site configuration and the amount of your web traffic tied to anonymous visitors, Drupal\'s caching system may significantly increase the speed of your site.', array('@cache-settings' => url('admin/settings/performance'))) . '
    • '; $output .= '
  • ' . t('a set of routine administrative operations that rely on a correctly-configured cron maintenance task to run automatically. A number of other modules, including the feed aggregator, and search also rely on cron maintenance tasks. For more information, see the online handbook entry for configuring cron jobs.', array('@cron' => url('admin/reports/status'), '@handbook' => 'http://drupal.org/cron')) . '
    • '; - $output .= '
  • ' . t('basic configuration options for your site, including date and time settings, file system settings, clean URL support, site name and other information, and a maintenance mode for taking your site temporarily offline.', array('@regional-settings' => url('admin/settings/regional-settings'), '@file-system' => url('admin/settings/file-system'), '@clean-url' => url('admin/settings/clean-urls'), '@site-info' => url('admin/settings/site-information'), '@maintenance-mode' => url('admin/settings/maintenance-mode'))) . '
    • '; + $output .= '
  • ' . t('basic configuration options for your site, including date and time settings, file system settings, clean URL support, site name and other information, and a maintenance mode for taking your site temporarily offline.', array('@regional-settings' => url('admin/settings/regional-settings'), '@file-system' => url('admin/settings/file-system'), '@clean-url' => url('admin/settings/clean-urls'), '@site-info' => url('admin/settings/site-information'), '@maintenance-mode' => url('admin/config/development/maintenance'))) . '
    • '; $output .= '

    ' . t('For more information, see the online handbook entry for System module.', array('@system' => 'http://drupal.org/handbook/modules/system/')) . '

    '; return $output; case 'admin/by-module': @@ -123,7 +123,7 @@ function system_help($path, $arg) { return '

    ' . t('The Powered by Drupal block is an optional link to the home page of the Drupal project. While there is absolutely no requirement that sites feature this link, it may be used to show support for Drupal.') . '

    '; } break; - case 'admin/settings/maintenance-mode': + case 'admin/config/development/maintenance': global $user; if ($user->uid == 1) { return '

    ' . t('If you are upgrading to a newer version of Drupal or upgrading contributed modules or themes you may need to run !update-php.', array('!update-php' => l('update.php', 'update.php'))) . '

    '; @@ -676,6 +676,24 @@ function system_menu() { 'type' => MENU_CALLBACK, ); + // Configuration. + $items['admin/config/development'] = array( + 'title' => 'Development', + 'description' => 'Development tools.', + 'position' => 'left', + 'weight' => 10, + 'page callback' => 'system_admin_menu_block_page', + 'access callback' => 'system_admin_menu_block_access', + 'access arguments' => array('admin/config/development', 'access administration pages'), + ); + $items['admin/config/development/maintenance'] = array( + 'title' => 'Maintenance mode', + 'description' => 'Take the site offline for maintenance or bring it back online.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('system_site_maintenance_mode'), + 'access arguments' => array('administer site configuration'), + ); + // Settings. $items['admin/settings/site-information'] = array( 'title' => 'Site information', @@ -738,13 +756,6 @@ function system_menu() { 'page callback' => 'system_date_time_lookup', 'access arguments' => array('administer site configuration'), ); - $items['admin/settings/maintenance-mode'] = array( - 'title' => 'Maintenance mode', - 'description' => 'Take the site offline for maintenance or bring it back online.', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('system_site_maintenance_mode'), - 'access arguments' => array('administer site configuration'), - ); $items['admin/settings/clean-urls'] = array( 'title' => 'Clean URLs', 'description' => 'Enable or disable clean URLs for your site.',