- Patch #277073 by threexk: improve consistency of offline vs off-line and online vs on-line.

5 files changed, 12 insertions, 12 deletions

diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 6aca6d5c0..89e515369 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -1064,7 +1064,7 @@ function _drupal_bootstrap($phase) {
  * Enables use of the theme system without requiring database access.
  *
  * Loads and initializes the theme system for site installs, updates and when
- * the site is in off-line mode. This also applies when the database fails.
+ * the site is in offline mode. This also applies when the database fails.
  *
  * @see _drupal_maintenance_theme()
  */
diff --git a/includes/common.inc b/includes/common.inc
index c9127a5bd..c1c2f6dfb 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -325,12 +325,12 @@ function drupal_goto($path = '', $query = NULL, $fragment = NULL, $http_response
 }
 
 /**
- * Generates a site off-line message.
+ * Generates a site offline message.
  */
 function drupal_site_offline() {
   drupal_maintenance_theme();
   drupal_set_header('HTTP/1.1 503 Service unavailable');
-  drupal_set_title(t('Site off-line'));
+  drupal_set_title(t('Site offline'));
   print theme('maintenance_page', filter_xss_admin(variable_get('site_offline_message',
     t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal'))))));
 }
diff --git a/includes/database.inc b/includes/database.inc
index 41116091b..f662fc3d1 100644
--- a/includes/database.inc
+++ b/includes/database.inc
@@ -169,7 +169,7 @@ function db_set_active($name = 'default') {
 /**
  * Helper function to show fatal database errors.
  *
- * Prints a themed maintenance page with the 'Site off-line' text,
+ * Prints a themed maintenance page with the 'Site offline' text,
  * adding the provided error message in the case of 'display_errors'
  * set to on. Ends the page request; no return.
  *
@@ -180,7 +180,7 @@ function _db_error_page($error = '') {
   global $db_type;
   drupal_maintenance_theme();
   drupal_set_header('HTTP/1.1 503 Service Unavailable');
-  drupal_set_title('Site off-line');
+  drupal_set_title('Site offline');
 
   $message = '<p>The site is currently not available due to technical problems. Please try again later. Thank you for your understanding.</p>';
   $message .= '<hr /><p><small>If you are the maintainer of this site, please check your database settings in the <code>settings.php</code> file and ensure that your hosting provider\'s database server is running. For more help, see the <a href="http://drupal.org/node/258">handbook</a>, or contact your hosting provider.</small></p>';
diff --git a/includes/menu.inc b/includes/menu.inc
index eaad81aa3..12cf90d51 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -2413,26 +2413,26 @@ function menu_path_is_external($path) {
 }
 
 /**
- * Checks whether the site is off-line for maintenance.
+ * Checks whether the site is offline for maintenance.
  *
  * This function will log the current user out and redirect to front page
  * if the current user has no 'administer site configuration' permission.
  *
  * @return
- *   FALSE if the site is not off-line or its the login page or the user has
+ *   FALSE if the site is not offline or its the login page or the user has
  *     'administer site configuration' permission.
- *   TRUE for anonymous users not on the login page if the site is off-line.
+ *   TRUE for anonymous users not on the login page if the site is offline.
  */
 function _menu_site_is_offline() {
-  // Check if site is set to off-line mode.
+  // Check if site is set to offline mode.
   if (variable_get('site_offline', 0)) {
     // Check if the user has administration privileges.
     if (user_access('administer site configuration')) {
-      // Ensure that the off-line message is displayed only once [allowing for
+      // 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/site-maintenance') {
-        drupal_set_message(t('Operating in off-line mode.'), 'status', FALSE);
+        drupal_set_message(t('Operating in offline mode.'), 'status', FALSE);
       }
     }
     else {
diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc
index 4f0a50ac5..574f1a791 100644
--- a/includes/theme.maintenance.inc
+++ b/includes/theme.maintenance.inc
@@ -8,7 +8,7 @@
 
 /**
  * Sets up the theming system for site installs, updates and when the site is
- * in off-line mode. It also applies when the database is unavailable.
+ * in offline mode. It also applies when the database is unavailable.
  *
  * Minnelli is always used for the initial install and update operations. In
  * other cases, "settings.php" must have a "maintenance_theme" key set for the