diff --git a/core/modules/system/system.module b/core/modules/system/system.module index d4e4e8c..f0e7fe6 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -1718,7 +1718,7 @@ function _system_themes_access($theme) { * @{ * Functions to run operations with elevated privileges via authorize.php. * - * Because of the Update Manager functionality included in Drupal core, there + * Because of the Update manager functionality included in Drupal core, there * is a mechanism for running operations with elevated file system privileges, * the top-level authorize.php script. This script runs at a reduced Drupal * bootstrap level so that it is not reliant on the entire site being diff --git a/core/modules/system/system.updater.inc b/core/modules/system/system.updater.inc index 7db3bad..84c1752 100644 --- a/core/modules/system/system.updater.inc +++ b/core/modules/system/system.updater.inc @@ -20,7 +20,7 @@ class ModuleUpdater extends Updater implements DrupalUpdaterInterface { * module, we always want it to go into sites/all/modules, since that's * where all the documentation recommends users install their modules, and * there's no way that can conflict on a multi-site installation, since - * the Update Manager won't let you install a new module if it's already + * the Update manager won't let you install a new module if it's already * found on your system, and if there was a copy in sites/all, we'd see it. */ public function getInstallDirectory() { @@ -101,7 +101,7 @@ class ThemeUpdater extends Updater implements DrupalUpdaterInterface { * theme, we always want it to go into sites/all/themes, since that's * where all the documentation recommends users install their themes, and * there's no way that can conflict on a multi-site installation, since - * the Update Manager won't let you install a new theme if it's already + * the Update manager won't let you install a new theme if it's already * found on your system, and if there was a copy in sites/all, we'd see it. */ public function getInstallDirectory() { diff --git a/core/modules/update/tests/update_test.module b/core/modules/update/tests/update_test.module index d5960cc..e7ee43e 100644 --- a/core/modules/update/tests/update_test.module +++ b/core/modules/update/tests/update_test.module @@ -133,7 +133,7 @@ function update_test_archiver_info() { function update_test_filetransfer_info() { // Define a mock file transfer method, to ensure that there will always be // at least one method available in the user interface (regardless of the - // environment in which the Update Manager tests are run). + // environment in which the update manager tests are run). return array( 'system_test' => array( 'title' => t('Update Test FileTransfer'), diff --git a/core/modules/update/update.authorize.inc b/core/modules/update/update.authorize.inc index dd8093e..35dde0e 100644 --- a/core/modules/update/update.authorize.inc +++ b/core/modules/update/update.authorize.inc @@ -221,7 +221,7 @@ function update_authorize_update_batch_finished($success, $results) { $_SESSION['authorize_results']['page_message'] = $page_message; $_SESSION['authorize_results']['messages'] = $results['log']; $_SESSION['authorize_results']['tasks'] = $results['tasks']; - $_SESSION['authorize_operation']['page_title'] = t('Update Manager'); + $_SESSION['authorize_operation']['page_title'] = t('Update manager'); } /** @@ -275,7 +275,7 @@ function update_authorize_install_batch_finished($success, $results) { $_SESSION['authorize_results']['page_message'] = $page_message; $_SESSION['authorize_results']['messages'] = $results['log']; $_SESSION['authorize_results']['tasks'] = $results['tasks']; - $_SESSION['authorize_operation']['page_title'] = t('Update Manager'); + $_SESSION['authorize_operation']['page_title'] = t('Update manager'); } /** diff --git a/core/modules/update/update.compare.inc b/core/modules/update/update.compare.inc index 672253d..2ccd97c 100644 --- a/core/modules/update/update.compare.inc +++ b/core/modules/update/update.compare.inc @@ -770,7 +770,7 @@ function update_project_cache($cid) { * Array of .info file data as returned by drupal_parse_info_file(). * * @return - * Array of .info file data we need for the Update Manager. + * Array of .info file data we need for the Update manager. * * @see _update_process_info_list() */ diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc index aa1bc1b..d9fd86f 100644 --- a/core/modules/update/update.manager.inc +++ b/core/modules/update/update.manager.inc @@ -2,7 +2,7 @@ /** * @file - * Administrative screens and processing functions for the Update Manager. + * Administrative screens and processing functions for the update manager. * This allows site administrators with the 'administer software updates' * permission to either upgrade existing projects, or download and install new * ones, so long as the killswitch setting ('allow_authorize_operations') is @@ -36,7 +36,7 @@ */ /** - * @defgroup update_manager_update Update Manager: update + * @defgroup update_manager_update Update manager: update * @{ * Update manager for updating existing code. * @@ -44,7 +44,7 @@ */ /** - * Build the form for the Update Manager page to update existing projects. + * Build the form for the update manager page to update existing projects. * * This presents a table with all projects that have available updates with * checkboxes to select which ones to upgrade. @@ -263,7 +263,7 @@ function update_manager_update_form($form, $form_state = array(), $context) { } /** - * Returns HTML for the first page in the Update Manager wizard to select projects. + * Returns HTML for the first page in the update manager wizard to select projects. * * @param $variables * An associative array containing: @@ -443,7 +443,7 @@ function update_manager_update_ready_form_submit($form, &$form_state) { // credentials and invoke update_authorize_run_update() indirectly with // whatever FileTransfer object authorize.php creates for us. else { - system_authorized_init('update_authorize_run_update', drupal_get_path('module', 'update') . '/update.authorize.inc', array($updates), t('Update Manager')); + system_authorized_init('update_authorize_run_update', drupal_get_path('module', 'update') . '/update.authorize.inc', array($updates), t('Update manager')); $form_state['redirect'] = system_authorized_get_url(); } } @@ -454,7 +454,7 @@ function update_manager_update_ready_form_submit($form, &$form_state) { */ /** - * @defgroup update_manager_install Update Manager: install + * @defgroup update_manager_install Update manager: install * @{ * Update manager for installing new code. * @@ -462,7 +462,7 @@ function update_manager_update_ready_form_submit($form, &$form_state) { */ /** - * Build the form for the Update Manager page to install new projects. + * Build the form for the update manager page to install new projects. * * This presents a place to enter a URL or upload an archive file to use to * install a new module or theme. @@ -524,11 +524,11 @@ function update_manager_install_form($form, &$form_state, $context) { * @param array $form * Reference to the form array we're building. * @param string $operation - * The Update Manager operation we're in the middle of. Can be either + * The Update manager operation we're in the middle of. Can be either * 'update' or 'install'. Use to provide operation-specific interface text. * * @return - * TRUE if the Update Manager should continue to the next step in the + * TRUE if the Update manager should continue to the next step in the * workflow, or FALSE if we've hit a fatal configuration and must halt the * workflow. */ @@ -586,7 +586,7 @@ function _update_manager_check_backends(&$form, $operation) { } /** - * Validate the form for installing a new project via the Update Manager. + * Validate the form for installing a new project via the update manager. */ function update_manager_install_form_validate($form, &$form_state) { if (!($form_state['values']['project_url'] XOR !empty($_FILES['files']['name']['project_upload']))) { @@ -601,7 +601,7 @@ function update_manager_install_form_validate($form, &$form_state) { } /** - * Handle form submission when installing new projects via the Update Manager. + * Handle form submission when installing new projects via the update manager. * * Either downloads the file specified in the URL to a temporary cache, or * uploads the file attached to the form, then attempts to extract the archive @@ -718,7 +718,7 @@ function update_manager_install_form_submit($form, &$form_state) { // credentials and invoke update_authorize_run_install() indirectly with // whatever FileTransfer object authorize.php creates for us. else { - system_authorized_init('update_authorize_run_install', drupal_get_path('module', 'update') . '/update.authorize.inc', $arguments, t('Update Manager')); + system_authorized_init('update_authorize_run_install', drupal_get_path('module', 'update') . '/update.authorize.inc', $arguments, t('Update manager')); $form_state['redirect'] = system_authorized_get_url(); } } @@ -728,11 +728,11 @@ function update_manager_install_form_submit($form, &$form_state) { */ /** - * @defgroup update_manager_file Update Manager: file management + * @defgroup update_manager_file Update manager: file management * @{ - * Update Manager file management functions. + * Update manager file management functions. * - * These functions are used by the Update Manager to copy, extract + * These functions are used by the update manager to copy, extract * and verify archive files. */ @@ -888,7 +888,7 @@ function update_manager_batch_project_get($project, $url, &$context) { * * If the server is configured such that webserver-created files have the same * owner as the configuration directory (e.g. sites/default) where new code - * will eventually be installed, the Update Manager can transfer files entirely + * will eventually be installed, the Update manager can transfer files entirely * locally, without changing their ownership (in other words, without prompting * the user for FTP, SSH or other credentials). * diff --git a/core/modules/update/update.module b/core/modules/update/update.module index 37b1763..020f026 100644 --- a/core/modules/update/update.module +++ b/core/modules/update/update.module @@ -82,15 +82,15 @@ function update_help($path, $arg) { $output = ''; $output .= '

' . t('About') . '

'; $output .= '

' . t("The Update Manager module periodically checks for new versions of your site's software (including contributed modules and themes), and alerts administrators to available updates. In order to provide update information, anonymous usage statistics are sent to Drupal.org. If desired, you may disable the Update Manager module from the Module administration page. For more information, see the online handbook entry for Update Manager module.", array('@update' => 'http://drupal.org/handbook/modules/update', '@modules' => url('admin/modules'))) . '

'; - // Only explain the Update Manager if it has not been disabled. + // Only explain the Update manager if it has not been disabled. if (update_manager_access()) { - $output .= '

' . t('The Update Manager also allows administrators to update and install modules and themes through the administration interface.') . '

'; + $output .= '

' . t('The Update manager also allows administrators to update and install modules and themes through the administration interface.') . '

'; } $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Checking for available updates') . '
'; $output .= '
' . t('A report of available updates will alert you when new releases are available for download. You may configure options for the frequency for checking updates (which are performed during cron runs) and e-mail notifications at the Update Manager settings page.', array('@update-report' => url('admin/reports/updates'), '@cron' => 'http://drupal.org/cron', '@update-settings' => url('admin/reports/updates/settings'))) . '
'; - // Only explain the Update Manager if it has not been disabled. + // Only explain the Update manager if it has not been disabled. if (update_manager_access()) { $output .= '
' . t('Performing updates through the user interface') . '
'; $output .= '
' . t('The Update Manager module allows administrators to perform updates directly through the administration interface. At the top of the modules and themes pages you will see a link to update to new releases. This will direct you to the update page where you see a listing of all the missing updates and confirm which ones you want to upgrade. From there, you are prompted for your FTP/SSH password, which then transfers the files into your Drupal installation, overwriting your old files. More detailed instructions can be found in the online handbook.', array('@modules_page' => url('admin/modules'), '@themes_page' => url('admin/appearance'), '@update-page' => url('admin/reports/updates/update'), '@update' => 'http://drupal.org/handbook/modules/update')) . '
'; @@ -506,7 +506,7 @@ function update_mail($key, &$message, $params) { } $message['body'][] = t('See the available updates page for more information:', array(), array('langcode' => $langcode)) . "\n" . url('admin/reports/updates', array('absolute' => TRUE, 'language' => $language)); if (update_manager_access()) { - $message['body'][] = t('You can automatically install your missing updates using the Update Manager:', array(), array('langcode' => $langcode)) . "\n" . url('admin/reports/updates/update', array('absolute' => TRUE, 'language' => $language)); + $message['body'][] = t('You can automatically install your missing updates using the Update manager:', array(), array('langcode' => $langcode)) . "\n" . url('admin/reports/updates/update', array('absolute' => TRUE, 'language' => $language)); } $settings_url = url('admin/reports/updates/settings', array('absolute' => TRUE)); if (variable_get('update_notification_threshold', 'all') == 'all') { @@ -647,7 +647,7 @@ function theme_update_last_check($variables) { * Implements hook_verify_update_archive(). * * First, we ensure that the archive isn't a copy of Drupal core, which the - * Update Manager does not yet support. @see http://drupal.org/node/606592 + * Update manager does not yet support. @see http://drupal.org/node/606592 * * Then, we make sure that at least one module included in the archive file has * an .info file which claims that the code is compatible with the current @@ -931,7 +931,7 @@ function update_clear_update_disk_cache() { } /** - * Delete stale files and directories from the Update Manager disk cache. + * Delete stale files and directories from the Update manager disk cache. * * Files and directories older than 6 hours and development snapshots older * than 5 minutes are considered stale. We only cache development snapshots diff --git a/core/modules/update/update.test b/core/modules/update/update.test index ce5ed66..a657f91 100644 --- a/core/modules/update/update.test +++ b/core/modules/update/update.test @@ -588,12 +588,12 @@ class UpdateTestContribCase extends UpdateTestHelper { $this->assertNoText(t('Security update required!')); $this->assertRaw(l(t('AAA Update test'), 'http://example.com/project/aaa_update_test'), t('Link to aaa_update_test project appears.')); - // Turn the altering back on and visit the Update Manager UI. + // Turn the altering back on and visit the Update manager UI. variable_set('update_test_update_status', $update_status); $this->drupalGet('admin/modules/update'); $this->assertText(t('Security update')); - // Turn the altering back off and visit the Update Manager UI. + // Turn the altering back off and visit the Update manager UI. variable_set('update_test_update_status', array()); $this->drupalGet('admin/modules/update'); $this->assertNoText(t('Security update')); @@ -657,7 +657,7 @@ class UpdateTestUploadCase extends UpdateTestHelper { } /** - * Check the messages on Update Manager pages when missing a security update. + * Check the messages on Update manager pages when missing a security update. */ function testUpdateManagerCoreSecurityUpdateMessages() { $setting = array( @@ -671,7 +671,7 @@ class UpdateTestUploadCase extends UpdateTestHelper { // Initialize the update status. $this->drupalGet('admin/reports/updates'); - // Now, make sure none of the Update Manager pages have duplicate messages + // Now, make sure none of the Update manager pages have duplicate messages // about core missing a security update. $this->drupalGet('admin/modules/install');