- Patch #430342 by kkaefer et al: usability improvement: changed 'site maintenance' to 'maintenance mode'.

3 files changed, 7 insertions, 7 deletions

diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index a53ece88d..eb15ce009 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1724,7 +1724,7 @@ function system_date_time_lookup() {
  * @ingroup forms
  * @see system_settings_form()
  */
-function system_site_maintenance_settings() {
+function system_site_maintenance_mode() {
 
   $form['site_offline'] = array(
     '#type' => 'radios',
@@ -1738,7 +1738,7 @@ function system_site_maintenance_settings() {
     '#type' => 'textarea',
     '#title' => t('Site offline message'),
     '#default_value' => t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal'))),
-    '#description' => t('Message to show visitors when the site is in offline mode.')
+    '#description' => t('Message to show visitors when the site is in maintenance mode.')
   );
 
   return system_settings_form($form, TRUE);
diff --git a/modules/system/system.install b/modules/system/system.install
index 1acbe72a4..3981cfdda 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -2812,7 +2812,7 @@ function system_update_7003() {
     }
   }
   if (isset($invalid_host)) {
-    drupal_set_message('Drupal no longer supports wildcard IP address blocking. Visitors whose IP addresses match ranges you have previously set using <em>access rules</em> will no longer be blocked from your site when you take it out of maintenance mode. See the <a href="http://drupal.org/node/24302">IP address and referrer blocking Handbook page</a> for alternative methods.', 'warning');
+    drupal_set_message('Drupal no longer supports wildcard IP address blocking. Visitors whose IP addresses match ranges you have previously set using <em>access rules</em> will no longer be blocked from your site when you put the site online. See the <a href="http://drupal.org/node/24302">IP address and referrer blocking Handbook page</a> for alternative methods.', 'warning');
     $ret[] = array('success' => TRUE, 'query' => '');
   }
   // Make sure not to block any IP addresses that were specifically allowed by access rules.
diff --git a/modules/system/system.module b/modules/system/system.module
index 7783c240a..d40d4934c 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -70,7 +70,7 @@ function system_help($path, $arg) {
       $output .= '<li>' . t('support for enabling and disabling <a href="@themes">themes</a>, which determine the design and presentation of your site. Drupal comes packaged with several core themes and additional contributed themes are available at the <a href="@drupal-themes">Drupal.org theme page</a>.', array('@themes' => url('admin/build/themes'), '@drupal-themes' => 'http://drupal.org/project/themes')) . '</li>';
       $output .= '<li>' . t('a robust <a href="@cache-settings">caching system</a> 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'))) . '</li>';
       $output .= '<li>' . t('a set of routine administrative operations that rely on a correctly-configured <a href="@cron">cron maintenance task</a> to run automatically. A number of other modules, including the feed aggregator, and search also rely on <a href="@cron">cron maintenance tasks</a>. For more information, see the online handbook entry for <a href="@handbook">configuring cron jobs</a>.', array('@cron' => url('admin/reports/status'), '@handbook' => 'http://drupal.org/cron')) . '</li>';
-      $output .= '<li>' . t('basic configuration options for your site, including <a href="@regional-settings">date and time settings</a>, <a href="@file-system">file system settings</a>, <a href="@clean-url">clean URL support</a>, <a href="@site-info">site name and other information</a>, and a <a href="@site-maintenance">site maintenance</a> function 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'), '@site-maintenance' => url('admin/settings/site-maintenance'))) . '</li></ul>';
+      $output .= '<li>' . t('basic configuration options for your site, including <a href="@regional-settings">date and time settings</a>, <a href="@file-system">file system settings</a>, <a href="@clean-url">clean URL support</a>, <a href="@site-info">site name and other information</a>, and a <a href="@maintenance-mode">maintenance mode</a> 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'))) . '</li></ul>';
       $output .= '<p>' . t('For more information, see the online handbook entry for <a href="@system">System module</a>.', array('@system' => 'http://drupal.org/handbook/modules/system/')) . '</p>';
       return $output;
     case 'admin/by-module':
@@ -699,11 +699,11 @@ function system_menu() {
     'page callback' => 'system_date_time_lookup',
     'access arguments' => array('administer site configuration'),
   );
-  $items['admin/settings/site-maintenance'] = array(
-    'title' => 'Site maintenance',
+  $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_settings'),
+    'page arguments' => array('system_site_maintenance_mode'),
     'access arguments' => array('administer site configuration'),
   );
   $items['admin/settings/clean-urls'] = array(