- Patch #570572 by winston, David_Rothstein | Shai, Xano, alexanderpas, emmajane, kazar: changed label for user/1 account from 'administrator' to 'site maintenance account'.

5 files changed, 26 insertions, 26 deletions

diff --git a/INSTALL.txt b/INSTALL.txt
index 21abc3fb3..22c914500 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -119,8 +119,8 @@ INSTALLATION
    (e.g., http://www.example.com).
 
    You will be guided through several screens to set up the database,
-   create tables, add the first user account and provide basic web
-   site settings.
+   create tables, add the site maintenance account (the first user, also known
+   as user/1), and provide basic web site settings.
 
    The install script will attempt to create a files storage directory
    in the default location at sites/default/files (the location of the
@@ -152,8 +152,8 @@ INSTALLATION
 5. CONFIGURE DRUPAL
 
    When the install script succeeds, you will be directed to the "Welcome"
-   page, and you will be logged in as the administrator already. Proceed with
-   the initial configuration steps suggested on the "Welcome" page.
+   page logged in with the site maintenance account. Proceed with the initial
+   configuration steps suggested on the "Welcome" page.
 
    If the default Drupal theme is not displaying properly and links on the page
    result in "Page Not Found" errors, try manually setting the $base_url variable
diff --git a/UPGRADE.txt b/UPGRADE.txt
index baeb0b1f6..aa9409be8 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -36,10 +36,10 @@ Let's begin!
     More information on multisite configuration is located in INSTALL.txt.
 
 2.  If possible, log on as the user with user ID 1, which is the first account
-    created and the main administrator account. User ID 1 will be able to
-    automatically access update.php in step #10. There are special instructions
-    in step #10 if you are unable to log on as user ID 1. Do not close your
-    browser until the final step is complete.
+    created - also known as the site maintenance account. Only this account will
+    be able to automatically access update.php in step #10. There are special
+    instructions in step #10 if you are unable to log on as user ID 1. Do not
+    close your browser until the final step is complete.
 
 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
diff --git a/install.php b/install.php
index a52f9da1c..5322b4677 100644
--- a/install.php
+++ b/install.php
@@ -45,7 +45,7 @@ define('INSTALL_TASK_RUN_IF_REACHED', 2);
  * once and be marked complete once they are successfully finished. For
  * example, the Drupal installer uses this flag for the batch installation of
  * modules on the new site, and also for the configuration form that collects
- * basic site information and sets up the first user account.
+ * basic site information and sets up the site maintenance account.
  */
 define('INSTALL_TASK_RUN_IF_NOT_COMPLETED', 3);
 
@@ -1000,8 +1000,7 @@ function install_find_profiles() {
 }
 
 /**
- * Installation task; allow the site administrator to select which profile to
- * install.
+ * Installation task; select which profile to install.
  *
  * @param $install_state
  *   An array of information about the current installation state. The chosen
@@ -1117,8 +1116,7 @@ function install_find_locales($profilename) {
 }
 
 /**
- * Installation task; allow the site administrator to select which locale to
- * use for the current profile.
+ * Installation task; select which locale to use for the current profile.
  *
  * @param $install_state
  *   An array of information about the current installation state. The chosen
@@ -1555,7 +1553,7 @@ function _install_configure_form(&$form_state, &$install_state) {
   );
   $form['admin_account'] = array(
     '#type' => 'fieldset',
-    '#title' => st('Administrator account'),
+    '#title' => st('Site maintenance account'),
     '#collapsible' => FALSE,
   );
 
@@ -1677,8 +1675,8 @@ function install_configure_form_submit($form, &$form_state) {
   if ($form_state['values']['update_status_module'][1]) {
     drupal_install_modules(array('update'));
  
-    // Add the administrator's email address to the list of addresses to be
-    // notified when updates are available, if selected.
+    // Add the site maintenance account's email address to the list of
+    // addresses to be notified when updates are available, if selected.
     if ($form_state['values']['update_status_module'][2]) {
       variable_set('update_notify_emails', array($form_state['values']['account']['mail']));
     }
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 9434dd28a..245cfb4c8 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -156,11 +156,12 @@ $db_prefix = '';
 /**
  * Access control for update.php script
  *
- * If you are updating your Drupal installation using the update.php script
- * being not logged in as administrator, you will need to modify the access
- * check statement below. Change the FALSE to a TRUE to disable the access
- * check. After finishing the upgrade, be sure to open this file again
- * and change the TRUE back to a FALSE!
+ * If you are updating your Drupal installation using the update.php script but
+ * are not logged in using the site maintenance account (the account that was
+ * created during installation), you will need to modify the access check
+ * statement below. Change the FALSE to a TRUE to disable the access check.
+ * After finishing the upgrade, be sure to open this file again and change the
+ * TRUE back to a FALSE!
  */
 $update_free_access = FALSE;
 
diff --git a/update.php b/update.php
index 856fa5d0c..2c8fbb14b 100644
--- a/update.php
+++ b/update.php
@@ -13,9 +13,10 @@ define('DRUPAL_ROOT', getcwd());
  * Point your browser to "http://www.example.com/update.php" and follow the
  * instructions.
  *
- * If you are not logged in as administrator, you will need to modify the access
- * check statement inside your settings.php file. After finishing the upgrade,
- * be sure to open settings.php again, and change it back to its original state!
+ * If you are not logged in using the site maintenance account, you will need
+ * to modify the access check statement inside your settings.php file. After
+ * finishing the upgrade, be sure to open settings.php again, and change it back
+ * to its original state!
  */
 
 /**
@@ -201,12 +202,12 @@ function update_info_page() {
 
 function update_access_denied_page() {
   drupal_set_title('Access denied');
-  return '<p>Access denied. You are not authorized to access this page. Please log in as the admin user (the first user you created). If you cannot log in, you will have to edit <code>settings.php</code> to bypass this access check. To do this:</p>
+  return '<p>Access denied. You are not authorized to access this page. Please log in using the site maintenance account (the account you created during installation). If you cannot log in, you will have to edit <code>settings.php</code> to bypass this access check. To do this:</p>
 <ol>
  <li>With a text editor find the settings.php file on your system. From the main Drupal directory that you installed all the files into, go to <code>sites/your_site_name</code> if such directory exists, or else to <code>sites/default</code> which applies otherwise.</li>
  <li>There is a line inside your settings.php file that says <code>$update_free_access = FALSE;</code>. Change it to <code>$update_free_access = TRUE;</code>.</li>
  <li>As soon as the update.php script is done, you must change the settings.php file back to its original form with <code>$update_free_access = FALSE;</code>.</li>
- <li>To avoid having this problem in future, remember to log in to your website as the admin user (the user you first created) before you backup your database at the beginning of the update process.</li>
+ <li>To avoid having this problem in the future, remember to log in to your website using the site maintenance account (the account you created during installation) before you backup your database at the beginning of the update process.</li>
 </ol>';
 }