diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b276327..64e00f1 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -332,8 +332,8 @@ Drupal 7.0, 2011-01-05 order can now be customized using the Views module. * Removed the 'related terms' feature from taxonomy module since this can now be achieved with Field API. - * Added additional features to the default install profile, and implemented - a "slimmed down" install profile designed for developers. + * Added additional features to the default installation profile, and + implemented a "slimmed down" profile designed for developers. * Added a built-in, automated cron run feature, which is triggered by site visitors. * Added an administrator role which is assigned all permissions for @@ -560,7 +560,7 @@ Drupal 6.16, 2010-03-03 see SA-CORE-2010-001. - Better support for updated jQuery versions. - Reduced resource usage of update.module. -- Fixed several issues relating to support of install profiles and +- Fixed several issues relating to support of installation profiles and distributions. - Added a locking framework to avoid data corruption on long operations. - Fixed a variety of other bugs. @@ -678,7 +678,7 @@ Drupal 6.0, 2008-02-13 * Expands the severity levels from 3 (Error, Warning, Notice) to the 8 levels defined in RFC 3164. * The watchdog module is now called dblog, and is optional, but enabled by - default in the default install profile. + default in the default installation profile. * Extended the database log module so log messages can be filtered. * Added syslog module: useful for monitoring large Drupal installations. - Added optional e-mail notifications when users are approved, blocked, or @@ -733,7 +733,7 @@ Drupal 6.0, 2008-02-13 * Themed the installer with the Garland theme. * Added form to provide initial site information during installation. * Added ability to provide extra installation steps programmatically. - * Made it possible to import interface translations at install time. + * Made it possible to import interface translations during installation. - Added the HTML corrector filter: * Fixes faulty and chopped off HTML in postings. * Tags are now automatically closed at the end of the teaser. @@ -912,7 +912,7 @@ Drupal 5.0, 2007-01-15 - Added web-based installer which can: * Check installation and run-time requirements * Automatically generate the database configuration file - * Install pre-made 'install profiles' or distributions + * Install pre-made installation profiles or distributions * Import the database structure with automatic table prefixing * Be localized - Added new default Garland theme diff --git a/INSTALL.txt b/INSTALL.txt index 7b526e3..c3a26ad 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -89,8 +89,8 @@ INSTALLATION - Download a translation file for the correct Drupal version and language from the translation server: http://localize.drupal.org/translate/downloads - - Place the file into your installation profile's translations - directory. For instance, if you are using the Standard install profile, + - Place the file into your installation profile's translations directory. + For instance, if you are using the Standard installation profile, move the .po file into the directory: profiles/standard/translations/ diff --git a/includes/common.inc b/includes/common.inc index 0d390c0..5c6d86d 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -208,7 +208,7 @@ function drupal_get_region_content($region = NULL, $delimiter = ' ') { } /** - * Gets the name of the currently active install profile. + * Gets the name of the currently active installation profile. * * When this function is called during Drupal's initial installation process, * the name of the profile that's about to be installed is stored in the global @@ -217,7 +217,7 @@ function drupal_get_region_content($region = NULL, $delimiter = ' ') { * variable_get() to determine what one is active. * * @return $profile - * The name of the install profile. + * The name of the installation profile. */ function drupal_get_profile() { global $install_state; @@ -5277,7 +5277,7 @@ function drupal_cron_cleanup() { * drupal_system_listing("/\.module$/", "modules", 'name', 0); * @endcode * this function will search the site-wide modules directory (i.e., /modules/), - * your install profile's directory (i.e., + * your installation profile's directory (i.e., * /profiles/your_site_profile/modules/), the all-sites directory (i.e., * /sites/all/modules/), and your site-specific directory (i.e., * /sites/your_site_dir/modules/), in that order, and return information about diff --git a/includes/form.inc b/includes/form.inc index 9b5bb32..826b677 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -728,7 +728,7 @@ function drupal_retrieve_form($form_id, &$form_state) { // the form builder callbacks can be loaded when the form is being rebuilt // from cache on a different path (such as 'system/ajax'). See // form_get_cache(). - // $menu_get_item() is not available at installation time. + // $menu_get_item() is not available during installation. if (!isset($form_state['build_info']['files']['menu']) && !defined('MAINTENANCE_MODE')) { $item = menu_get_item(); if (!empty($item['include_file'])) { @@ -4406,7 +4406,7 @@ function batch_set($batch_definition) { } // Base and default properties for the batch set. - // Use get_t() to allow batches at install time. + // Use get_t() to allow batches during installation. $t = get_t(); $init = array( 'sandbox' => array(), diff --git a/includes/install.core.inc b/includes/install.core.inc index bba8ce0..09f3cc5 100644 --- a/includes/install.core.inc +++ b/includes/install.core.inc @@ -523,7 +523,7 @@ function install_tasks($install_state) { $needs_translations = count($install_state['locales']) > 1 && !empty($install_state['parameters']['locale']) && $install_state['parameters']['locale'] != 'en'; // Start with the core installation tasks that run before handing control - // to the install profile. + // to the installation profile. $tasks = array( 'install_select_profile' => array( 'display_name' => st('Choose profile'), @@ -775,7 +775,7 @@ function install_system_module(&$install_state) { // variable_set() can be used now that system.module is installed. $modules = $install_state['profile_info']['dependencies']; - // The install profile is also a module, which needs to be installed + // The installation profile is also a module, which needs to be installed // after all the dependencies have been installed. $modules[] = drupal_get_profile(); @@ -1441,7 +1441,7 @@ function install_configure_form($form, &$form_state, &$install_state) { // Add JavaScript time zone detection. drupal_add_js('misc/timezone.js'); // We add these strings as settings because JavaScript translation does not - // work on install time. + // work during installation. drupal_add_js(array('copyFieldValue' => array('edit-site-mail' => array('edit-account-mail'))), 'setting'); drupal_add_js('jQuery(function () { Drupal.cleanURLsInstallCheck(); });', 'inline'); // Add JS to show / hide the 'Email administrator about site updates' elements @@ -1500,13 +1500,13 @@ function install_finished(&$install_state) { // Flush all caches to ensure that any full bootstraps during the installer // do not leave stale cached data, and that any content types or other items - // registered by the install profile are registered correctly. + // registered by the installation profile are registered correctly. drupal_flush_all_caches(); // Remember the profile which was used. variable_set('install_profile', drupal_get_profile()); - // Install profiles are always loaded last + // Installation profiles are always loaded last db_update('system') ->fields(array('weight' => 1000)) ->condition('type', 'module') diff --git a/includes/install.inc b/includes/install.inc index 2f50c85..0372483 100644 --- a/includes/install.inc +++ b/includes/install.inc @@ -185,11 +185,11 @@ function drupal_set_installed_schema_version($module, $version) { } /** - * Loads the install profile, extracting its defined distribution name. + * Loads the installation profile, extracting its defined distribution name. * * @return * The distribution name defined in the profile's .info file. Defaults to - * "Drupal" if none is explicitly provided by the install profile. + * "Drupal" if none is explicitly provided by the installation profile. * * @see install_profile_info() */ @@ -660,7 +660,7 @@ function drupal_rewrite_settings($settings = array(), $prefix = '') { } /** - * Verifies an install profile for installation. + * Verifies an installation profile for installation. * * @param $install_state * An array of information about the current installation state. @@ -688,8 +688,8 @@ function drupal_verify_profile($install_state) { $present_modules[] = $present_module->name; } - // The install profile is also a module, which needs to be installed after all the other dependencies - // have been installed. + // The installation profile is also a module, which needs to be installed + // after all the other dependencies have been installed. $present_modules[] = drupal_get_profile(); // Verify that all of the profile's required modules are present. @@ -1148,12 +1148,12 @@ function st($string, array $args = array(), array $options = array()) { } /** - * Checks an install profile's requirements. + * Checks an installation profile's requirements. * * @param $profile - * Name of install profile to check. + * Name of installation profile to check. * @return - * Array of the install profile's requirements. + * Array of the installation profile's requirements. */ function drupal_check_profile($profile) { include_once DRUPAL_ROOT . '/includes/file.inc'; @@ -1230,11 +1230,11 @@ function drupal_check_module($module) { } /** - * Retrieves information about an install profile from its .info file. + * Retrieves information about an installation profile from its .info file. * * The information stored in a profile .info file is similar to that stored in * a normal Drupal module .info file. For example: - * - name: The real name of the install profile for display purposes. + * - name: The real name of the installation profile for display purposes. * - description: A brief description of the profile. * - dependencies: An array of shortnames of other modules that this install * profile requires. diff --git a/includes/module.inc b/includes/module.inc index 72c5938..6d9b33f 100644 --- a/includes/module.inc +++ b/includes/module.inc @@ -871,7 +871,7 @@ function drupal_required_modules() { $files = drupal_system_listing('/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.info$/', 'modules', 'name', 0); $required = array(); - // An install profile is required and one must always be loaded. + // An installation profile is required and one must always be loaded. $required[] = drupal_get_profile(); foreach ($files as $name => $file) { diff --git a/includes/unicode.inc b/includes/unicode.inc index cd9cd9b..81a0a4d 100644 --- a/includes/unicode.inc +++ b/includes/unicode.inc @@ -96,7 +96,7 @@ function unicode_check() { * Whether to report any fatal errors with form_set_error(). */ function _unicode_check() { - // Ensure translations don't break at install time + // Ensure translations don't break during installation. $t = get_t(); // Check for mbstring extension @@ -128,7 +128,7 @@ function _unicode_check() { * Return Unicode library status and errors. */ function unicode_requirements() { - // Ensure translations don't break at install time + // Ensure translations don't break during installation. $t = get_t(); $libraries = array( diff --git a/includes/update.inc b/includes/update.inc index 588c426..5f1c233 100644 --- a/includes/update.inc +++ b/includes/update.inc @@ -785,12 +785,12 @@ function update_fix_d7_requirements() { /** * Register the currently installed profile in the system table. * - * Install profiles are now treated as modules by Drupal, and have an upgrade - * path based on their schema version in the system table. + * Installation profiles are now treated as modules by Drupal, and have an + * upgrade path based on their schema version in the system table. * - * The install profile will be set to schema_version 0, as it has already been - * installed. Any other hook_update_N functions provided by the install profile - * will be run by update.php. + * The installation profile will be set to schema_version 0, as it has already + * been installed. Any other hook_update_N functions provided by the + * installation profile will be run by update.php. */ function update_fix_d7_install_profile() { $profile = drupal_get_profile(); @@ -828,10 +828,10 @@ function update_fix_d7_install_profile() { 'owner' => '', ); - // Install profile hooks are always executed last by the module system + // Installation profile hooks are always executed last by the module system $values['weight'] = 1000; - // Initializing the system table entry for the install profile + // Initializing the system table entry for the installation profile db_insert('system') ->fields(array_keys($values)) ->values($values) @@ -840,7 +840,8 @@ function update_fix_d7_install_profile() { // Reset the cached schema version. drupal_get_installed_schema_version($profile, TRUE); - // Load the updates again to make sure the install profile updates are loaded + // Load the updates again to make sure the installation profile updates + // are loaded. drupal_load_updates(); } } diff --git a/modules/comment/comment.test b/modules/comment/comment.test index e787d25..b6a707a 100644 --- a/modules/comment/comment.test +++ b/modules/comment/comment.test @@ -2011,7 +2011,7 @@ class CommentFieldsTest extends CommentHelperCase { */ function testCommentDefaultFields() { // Do not make assumptions on default node types created by the test - // install profile, and create our own. + // installation profile, and create our own. $this->drupalCreateContentType(array('type' => 'test_node_type')); // Check that the 'comment_body' field is present on all comment bundles. diff --git a/modules/overlay/overlay.install b/modules/overlay/overlay.install index 2fa7c84..8939e2a 100644 --- a/modules/overlay/overlay.install +++ b/modules/overlay/overlay.install @@ -9,7 +9,7 @@ * Implements hook_enable(). * * If the module is being enabled through the admin UI, and not from an - * install profile, reopen the modules page in an overlay. + * installation profile, reopen the modules page in an overlay. */ function overlay_enable() { if (strpos(current_path(), 'admin/modules') === 0) { diff --git a/modules/simpletest/tests/module.test b/modules/simpletest/tests/module.test index f55c08a..769c4cf 100644 --- a/modules/simpletest/tests/module.test +++ b/modules/simpletest/tests/module.test @@ -25,7 +25,7 @@ class ModuleUnitTest extends DrupalWebTestCase { $profile_info = install_profile_info('standard', 'en'); $module_list = $profile_info['dependencies']; - // Install profile is a module that is expected to be loaded. + // Installation profile is a module that is expected to be loaded. $module_list[] = 'standard'; sort($module_list); @@ -171,12 +171,12 @@ class ModuleUnitTest extends DrupalWebTestCase { $this->assertFalse(module_exists('php'), t('Disabling a module with unlisted dependents succeeded.')); $this->assertEqual(variable_get('test_module_disable_order', array()), array('forum', 'poll', 'php'), t('Modules were disabled in the correct order by module_disable().')); - // Disable a module that is listed as a dependency by the install profile. - // Make sure that the profile itself is not on the list of dependent - // modules to be disabled. + // Disable a module that is listed as a dependency by the installation + // profile. Make sure that the profile itself is not on the list of + // dependent modules to be disabled. $profile = drupal_get_profile(); $info = install_profile_info($profile); - $this->assertTrue(in_array('comment', $info['dependencies']), t('Comment module is listed as a dependency of the install profile.')); + $this->assertTrue(in_array('comment', $info['dependencies']), t('Comment module is listed as a dependency of the installation profile.')); $this->assertTrue(module_exists('comment'), t('Comment module is enabled.')); module_disable(array('comment')); $this->assertFalse(module_exists('comment'), t('Comment module was disabled.')); diff --git a/modules/simpletest/tests/requirements1_test.install b/modules/simpletest/tests/requirements1_test.install index 651d911..91caca3 100644 --- a/modules/simpletest/tests/requirements1_test.install +++ b/modules/simpletest/tests/requirements1_test.install @@ -5,7 +5,7 @@ */ function requirements1_test_requirements($phase) { $requirements = array(); - // Ensure translations don't break at install time. + // Ensure translations don't break during installation. $t = get_t(); // Always fails requirements. diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index c9d623c..061898c 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -813,7 +813,7 @@ function system_modules($form, $form_state = array()) { // Used when checking if module implements a help page. $help_arg = module_exists('help') ? drupal_help_arg() : FALSE; - // Used when displaying modules that are required by the install profile. + // Used when displaying modules that are required by the installation profile. require_once DRUPAL_ROOT . '/includes/install.inc'; $distribution_name = check_plain(drupal_install_profile_distribution_name()); @@ -1274,8 +1274,8 @@ function system_modules_uninstall($form, $form_state = NULL) { '#title_display' => 'invisible', ); // All modules which depend on this one must be uninstalled first, before - // we can allow this module to be uninstalled. (The install profile is - // excluded from this list.) + // we can allow this module to be uninstalled. (The installation profile + // is excluded from this list.) foreach (array_keys($module->required_by) as $dependent) { if ($dependent != $profile && drupal_get_installed_schema_version($dependent) != SCHEMA_UNINSTALLED) { $dependent_name = isset($all_modules[$dependent]->info['name']) ? $all_modules[$dependent]->info['name'] : $dependent; diff --git a/modules/system/system.api.php b/modules/system/system.api.php index 6ed5766..53d3cb2 100644 --- a/modules/system/system.api.php +++ b/modules/system/system.api.php @@ -3004,7 +3004,7 @@ function hook_file_url_alter(&$uri) { */ function hook_requirements($phase) { $requirements = array(); - // Ensure translations don't break at install time + // Ensure translations don't break during installation. $t = get_t(); // Report Drupal version @@ -3056,7 +3056,7 @@ function hook_requirements($phase) { * more tables and their related keys and indexes. A schema is defined by * hook_schema() which must live in your module's .install file. * - * This hook is called at both install and uninstall time, and in the latter + * This hook is called at install and uninstall time, and in the latter * case, it cannot rely on the .module file being loaded or hooks being known. * If the .module file is needed, it may be loaded with drupal_load(). * diff --git a/modules/system/system.install b/modules/system/system.install index d468b05..df0db71 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -16,7 +16,7 @@ function system_requirements($phase) { global $base_url; $requirements = array(); - // Ensure translations don't break at install time + // Ensure translations don't break during installation. $t = get_t(); // Report Drupal version @@ -28,8 +28,8 @@ function system_requirements($phase) { 'weight' => -10, ); - // Display the currently active install profile, if the site - // is not running the default install profile. + // Display the currently active installation profile, if the site + // is not running the default installation profile. $profile = drupal_get_profile(); if ($profile != 'standard') { $info = system_get_info('module', $profile); @@ -308,7 +308,7 @@ function system_requirements($phase) { variable_get('file_private_path', FALSE), ); - // Do not check for the temporary files directory at install time + // Do not check for the temporary files directory during installation // unless it has been set in settings.php. In this case the user has // no alternative but to fix the directory if it is not writable. if ($phase == 'install') { @@ -412,7 +412,7 @@ function system_requirements($phase) { $profile = drupal_get_profile(); $files = system_rebuild_module_data(); foreach ($files as $module => $file) { - // Ignore disabled modules and install profiles. + // Ignore disabled modules and installation profiles. if (!$file->status || $module == $profile) { continue; } diff --git a/modules/system/system.module b/modules/system/system.module index 971c7c9..a8fb53f 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -2348,14 +2348,14 @@ function _system_rebuild_module_data() { // Find modules $modules = drupal_system_listing('/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.module$/', 'modules', 'name', 0); - // Include the install profile in modules that are loaded. + // Include the installation profile in modules that are loaded. $profile = drupal_get_profile(); $modules[$profile] = new stdClass(); $modules[$profile]->name = $profile; $modules[$profile]->uri = 'profiles/' . $profile . '/' . $profile . '.profile'; $modules[$profile]->filename = $profile . '.profile'; - // Install profile hooks are always executed last. + // Installation profile hooks are always executed last. $modules[$profile]->weight = 1000; // Set defaults for module info. @@ -2396,7 +2396,7 @@ function _system_rebuild_module_data() { $module->info['scripts'] = _system_info_add_path($module->info['scripts'], $path); } - // Install profiles are hidden by default, unless explicitly specified + // Installation profiles are hidden by default, unless explicitly specified // otherwise in the .info file. if ($key == $profile && !isset($modules[$key]->info['hidden'])) { $modules[$key]->info['hidden'] = TRUE; @@ -2409,7 +2409,7 @@ function _system_rebuild_module_data() { } if (isset($modules[$profile])) { - // The install profile is required, if it's a valid module. + // The installation profile is required, if it's a valid module. $modules[$profile]->info['required'] = TRUE; // Add a default distribution name if the profile did not provide one. This // matches the default value used in install_profile_info(). diff --git a/profiles/minimal/minimal.install b/profiles/minimal/minimal.install index 6099da1..9cf4fa2 100644 --- a/profiles/minimal/minimal.install +++ b/profiles/minimal/minimal.install @@ -1,7 +1,7 @@