diff --git a/modules/block/block.api.php b/modules/block/block.api.php
index d7453b2..a505670 100644
--- a/modules/block/block.api.php
+++ b/modules/block/block.api.php
@@ -25,8 +25,8 @@
* - Used to construct the default HTML ID of "block-MODULE-DELTA" applied to
* each block when it is rendered. This ID may then be used for CSS styling or
* JavaScript programming.
- * - Used to define a theming template suggestion of block__MODULE__DELTA, for
- * advanced theming possibilities.
+ * - Used to define a template theme suggestion of block__MODULE__DELTA, for
+ * advanced theme possibilities.
* - Used by other modules to identify your block in hook_block_info_alter() and
* other alter hooks.
* The values of delta can be strings or numbers, but because of the uses above
diff --git a/modules/block/block.js b/modules/block/block.js
index acd3f5a..66cc162 100644
--- a/modules/block/block.js
+++ b/modules/block/block.js
@@ -122,7 +122,7 @@ Drupal.behaviors.blockDrag = {
// Modify empty regions with added or removed fields.
checkEmptyRegions(table, row);
- // Remove focus from selectbox.
+ // Remove focus from select-box.
select.get(0).blur();
});
});
diff --git a/modules/block/block.module b/modules/block/block.module
index b6a7332..192c7aa 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -412,7 +412,7 @@ function _block_rehash($theme = NULL) {
$delta = $block['delta'];
$original_database_blocks[$module][$delta] = $block;
// The cache mode can only by set from hook_block_info(), so that has
- // precedence over the database's value.
+ // precedence over the database`s value.
if (isset($current_blocks[$module][$delta]['cache'])) {
$block['cache'] = $current_blocks[$module][$delta]['cache'];
}
diff --git a/modules/block/block.test b/modules/block/block.test
index 99c81dc..baa72a9 100644
--- a/modules/block/block.test
+++ b/modules/block/block.test
@@ -947,7 +947,7 @@ class BlockHashTestCase extends DrupalWebTestCase {
* @param $alter_active
* Set to TRUE if the block_test module's hook_block_info_alter()
* implementation is expected to make a change that results in an existing
- * block needing to be resaved to the database. Defaults to FALSE.
+ * block needing to be re-saved to the database. Defaults to FALSE.
*/
function doRehash($alter_active = FALSE) {
$saves = 0;
diff --git a/modules/book/book.module b/modules/book/book.module
index 7afed9a..93983ab 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -428,7 +428,7 @@ function book_form_node_form_alter(&$form, &$form_state, $form_id) {
if ($access) {
_book_add_form_elements($form, $form_state, $node);
- // Since the "Book" dropdown can't trigger a form submission when
+ // Since the "Book" drop-down can't trigger a form submission when
// JavaScript is disabled, add a submit button to do that. book.css hides
// this button when JavaScript is enabled.
$form['book']['pick-book'] = array(
@@ -446,7 +446,7 @@ function book_form_node_form_alter(&$form, &$form_state, $form_id) {
* This handler is run when JavaScript is disabled. It triggers the form to
* rebuild so that the "Parent item" options are changed to reflect the newly
* selected book. When JavaScript is enabled, the submit button that triggers
- * this handler is hidden, and the "Book" dropdown directly triggers the
+ * this handler is hidden, and the "Book" drop-down directly triggers the
* book_form_update() Ajax callback instead.
*
* @see book_form_update()
@@ -518,7 +518,7 @@ function _book_parent_select($book_link) {
*/
function _book_add_form_elements(&$form, &$form_state, $node) {
// If the form is being processed during the Ajax callback of our book bid
- // dropdown, then $form_state will hold the value that was selected.
+ // drop-down, then $form_state will hold the value that was selected.
if (isset($form_state['values']['book'])) {
$node->book = $form_state['values']['book'];
}
@@ -1368,7 +1368,7 @@ function book_link_load($mlid) {
* Gets the data representing a subtree of the book hierarchy.
*
* The root of the subtree will be the link passed as a parameter, so the
- * returned tree will contain this item and all its descendents in the menu
+ * returned tree will contain this item and all its descendants in the menu
* tree.
*
* @param $link
diff --git a/modules/color/color.module b/modules/color/color.module
index 5b441aa..4046d35 100644
--- a/modules/color/color.module
+++ b/modules/color/color.module
@@ -62,7 +62,7 @@ function color_form_system_themes_alter(&$form, &$form_state) {
* Helper for hook_form_FORM_ID_alter() implementations.
*/
function _color_theme_select_form_alter(&$form, &$form_state) {
- // Use the generated screenshot in the theme list.
+ // Use the generated screen-shot in the theme list.
$themes = list_themes();
foreach (element_children($form) as $theme) {
if ($screenshot = variable_get('color_' . $theme . '_screenshot')) {
@@ -379,7 +379,7 @@ function color_scheme_form_submit($form, &$form_state) {
$palette += $info['schemes']['default']['colors'];
}
- // Make sure enough memory is available, if PHP's memory limit is compiled in.
+ // Make sure enough memory is available, if PHP memory limit is compiled in.
if (function_exists('memory_get_usage')) {
// Fetch source image dimensions.
$source = drupal_get_path('theme', $theme) . '/' . $info['base_image'];
@@ -409,7 +409,7 @@ function color_scheme_form_submit($form, &$form_state) {
@drupal_rmdir($file);
}
- // Don't render the default colorscheme, use the standard theme instead.
+ // Don't render the default color-scheme, use the standard theme instead.
if (implode(',', color_get_palette($theme, TRUE)) == implode(',', $palette)) {
variable_del('color_' . $theme . '_palette');
variable_del('color_' . $theme . '_stylesheets');
@@ -568,7 +568,7 @@ function _color_save_stylesheet($file, $style, &$paths) {
$filepath = file_unmanaged_save_data($style, $file, FILE_EXISTS_REPLACE);
$paths['files'][] = $filepath;
- // Set standard file permissions for webserver-generated files.
+ // Set standard file permissions for server-generated files.
drupal_chmod($file);
}
@@ -638,7 +638,7 @@ function _color_render_images($theme, &$info, &$paths, $palette) {
imagedestroy($slice);
$paths['files'][] = $image;
- // Set standard file permissions for webserver-generated files
+ // Set standard file permissions for server-generated files
drupal_chmod($image);
// Build before/after map of image paths.
diff --git a/modules/comment/comment.install b/modules/comment/comment.install
index e4da58f..607dbc0 100644
--- a/modules/comment/comment.install
+++ b/modules/comment/comment.install
@@ -290,7 +290,7 @@ function comment_update_7005() {
* Migrate data from the comment field to field storage.
*/
function comment_update_7006(&$sandbox) {
- // This is a multipass update. First set up some comment variables.
+ // This is a multi-pass update. First set up some comment variables.
if (empty($sandbox['total'])) {
$comments = (bool) db_query_range('SELECT 1 FROM {comment}', 0, 1)->fetchField();
$sandbox['types'] = array();
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 2972474..cd39b49 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -6,7 +6,7 @@
*
* When enabled, the Drupal comment module creates a discussion
* board for each Drupal node. Users can post comments to discuss
- * a forum topic, weblog post, story, collaborative book page, etc.
+ * a forum topic, blog post, story, collaborative book page, etc.
*/
/**
@@ -549,7 +549,7 @@ function comment_new_page_count($num_comments, $new_replies, $node) {
$pageno = $count / $comments_per_page;
}
else {
- // Threaded comments: we build a query with a subquery to find the first
+ // Threaded comments: we build a query with a sub-query to find the first
// thread with a new comment.
// 1. Find all the threads with a new comment.
@@ -1438,7 +1438,7 @@ function comment_user_delete($account) {
* @param $comment
* The comment object.
* @return
- * TRUE if the current user has acces to the comment, FALSE otherwise.
+ * TRUE if the current user has access to the comment, FALSE otherwise.
*/
function comment_access($op, $comment) {
global $user;
@@ -1781,7 +1781,7 @@ function comment_get_display_ordinal($cid, $node_type) {
if ($mode == COMMENT_MODE_FLAT) {
// For flat comments, cid is used for ordering comments due to
- // unpredicatable behavior with timestamp, so we make the same assumption
+ // unpredictable behavior with timestamp, so we make the same assumption
// here.
$query->condition('c1.cid', $cid, '<');
}
diff --git a/modules/comment/comment.test b/modules/comment/comment.test
index 9e69ba6..619550e 100644
--- a/modules/comment/comment.test
+++ b/modules/comment/comment.test
@@ -1379,7 +1379,7 @@ class CommentPagerTest extends CommentHelperCase {
function assertCommentOrder(array $comments, array $expected_order) {
$expected_cids = array();
- // First, rekey the expected order by cid.
+ // First, re-key the expected order by cid.
foreach ($expected_order as $key) {
$expected_cids[] = $comments[$key]->id;
}
diff --git a/modules/contact/contact.admin.inc b/modules/contact/contact.admin.inc
index 4648fd3..1b60b8d 100644
--- a/modules/contact/contact.admin.inc
+++ b/modules/contact/contact.admin.inc
@@ -167,7 +167,7 @@ function contact_category_edit_form_validate($form, &$form_state) {
*/
function contact_category_edit_form_submit($form, &$form_state) {
if ($form_state['values']['selected']) {
- // Unselect all other contact categories.
+ // Un-select all other contact categories.
db_update('contact')
->fields(array('selected' => '0'))
->execute();
diff --git a/modules/dblog/dblog.css b/modules/dblog/dblog.css
index b127886..3db5f36 100644
--- a/modules/dblog/dblog.css
+++ b/modules/dblog/dblog.css
@@ -10,7 +10,7 @@
margin: 0.1em;
/**
* In Opera 9, DOM elements with the property of "overflow: auto"
- * will partially hide its contents with unnecessary scrollbars when
+ * will partially hide its contents with unnecessary scroll-bars when
* its immediate child is floated without an explicit width set.
*/
width: 15em;
diff --git a/modules/dblog/dblog.install b/modules/dblog/dblog.install
index abfd9a2..ec68721 100644
--- a/modules/dblog/dblog.install
+++ b/modules/dblog/dblog.install
@@ -2,7 +2,7 @@
/**
* @file
- * Install, update and uninstall functions for the dblog module.
+ * Install, update and uninstall functions for the Database Logging module.
*/
/**
diff --git a/modules/dblog/dblog.test b/modules/dblog/dblog.test
index bf409c9..fe429d4 100644
--- a/modules/dblog/dblog.test
+++ b/modules/dblog/dblog.test
@@ -80,7 +80,7 @@ class DBLogTestCase extends DrupalWebTestCase {
// Check row limit variable.
$current_limit = variable_get('dblog_row_limit', 1000);
$this->assertTrue($current_limit == $row_limit, format_string('[Cache] Row limit variable of @count equals row limit of @limit', array('@count' => $current_limit, '@limit' => $row_limit)));
- // Verify dblog row limit equals specified row limit.
+ // Verify db log row limit equals specified row limit.
$current_limit = unserialize(db_query("SELECT value FROM {variable} WHERE name = :dblog_limit", array(':dblog_limit' => 'dblog_row_limit'))->fetchField());
$this->assertTrue($current_limit == $row_limit, format_string('[Variable table] Row limit variable of @count equals row limit of @limit', array('@count' => $current_limit, '@limit' => $row_limit)));
}
diff --git a/modules/field/field.api.php b/modules/field/field.api.php
index e8361c2..78ace2a 100644
--- a/modules/field/field.api.php
+++ b/modules/field/field.api.php
@@ -111,7 +111,7 @@ function hook_field_extra_fields_alter(&$info) {
* appears in edit forms, while @link field_formatter formatters @endlink
* specify how the field appears in displayed entities.
*
- * A third kind of pluggable handlers, storage backends, is defined by the
+ * A third kind of pluggable handlers, storage back-ends, is defined by the
* @link field_storage Field Storage API @endlink.
*
* See @link field Field API @endlink for information about the other parts of
@@ -314,7 +314,7 @@ function hook_field_schema($field) {
* FIELD_LOAD_REVISION to load the version indicated by each entity.
*/
function hook_field_load($entity_type, $entities, $field, $instances, $langcode, &$items, $age) {
- // Sample code from text.module: precompute sanitized strings so they are
+ // Sample code from text.module: pre-compute sanitized strings so they are
// stored in the field cache.
foreach ($entities as $id => $entity) {
foreach ($items[$id] as $delta => $item) {
@@ -436,7 +436,7 @@ function hook_field_validate($entity_type, $entity, $field, $instance, $langcode
function hook_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) {
if ($field['type'] == 'number_decimal') {
// Let PHP round the value to ensure consistent behavior across storage
- // backends.
+ // back-ends.
foreach ($items as $delta => $item) {
if (isset($item['value'])) {
$items[$delta]['value'] = round($item['value'], $field['settings']['scale']);
@@ -799,7 +799,7 @@ function hook_field_widget_info() {
* Perform alterations on Field API widget types.
*
* @param $info
- * Array of informations on widget types exposed by hook_field_widget_info()
+ * Array of information on widget types exposed by hook_field_widget_info()
* implementations.
*/
function hook_field_widget_info_alter(&$info) {
@@ -830,7 +830,7 @@ function hook_field_widget_info_alter(&$info) {
* Examples: mono-value widget even if the field is multi-valued, non-required
* widget even if the field is 'required'...
*
- * Therefore, the FAPI element callbacks (such as #process, #element_validate,
+ * Therefore, the Field API element callbacks (such as #process, #element_validate,
* #value_callback...) used by the widget cannot use the field_info_field()
* or field_info_instance() functions to retrieve the $field or $instance
* definitions they should operate on. The field_widget_field() and
@@ -858,7 +858,7 @@ function hook_field_widget_info_alter(&$info) {
* @param $items
* Array of default values for this field.
* @param $delta
- * The order of this item in the array of subelements (0, 1, 2, etc).
+ * The order of this item in the array of sub-elements (0, 1, 2, etc).
* @param $element
* A form element array containing basic properties for the widget:
* - #entity_type: The name of the entity the field is attached to.
@@ -879,7 +879,7 @@ function hook_field_widget_info_alter(&$info) {
* - #required: A Boolean indicating whether the element value is required;
* for required multiple value fields, only the first widget's values are
* required.
- * - #delta: The order of this item in the array of subelements; see $delta
+ * - #delta: The order of this item in the array of sub-elements; see $delta
* above.
*
* @return
@@ -947,7 +947,7 @@ function hook_field_widget_form_alter(&$element, &$form_state, $context) {
* - "instance": The field instance structure.
* - "langcode": The language associated with $items.
* - "items": Array of default values for this field.
- * - "delta": The order of this item in the array of subelements (0, 1, 2,
+ * - "delta": The order of this item in the array of sub-elements (0, 1, 2,
* etc).
*
* @see hook_field_widget_form()
@@ -1179,7 +1179,7 @@ function hook_field_formatter_prepare_view($entity_type, $entities, $field, $ins
}
if ($rekey) {
- // Rekey the items array.
+ // Re-key the items array.
$items[$id] = array_values($items[$id]);
}
}
@@ -1649,10 +1649,10 @@ function hook_field_attach_delete_bundle($entity_type, $bundle, $instances) {
*/
/**
- * Expose Field API storage backends.
+ * Expose Field API storage back-ends.
*
* @return
- * An array describing the storage backends implemented by the module.
+ * An array describing the storage back-ends implemented by the module.
* The keys are storage backend names. To avoid name clashes, storage backend
* names should be prefixed with the name of the module that exposes them.
* The values are arrays describing the storage backend, with the following
@@ -1677,7 +1677,7 @@ function hook_field_storage_info() {
* Perform alterations on Field API storage types.
*
* @param $info
- * Array of informations on storage types exposed by
+ * Array of information on storage types exposed by
* hook_field_field_storage_info() implementations.
*/
function hook_field_storage_info_alter(&$info) {
@@ -1897,7 +1897,7 @@ function hook_field_storage_write($entity_type, $entity, $op, $fields) {
$items = (array) $entity->{$field_name}[$langcode];
$delta_count = 0;
foreach ($items as $delta => $item) {
- // We now know we have someting to insert.
+ // We now know we have something to insert.
$do_insert = TRUE;
$record = array(
'entity_type' => $entity_type,
@@ -2175,7 +2175,7 @@ function hook_field_storage_delete_instance($instance) {
}
/**
- * Act before the storage backends load field data.
+ * Act before the storage back-ends load field data.
*
* This hook allows modules to load data before the Field Storage API,
* optionally preventing the field storage module from doing so.
@@ -2212,7 +2212,7 @@ function hook_field_storage_pre_load($entity_type, $entities, $age, &$skip_field
}
/**
- * Act before the storage backends insert field data.
+ * Act before the storage back-ends insert field data.
*
* This hook allows modules to store data before the Field Storage API,
* optionally preventing the field storage module from doing so.
@@ -2249,7 +2249,7 @@ function hook_field_storage_pre_insert($entity_type, $entity, &$skip_fields) {
}
/**
- * Act before the storage backends update field data.
+ * Act before the storage back-ends update field data.
*
* This hook allows modules to store data before the Field Storage API,
* optionally preventing the field storage module from doing so.
diff --git a/modules/field/field.attach.inc b/modules/field/field.attach.inc
index 897f952..3f1e291 100644
--- a/modules/field/field.attach.inc
+++ b/modules/field/field.attach.inc
@@ -38,7 +38,7 @@ class FieldValidationException extends FieldException {
* access". Each Field Storage API hook function defines a primitive database
* operation such as read, write, or delete. The default field storage module,
* field_sql_storage.module, uses the local SQL database to implement these
- * operations, but alternative field storage backends can choose to represent
+ * operations, but alternative field storage back-ends can choose to represent
* the data in SQL differently or use a completely different storage mechanism
* such as a cloud-based database.
*
@@ -112,7 +112,7 @@ define('FIELD_STORAGE_INSERT', 'insert');
* define pre-operation hooks, e.g. hook_field_attach_pre_load(). These hooks
* run before the corresponding Field Storage API and Field Type API
* operations. They allow modules to define additional storage locations (e.g.
- * denormalizing, mirroring) for field data on a per-field basis. They also
+ * de-normalizing, mirroring) for field data on a per-field basis. They also
* allow modules to take over field storage completely by instructing other
* implementations of the same hook and the Field Storage API itself not to
* operate on specified fields.
@@ -169,7 +169,7 @@ define('FIELD_STORAGE_INSERT', 'insert');
* will be invoked (hook_field_[op])
* - If TRUE, the default field implementation of the field operation
* will be invoked (field_default_[op])
- * Internal use only. Do not explicitely set to TRUE, but use
+ * Internal use only. Do not obviously set to TRUE, but use
* _field_invoke_default() instead.
* - 'deleted': If TRUE, the function will operate on deleted fields
* as well as non-deleted fields. If unset or FALSE, only
@@ -263,7 +263,7 @@ function _field_invoke($op, $entity_type, $entity, &$a = NULL, &$b = NULL, $opti
* will be invoked (hook_field_[op])
* - If TRUE, the default field implementation of the field operation
* will be invoked (field_default_[op])
- * Internal use only. Do not explicitely set to TRUE, but use
+ * Internal use only. Do not obviously set to TRUE, but use
* _field_invoke_multiple_default() instead.
* - 'deleted': If TRUE, the function will operate on deleted fields
* as well as non-deleted fields. If unset or FALSE, only
@@ -668,7 +668,7 @@ function field_attach_load($entity_type, $entities, $age = FIELD_LOAD_CURRENT, $
if ($queried_entities) {
// The invoke order is:
// - hook_field_storage_pre_load()
- // - storage backend's hook_field_storage_load()
+ // - storage back-end`s hook_field_storage_load()
// - field-type module's hook_field_load()
// - hook_field_attach_load()
@@ -682,7 +682,7 @@ function field_attach_load($entity_type, $entities, $age = FIELD_LOAD_CURRENT, $
$instances = array();
- // Collect the storage backends used by the remaining fields in the entities.
+ // Collect the storage back-ends used by the remaining fields in the entities.
$storages = array();
foreach ($queried_entities as $entity) {
list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
@@ -703,7 +703,7 @@ function field_attach_load($entity_type, $entities, $age = FIELD_LOAD_CURRENT, $
}
}
- // Invoke hook_field_storage_load() on the relevant storage backends.
+ // Invoke hook_field_storage_load() on the relevant storage back-ends.
foreach ($storages as $storage => $fields) {
$storage_info = field_info_storage_types($storage);
module_invoke($storage_info['module'], 'field_storage_load', $entity_type, $queried_entities, $age, $fields, $options);
@@ -808,7 +808,7 @@ function field_attach_validate($entity_type, $entity, $options = array()) {
* There are two levels of validation for fields in forms: widget
* validation, and field validation.
* - Widget validation steps are specific to a given widget's own form
- * structure and UI metaphors. They are executed through FAPI's
+ * structure and UI metaphors. They are executed through Field API's
* #element_validate property during normal form validation.
* - Field validation steps are common to a given field type, independently of
* the specific widget being used in a given form. They are defined in the
@@ -913,7 +913,7 @@ function field_attach_submit($entity_type, $entity, $form, &$form_state, $option
function field_attach_presave($entity_type, $entity) {
_field_invoke('presave', $entity_type, $entity);
- // Let other modules act on presaving the entity.
+ // Let other modules act on pre-saving the entity.
module_invoke_all('field_attach_presave', $entity_type, $entity);
}
@@ -947,7 +947,7 @@ function field_attach_insert($entity_type, $entity) {
$function($entity_type, $entity, $skip_fields);
}
- // Collect the storage backends used by the remaining fields in the entities.
+ // Collect the storage back-ends used by the remaining fields in the entities.
$storages = array();
foreach (field_info_instances($entity_type, $bundle) as $instance) {
$field = field_info_field_by_id($instance['field_id']);
@@ -961,7 +961,7 @@ function field_attach_insert($entity_type, $entity) {
}
}
- // Field storage backends save any remaining unsaved fields.
+ // Field storage back-ends save any remaining unsaved fields.
foreach ($storages as $storage => $fields) {
$storage_info = field_info_storage_types($storage);
module_invoke($storage_info['module'], 'field_storage_write', $entity_type, $entity, FIELD_STORAGE_INSERT, $fields);
@@ -1000,7 +1000,7 @@ function field_attach_update($entity_type, $entity) {
$function($entity_type, $entity, $skip_fields);
}
- // Collect the storage backends used by the remaining fields in the entities.
+ // Collect the storage back-ends used by the remaining fields in the entities.
$storages = array();
foreach (field_info_instances($entity_type, $bundle) as $instance) {
$field = field_info_field_by_id($instance['field_id']);
@@ -1018,7 +1018,7 @@ function field_attach_update($entity_type, $entity) {
}
}
- // Field storage backends save any remaining unsaved fields.
+ // Field storage back-ends save any remaining unsaved fields.
foreach ($storages as $storage => $fields) {
$storage_info = field_info_storage_types($storage);
module_invoke($storage_info['module'], 'field_storage_write', $entity_type, $entity, FIELD_STORAGE_UPDATE, $fields);
@@ -1047,7 +1047,7 @@ function field_attach_delete($entity_type, $entity) {
list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
- // Collect the storage backends used by the fields in the entities.
+ // Collect the storage back-ends used by the fields in the entities.
$storages = array();
foreach (field_info_instances($entity_type, $bundle) as $instance) {
$field = field_info_field_by_id($instance['field_id']);
@@ -1055,7 +1055,7 @@ function field_attach_delete($entity_type, $entity) {
$storages[$field['storage']['type']][$field_id] = $field_id;
}
- // Field storage backends delete their data.
+ // Field storage back-ends delete their data.
foreach ($storages as $storage => $fields) {
$storage_info = field_info_storage_types($storage);
module_invoke($storage_info['module'], 'field_storage_delete', $entity_type, $entity, $fields);
@@ -1084,7 +1084,7 @@ function field_attach_delete_revision($entity_type, $entity) {
list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
- // Collect the storage backends used by the fields in the entities.
+ // Collect the storage back-ends used by the fields in the entities.
$storages = array();
foreach (field_info_instances($entity_type, $bundle) as $instance) {
$field = field_info_field_by_id($instance['field_id']);
@@ -1092,7 +1092,7 @@ function field_attach_delete_revision($entity_type, $entity) {
$storages[$field['storage']['type']][$field_id] = $field_id;
}
- // Field storage backends delete their data.
+ // Field storage back-ends delete their data.
foreach ($storages as $storage => $fields) {
$storage_info = field_info_storage_types($storage);
module_invoke($storage_info['module'], 'field_storage_delete_revision', $entity_type, $entity, $fields);
diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc
index 280f778..9a43176 100644
--- a/modules/field/field.form.inc
+++ b/modules/field/field.form.inc
@@ -230,7 +230,7 @@ function field_multiple_value_form($field, $instance, $langcode, $items, &$form,
'#type' => 'weight',
'#title' => t('Weight for row @number', array('@number' => $delta + 1)),
'#title_display' => 'invisible',
- // Note: this 'delta' is the FAPI 'weight' element's property.
+ // Note: this 'delta' is the Field API 'weight' element's property.
'#delta' => $max,
'#default_value' => isset($items[$delta]['_weight']) ? $items[$delta]['_weight'] : $delta,
'#weight' => 100,
diff --git a/modules/field/field.install b/modules/field/field.install
index f6948e3..305f686 100644
--- a/modules/field/field.install
+++ b/modules/field/field.install
@@ -412,7 +412,7 @@ function field_update_7001() {
$fields = _update_7000_field_read_fields();
foreach ($fields as $field) {
// _update_7000_field_create_field() was broken in d7 RC2, and the fields
- // created during a d6 to d7 upgrade do not correcly store the 'index'
+ // created during a d6 to d7 upgrade do not correctly store the 'index'
// entry. See http://drupal.org/node/996160.
module_load_install($field['module']);
diff --git a/modules/field/field.module b/modules/field/field.module
index a593e51..6beaad3 100644
--- a/modules/field/field.module
+++ b/modules/field/field.module
@@ -105,7 +105,7 @@ require_once DRUPAL_ROOT . '/modules/field/field.form.inc';
* settings.
* - storage (array): A sub-array of key/value pairs identifying the storage
* backend to use for the for the field:
- * - type (string): The storage backend used by the field. Storage backends
+ * - type (string): The storage backend used by the field. Storage back-ends
* are defined by modules that implement hook_field_storage_info().
* - module (string, read-only): The name of the module that implements the
* storage backend.
@@ -134,7 +134,7 @@ require_once DRUPAL_ROOT . '/modules/field/field.form.inc';
* used with this bundle. For example, the description will be the help
* text of Form API elements for this instance.
* - required (integer): TRUE if a value for this field is required when used
- * with this bundle, FALSE otherwise. Currently, required-ness is only
+ * with this bundle, FALSE otherwise. Currently, required is only
* enforced during Form API operations, not by field_attach_load(),
* field_attach_insert(), or field_attach_update().
* - default_value_function (string): The name of the function, if any, that
@@ -441,7 +441,7 @@ function field_associate_fields($module) {
->condition('type', array_keys($field_types))
->execute();
}
- // Associate storage backends.
+ // Associate storage back-ends.
$storage_types = (array) module_invoke($module, 'field_storage_info');
if ($storage_types) {
db_update('field_config')
diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.module b/modules/field/modules/field_sql_storage/field_sql_storage.module
index 7ab4ee5..c7201dd 100644
--- a/modules/field/modules/field_sql_storage/field_sql_storage.module
+++ b/modules/field/modules/field_sql_storage/field_sql_storage.module
@@ -465,7 +465,7 @@ function field_sql_storage_field_storage_write($entity_type, $entity, $op, $fiel
$items = (array) $entity->{$field_name}[$langcode];
$delta_count = 0;
foreach ($items as $delta => $item) {
- // We now know we have someting to insert.
+ // We now know we have something to insert.
$do_insert = TRUE;
$record = array(
'entity_type' => $entity_type,
diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.test b/modules/field/modules/field_sql_storage/field_sql_storage.test
index 072739c..00181dc 100644
--- a/modules/field/modules/field_sql_storage/field_sql_storage.test
+++ b/modules/field/modules/field_sql_storage/field_sql_storage.test
@@ -5,7 +5,7 @@
* Tests for field_sql_storage.module.
*
* Field_sql_storage.module implements the default back-end storage plugin
- * for the Field Strage API.
+ * for the Field Storage API.
*/
/**
diff --git a/modules/field/modules/list/list.install b/modules/field/modules/list/list.install
index 2386f04..8c1c1eb 100644
--- a/modules/field/modules/list/list.install
+++ b/modules/field/modules/list/list.install
@@ -125,10 +125,10 @@ function _list_update_7001_extract_allowed_values($string, $position_keys) {
* Re-apply list_update_7001() for deleted fields.
*/
function list_update_7002() {
- // See http://drupal.org/node/1022924: list_update_7001() intitally
+ // See http://drupal.org/node/1022924: list_update_7001() initially
// overlooked deleted fields, which then caused fatal errors when the fields
// were being purged.
- // list_update_7001() has the required checks to ensure it is reentrant, so
+ // list_update_7001() has the required checks to ensure it is re-entrant, so
// it can simply be executed once more..
list_update_7001();
}
diff --git a/modules/field/modules/list/list.module b/modules/field/modules/list/list.module
index 634c134..6d41878 100644
--- a/modules/field/modules/list/list.module
+++ b/modules/field/modules/list/list.module
@@ -239,7 +239,7 @@ function list_allowed_values($field, $instance = NULL, $entity_type = NULL, $ent
$function = $field['settings']['allowed_values_function'];
// If $cacheable is FALSE, then the allowed values are not statically
// cached. See list_test_dynamic_values_callback() for an example of
- // generating dynamic and uncached values.
+ // generating dynamic and un-cached values.
$cacheable = TRUE;
if (!empty($function) && function_exists($function)) {
$values = $function($field, $instance, $entity_type, $entity, $cacheable);
diff --git a/modules/field/modules/list/tests/list.test b/modules/field/modules/list/tests/list.test
index 84de7e8..d5555aa 100644
--- a/modules/field/modules/list/tests/list.test
+++ b/modules/field/modules/list/tests/list.test
@@ -245,7 +245,7 @@ class ListFieldUITestCase extends FieldTestCase {
// Non-integer keys.
$this->assertAllowedValuesInput("1.1|One", 'keys must be integers', 'Non integer keys are rejected.');
$this->assertAllowedValuesInput("abc|abc", 'keys must be integers', 'Non integer keys are rejected.');
- // Mixed list of keyed and unkeyed values.
+ // Mixed list of keyed and un-keyed values.
$this->assertAllowedValuesInput("Zero\n1|One", 'invalid input', 'Mixed lists are rejected.');
// Create a node with actual data for the field.
@@ -380,7 +380,7 @@ class ListFieldUITestCase extends FieldTestCase {
}
/**
- * List (boolen) : test 'On/Off' values input.
+ * List (boolean) : test 'On/Off' values input.
*/
function testListAllowedValuesBoolean() {
$this->field_name = 'field_list_boolean';
diff --git a/modules/field/modules/number/number.module b/modules/field/modules/number/number.module
index 6046544..149c833 100644
--- a/modules/field/modules/number/number.module
+++ b/modules/field/modules/number/number.module
@@ -157,7 +157,7 @@ function number_field_validate($entity_type, $entity, $field, $instance, $langco
function number_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) {
if ($field['type'] == 'number_decimal') {
// Let PHP round the value to ensure consistent behavior across storage
- // backends.
+ // back-ends.
foreach ($items as $delta => $item) {
if (isset($item['value'])) {
$items[$delta]['value'] = round($item['value'], $field['settings']['scale']);
@@ -363,7 +363,7 @@ function number_field_widget_form(&$form, &$form_state, $field, $instance, $lang
}
/**
- * FAPI validation of an individual number element.
+ * Field API validation of an individual number element.
*/
function number_field_widget_validate($element, &$form_state) {
$field = field_widget_field($element, $form_state);
diff --git a/modules/field/modules/options/options.module b/modules/field/modules/options/options.module
index 3862ba7..23ee254 100644
--- a/modules/field/modules/options/options.module
+++ b/modules/field/modules/options/options.module
@@ -266,7 +266,7 @@ function _options_get_options($field, $instance, $properties, $entity_type, $ent
*/
function _options_prepare_options(&$options, $properties) {
foreach ($options as $value => $label) {
- // Recurse for optgroups.
+ // Recursion for optgroups.
if (is_array($label)) {
_options_prepare_options($options[$value], $properties);
}
@@ -336,7 +336,7 @@ function _options_form_to_storage($element) {
*
* @param $array
* The array to be transposed. It must be at least two-dimensional, and
- * the subarrays must all have the same keys or behavior is undefined.
+ * the sub-arrays must all have the same keys or behavior is undefined.
* @return
* The transposed array.
*/
diff --git a/modules/field/modules/options/options.test b/modules/field/modules/options/options.test
index 7183311..733f1ba 100644
--- a/modules/field/modules/options/options.test
+++ b/modules/field/modules/options/options.test
@@ -180,7 +180,7 @@ class OptionsWidgetsTestCase extends FieldTestCase {
$this->drupalPost(NULL, $edit, t('Save'));
$this->assertText('this field cannot hold more than 2 values', 'Validation error was displayed.');
- // Submit form: uncheck all options.
+ // Submit form: un-check all options.
$edit = array(
"card_2[$langcode][0]" => FALSE,
"card_2[$langcode][1]" => FALSE,
@@ -260,7 +260,7 @@ class OptionsWidgetsTestCase extends FieldTestCase {
$this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit');
// A non-required field has a 'none' option.
$this->assertTrue($this->xpath('//select[@id=:id]//option[@value="_none" and text()=:label]', array(':id' => 'edit-card-1-' . $langcode, ':label' => t('- None -'))), 'A non-required select list has a "None" choice.');
- // Submit form: Unselect the option.
+ // Submit form: Un-select the option.
$edit = array("card_1[$langcode]" => '_none');
$this->drupalPost('test-entity/manage/' . $entity->ftid . '/edit', $edit, t('Save'));
$this->assertFieldValues($entity_init, 'card_1', $langcode, array());
@@ -290,7 +290,7 @@ class OptionsWidgetsTestCase extends FieldTestCase {
$this->assertNoOptionSelected("edit-card-1-$langcode", 1);
$this->assertNoOptionSelected("edit-card-1-$langcode", 2);
- // Submit form: Unselect the option.
+ // Submit form: Un-select the option.
$edit = array("card_1[$langcode]" => '_none');
$this->drupalPost('test-entity/manage/' . $entity->ftid . '/edit', $edit, t('Save'));
$this->assertFieldValues($entity_init, 'card_1', $langcode, array());
@@ -352,7 +352,7 @@ class OptionsWidgetsTestCase extends FieldTestCase {
$this->drupalPost(NULL, $edit, t('Save'));
$this->assertText('this field cannot hold more than 2 values', 'Validation error was displayed.');
- // Submit form: uncheck all options.
+ // Submit form: un-check all options.
$edit = array("card_2[$langcode][]" => array());
$this->drupalPost(NULL, $edit, t('Save'));
$this->assertFieldValues($entity_init, 'card_2', $langcode, array());
@@ -407,7 +407,7 @@ class OptionsWidgetsTestCase extends FieldTestCase {
$this->assertNoOptionSelected("edit-card-2-$langcode", 1);
$this->assertNoOptionSelected("edit-card-2-$langcode", 2);
- // Submit form: Unselect the option.
+ // Submit form: Un-select the option.
$edit = array("card_2[$langcode][]" => array('_none' => '_none'));
$this->drupalPost('test-entity/manage/' . $entity->ftid . '/edit', $edit, t('Save'));
$this->assertFieldValues($entity_init, 'card_2', $langcode, array());
@@ -449,7 +449,7 @@ class OptionsWidgetsTestCase extends FieldTestCase {
$this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit');
$this->assertFieldChecked("edit-bool-$langcode");
- // Submit form: uncheck the option.
+ // Submit form: un-check the option.
$edit = array("bool[$langcode]" => FALSE);
$this->drupalPost(NULL, $edit, t('Save'));
$this->assertFieldValues($entity_init, 'bool', $langcode, array(1));
diff --git a/modules/field/modules/text/text.js b/modules/field/modules/text/text.js
index e8e270a..26251fe 100644
--- a/modules/field/modules/text/text.js
+++ b/modules/field/modules/text/text.js
@@ -2,7 +2,7 @@
(function ($) {
/**
- * Auto-hide summary textarea if empty and show hide and unhide links.
+ * Auto-hide summary textarea if empty and show hide and un-hide links.
*/
Drupal.behaviors.textSummary = {
attach: function (context, settings) {
diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module
index 68fc3cb..dea84c2 100644
--- a/modules/field/modules/text/text.module
+++ b/modules/field/modules/text/text.module
@@ -311,7 +311,7 @@ function text_field_formatter_view($entity_type, $entity, $field, $instance, $la
* The sanitized string.
*/
function _text_sanitize($instance, $langcode, $item, $column) {
- // If the value uses a cacheable text format, text_field_load() precomputes
+ // If the value uses a cacheable text format, text_field_load() pre-computes
// the sanitized string.
if (isset($item["safe_$column"])) {
return $item["safe_$column"];
@@ -335,7 +335,7 @@ function _text_sanitize($instance, $langcode, $item, $column) {
* split it up to prevent parse errors.
* If the line break filter is present then we treat newlines embedded in
* $text as line breaks.
- * If the htmlcorrector filter is present, it will be run on the generated
+ * If the HTML-corrector filter is present, it will be run on the generated
* summary (if different from the incoming $text).
* @param $size
* The desired character length of the summary. If omitted, the default
@@ -436,7 +436,7 @@ function text_summary($text, $format = NULL, $size = NULL) {
}
}
- // If the htmlcorrector filter is present, apply it to the generated summary.
+ // If the HTML-corrector filter is present, apply it to the generated summary.
if (isset($filters['filter_htmlcorrector'])) {
$summary = _filter_htmlcorrector($summary);
}
diff --git a/modules/field/modules/text/text.test b/modules/field/modules/text/text.test
index 2f14738..45ab595 100644
--- a/modules/field/modules/text/text.test
+++ b/modules/field/modules/text/text.test
@@ -328,7 +328,7 @@ class TextSummaryTestCase extends DrupalWebTestCase {
"
\nHi\n
\n
\nfolks\n \n!\n
",
);
- // And using a text format WITH the line-break and htmlcorrector filters.
+ // And using a text format WITH the line-break and HTML-corrector filters.
$expected_lb = array(
"
\nHi\n
\n
\nfolks\n \n!\n
",
"",
diff --git a/modules/field/tests/field.test b/modules/field/tests/field.test
index b279d6a..98560dc 100644
--- a/modules/field/tests/field.test
+++ b/modules/field/tests/field.test
@@ -282,13 +282,13 @@ class FieldAttachStorageTestCase extends FieldAttachTestCase {
}
/**
- * Test saving and loading fields using different storage backends.
+ * Test saving and loading fields using different storage back-ends.
*/
function testFieldAttachSaveLoadDifferentStorage() {
$entity_type = 'test_entity';
$langcode = LANGUAGE_NONE;
- // Create two fields using different storage backends, and their instances.
+ // Create two fields using different storage back-ends, and their instances.
$fields = array(
array(
'field_name' => 'field_1',
@@ -1249,7 +1249,7 @@ class FieldInfoTestCase extends FieldTestCase {
}
/**
- * Test that field types and field definitions are correcly cached.
+ * Test that field types and field definitions are correctly cached.
*/
function testFieldInfo() {
// Test that field_test module's fields, widgets, and formatters show up.
@@ -1474,7 +1474,7 @@ class FieldInfoTestCase extends FieldTestCase {
);
field_create_instance($instance_definition);
- // Disable coment module. This clears field_info cache.
+ // Disable comment module. This clears field_info cache.
module_disable(array('comment'));
$this->assertNull(field_info_instance('comment', 'field', 'comment_node_article'), 'No instances are returned on disabled entity types.');
}
@@ -1752,7 +1752,7 @@ class FieldFormTestCase extends FieldTestCase {
$this->assertFieldByName("{$this->field_name}[$langcode][0][value]", '', 'Widget 1 is displayed');
$this->assertFieldByName("{$this->field_name}[$langcode][1][value]", '', 'New widget is displayed');
$this->assertNoField("{$this->field_name}[$langcode][2][value]", 'No extraneous widget is displayed');
- // TODO : check that non-field inpurs are preserved ('title')...
+ // TODO : check that non-field inputs are preserved ('title')...
// Yet another time so that we can play with more values -> 3 widgets.
$this->drupalPost(NULL, array(), t('Add another item'));
@@ -1814,7 +1814,7 @@ class FieldFormTestCase extends FieldTestCase {
* Tests widget handling of multiple required radios.
*/
function testFieldFormMultivalueWithRequiredRadio() {
- // Create a multivalue test field.
+ // Create a multi-value test field.
$this->field = $this->field_unlimited;
$this->field_name = $this->field['field_name'];
$this->instance['field_name'] = $this->field_name;
@@ -2021,7 +2021,7 @@ class FieldFormTestCase extends FieldTestCase {
}
/**
- * Tests Field API form integration within a subform.
+ * Tests Field API form integration within a sub-form.
*/
function testNestedFieldForm() {
// Add two instances on the 'test_bundle'
@@ -2122,7 +2122,7 @@ class FieldFormTestCase extends FieldTestCase {
$this->assertFieldByName('entity_2[field_unlimited][und][1][value]', 14, 'Entity 2: field_unlimited value 1 appears correctly is the form.');
$this->assertFieldByName('entity_2[field_unlimited][und][2][value]', 15, 'Entity 2: field_unlimited value 2 appears correctly is the form.');
$this->assertFieldByName('entity_2[field_unlimited][und][3][value]', '', 'Entity 2: an empty widget was added for field_unlimited value 3.');
- // Save the form and check values are saved correclty.
+ // Save the form and check values are saved correctly.
$this->drupalPost(NULL, array(), t('Save'));
field_cache_clear();
$this->assertFieldValues($entity_1, 'field_unlimited', LANGUAGE_NONE, array(3, 2));
@@ -2788,7 +2788,7 @@ class FieldCrudTestCase extends FieldTestCase {
* @param $field_definition
* A field definition.
* @param $modules
- * An aray of module names. The field will be tested to be inactive as long
+ * An array of module names. The field will be tested to be inactive as long
* as any of those modules is disabled.
*/
function _testActiveHelper($field_definition, $modules) {
@@ -3045,9 +3045,9 @@ class FieldInstanceCrudTestCase extends FieldTestCase {
}
/**
- * Unit test class for the multilanguage fields logic.
+ * Unit test class for the multi-language fields logic.
*
- * The following tests will check the multilanguage logic of _field_invoke() and
+ * The following tests will check the multi-language logic of _field_invoke() and
* that only the correct values are returned by field_available_languages().
*/
class FieldTranslationsTestCase extends FieldTestCase {
@@ -3121,7 +3121,7 @@ class FieldTranslationsTestCase extends FieldTestCase {
}
/**
- * Test the multilanguage logic of _field_invoke().
+ * Test the multi-language logic of _field_invoke().
*/
function testFieldInvoke() {
// Enable field translations for the entity.
@@ -3159,7 +3159,7 @@ class FieldTranslationsTestCase extends FieldTestCase {
}
/**
- * Test the multilanguage logic of _field_invoke_multiple().
+ * Test the multi-language logic of _field_invoke_multiple().
*/
function testFieldInvokeMultiple() {
// Enable field translations for the entity.
@@ -3331,7 +3331,7 @@ class FieldTranslationsTestCase extends FieldTestCase {
foreach ($instances as $instance) {
$field_name = $instance['field_name'];
$langcode = $display_language[$field_name];
- // As the requested language was not assinged to any field, if the
+ // As the requested language was not assigned to any field, if the
// returned language is defined for the current field, core fallback rules
// were successfully applied.
$this->assertTrue(isset($entity->{$field_name}[$langcode]) && $langcode != $requested_language, format_string('The display language for the field %field_name is %language.', array('%field_name' => $field_name, '%language' => $langcode)));
diff --git a/modules/field/tests/field_test.entity.inc b/modules/field/tests/field_test.entity.inc
index c6686eb..4f88c2b 100644
--- a/modules/field/tests/field_test.entity.inc
+++ b/modules/field/tests/field_test.entity.inc
@@ -242,7 +242,7 @@ function field_test_create_stub_entity($id = 1, $vid = 1, $bundle = 'test_bundle
* The loaded entity.
*/
function field_test_entity_test_load($ftid, $ftvid = NULL) {
- // Load basic strucure.
+ // Load basic structure.
$query = db_select('test_entity', 'fte', array())
->condition('fte.ftid', $ftid);
diff --git a/modules/field/tests/field_test.field.inc b/modules/field/tests/field_test.field.inc
index 1cab773..91170cf 100644
--- a/modules/field/tests/field_test.field.inc
+++ b/modules/field/tests/field_test.field.inc
@@ -225,7 +225,7 @@ function field_test_widget_multiple_validate($element, &$form_state) {
* Implements hook_field_widget_error().
*/
function field_test_field_widget_error($element, $error, $form, &$form_state) {
- // @todo No easy way to differenciate widget types, we should receive it as a
+ // @todo No easy way to differentiate widget types, we should receive it as a
// parameter.
if (isset($element['value'])) {
// Widget is test_field_widget.
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc
index 5d74a5c..53ff836 100644
--- a/modules/field_ui/field_ui.admin.inc
+++ b/modules/field_ui/field_ui.admin.inc
@@ -160,7 +160,7 @@ function field_ui_table_pre_render($elements) {
}
$target['children'][$name] = array('name' => $name, 'weight' => $row['weight']['#value']);
- // Add tabledrag indentation to the first row cell.
+ // Add table-drag indentation to the first row cell.
if ($depth = count($parents[$name])) {
$children = element_children($row);
$cell = current($children);
@@ -646,7 +646,7 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle
'data' => array('fields' => $js_fields, 'fieldWidgetTypes' => field_ui_widget_type_options()),
);
- // Add tabledrag behavior.
+ // Add table-drag behavior.
$form['#attached']['drupal_add_tabledrag'][] = array('field-overview', 'order', 'sibling', 'field-weight');
$form['#attached']['drupal_add_tabledrag'][] = array('field-overview', 'match', 'parent', 'field-parent', 'field-parent', 'field-name');
@@ -1222,7 +1222,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
$form['#attached']['js'][] = drupal_get_path('module', 'field_ui') . '/field_ui.js';
$form['#attached']['css'][] = drupal_get_path('module', 'field_ui') . '/field_ui.css';
- // Add tabledrag behavior.
+ // Add table-drag behavior.
$form['#attached']['drupal_add_tabledrag'][] = array('field-display-overview', 'order', 'sibling', 'field-weight');
$form['#attached']['drupal_add_tabledrag'][] = array('field-display-overview', 'match', 'parent', 'field-parent', 'field-parent', 'field-name');
@@ -1271,7 +1271,7 @@ function field_ui_display_overview_multistep_submit($form, &$form_state) {
}
/**
- * Ajax handler for multistep buttons on the 'Manage display' screen.
+ * Ajax handler for multi-step buttons on the 'Manage display' screen.
*/
function field_ui_display_overview_multistep_js($form, &$form_state) {
$trigger = $form_state['triggering_element'];
@@ -1443,7 +1443,7 @@ function field_ui_field_type_options() {
$field_type_options = array();
foreach ($field_types as $name => $field_type) {
// Skip field types which have no widget types, or should not be add via
- // uesr interface.
+ // user interface.
if (field_ui_widget_type_options($name) && empty($field_type['no_ui'])) {
$options[$name] = $field_type['label'];
}
@@ -2099,7 +2099,7 @@ function field_ui_get_destinations($destinations) {
}
/**
- * Returns the next redirect path in a multipage sequence.
+ * Returns the next redirect path in a multi-page sequence.
*/
function field_ui_next_destination($entity_type, $bundle) {
$destinations = !empty($_REQUEST['destinations']) ? $_REQUEST['destinations'] : array();
diff --git a/modules/field_ui/field_ui.js b/modules/field_ui/field_ui.js
index 65b28d0..6f8d9c0 100644
--- a/modules/field_ui/field_ui.js
+++ b/modules/field_ui/field_ui.js
@@ -15,7 +15,7 @@ Drupal.behaviors.fieldUIFieldOverview = {
Drupal.fieldUIFieldOverview = {
/**
- * Implements dependent select dropdowns on the 'Manage fields' screen.
+ * Implements dependent select drop-downs on the 'Manage fields' screen.
*/
attachUpdateSelects: function(table, settings) {
var widgetTypes = settings.fieldWidgetTypes;
@@ -36,7 +36,7 @@ Drupal.fieldUIFieldOverview = {
this.targetSelect.fieldUIPopulateOptions(options);
});
- // Trigger change on initial pageload to get the right widget options
+ // Trigger change on initial page load to get the right widget options
// when field type comes pre-selected (on failed validation).
$(this).trigger('change', false);
});
@@ -66,7 +66,7 @@ Drupal.fieldUIFieldOverview = {
}
});
- // Trigger change on initial pageload to get the right widget options
+ // Trigger change on initial page load to get the right widget options
// and label when field type comes pre-selected (on failed validation).
$(this).trigger('change', false);
});
@@ -116,7 +116,7 @@ Drupal.fieldUIOverview = {
attach: function (table, rowsData, rowHandlers) {
var tableDrag = Drupal.tableDrag[table.id];
- // Add custom tabledrag callbacks.
+ // Add custom table-drag callbacks.
tableDrag.onDrop = this.onDrop;
tableDrag.row.prototype.onSwap = this.onSwap;
diff --git a/modules/field_ui/field_ui.test b/modules/field_ui/field_ui.test
index 21767d6..abf1023 100644
--- a/modules/field_ui/field_ui.test
+++ b/modules/field_ui/field_ui.test
@@ -621,7 +621,7 @@ class FieldUIManageDisplayTestCase extends FieldUITestCase {
}
/**
- * Asserts that a string is (not) found in the rendered nodein a view mode.
+ * Asserts that a string is (not) found in the rendered node in a view mode.
*
* This helper function is used by assertNodeViewText() and
* assertNodeViewNoText().
diff --git a/modules/file/file.js b/modules/file/file.js
index fffec6b..bc28047 100644
--- a/modules/file/file.js
+++ b/modules/file/file.js
@@ -110,8 +110,8 @@ Drupal.file = Drupal.file || {
// working with. Filter out fields that are already disabled so that they
// do not get enabled when we re-enable these fields at the end of behavior
// processing. Re-enable in a setTimeout set to a relatively short amount
- // of time (1 second). All the other mousedown handlers (like Drupal's Ajax
- // behaviors) are excuted before any timeout functions are called, so we
+ // of time (1 second). All the other mousedown handlers (like Drupal`s Ajax
+ // behaviors) are executed before any timeout functions are called, so we
// don't have to worry about the fields being re-enabled too soon.
// @todo If the previous sentence is true, why not set the timeout to 0?
var $fieldsToTemporarilyDisable = $('div.form-managed-file input.form-file').not($enabledFields).not(':disabled');
diff --git a/modules/file/file.module b/modules/file/file.module
index a4a7f03..eb7e446 100644
--- a/modules/file/file.module
+++ b/modules/file/file.module
@@ -231,7 +231,7 @@ function file_file_download($uri, $field_type = 'file') {
*
* This rebuilds the form element for a particular field item. As long as the
* form processing is properly encapsulated in the widget element the form
- * should rebuild correctly using FAPI without the need for additional callbacks
+ * should rebuild correctly using Field API without the need for additional callbacks
* or processing.
*/
function file_ajax_upload() {
@@ -324,14 +324,14 @@ function file_ajax_progress($key) {
*
* @return
* A string indicating which upload progress system is available. Either "apc"
- * or "uploadprogress". If neither are available, returns FALSE.
+ * or "upload progress". If neither are available, returns FALSE.
*/
function file_progress_implementation() {
static $implementation;
if (!isset($implementation)) {
$implementation = FALSE;
- // We prefer the PECL extension uploadprogress because it supports multiple
+ // We prefer the PECL extension upload progress because it supports multiple
// simultaneous uploads. APC only supports one at a time.
if (extension_loaded('uploadprogress')) {
$implementation = 'uploadprogress';
@@ -416,7 +416,7 @@ function file_managed_file_process($element, &$form_state, $form) {
'#type' => 'hidden',
'#value' => $upload_progress_key,
'#attributes' => array('class' => array('file-progress')),
- // Uploadprogress extension requires this field to be at the top of the
+ // Upload progress extension requires this field to be at the top of the
// form.
'#weight' => -20,
);
@@ -426,7 +426,7 @@ function file_managed_file_process($element, &$form_state, $form) {
'#type' => 'hidden',
'#value' => $upload_progress_key,
'#attributes' => array('class' => array('file-progress')),
- // Uploadprogress extension requires this field to be at the top of the
+ // Upload progress extension requires this field to be at the top of the
// form.
'#weight' => -20,
);
@@ -503,9 +503,9 @@ function file_managed_file_value(&$element, $input = FALSE, $form_state = NULL)
}
else {
// Check for #filefield_value_callback values.
- // Because FAPI does not allow multiple #value_callback values like it
+ // Because Field API does not allow multiple #value_callback values like it
// does for #element_validate and #process, this fills the missing
- // functionality to allow File fields to be extended through FAPI.
+ // functionality to allow File fields to be extended through Field API.
if (isset($element['#file_value_callbacks'])) {
foreach ($element['#file_value_callbacks'] as $callback) {
$callback($element, $input, $form_state);
@@ -555,7 +555,7 @@ function file_managed_file_value(&$element, $input = FALSE, $form_state = NULL)
*/
function file_managed_file_validate(&$element, &$form_state) {
// If referencing an existing file, only allow if there are existing
- // references. This prevents unmanaged files from being deleted if this
+ // references. This prevents un-managed files from being deleted if this
// item were to be deleted.
$clicked_button = end($form_state['triggering_element']['#parents']);
if ($clicked_button != 'remove_button' && !empty($element['fid']['#value'])) {
@@ -630,7 +630,7 @@ function file_managed_file_submit($form, &$form_state) {
* Saves any files that have been uploaded into a managed_file element.
*
* @param $element
- * The FAPI element whose values are being saved.
+ * The Field API element whose values are being saved.
*
* @return
* The file object representing the file that was saved, or FALSE if no file
diff --git a/modules/file/tests/file.test b/modules/file/tests/file.test
index 0f6a578..a6b3fe2 100644
--- a/modules/file/tests/file.test
+++ b/modules/file/tests/file.test
@@ -726,7 +726,7 @@ class FileFieldWidgetTestCase extends FileFieldTestCase {
$this->drupalGet(file_create_url($comment_file->uri));
$this->assertResponse(403, 'Confirmed that access is denied for the file without the needed permission.');
- // Unpublishes node.
+ // Unpublished nodes.
$this->drupalLogin($this->admin_user);
$edit = array(
'status' => FALSE,
@@ -967,12 +967,12 @@ class FileFieldValidateTestCase extends FileFieldTestCase {
field_delete_field($field_name);
$this->createFileField($field_name, $type_name, array('cardinality' => FIELD_CARDINALITY_UNLIMITED), array('required' => '1'));
- // Try to post a new node without uploading a file in the multivalue field.
+ // Try to post a new node without uploading a file in the multi-value field.
$edit = array('title' => $this->randomName());
$this->drupalPost('node/add/' . $type_name, $edit, t('Save'));
$this->assertRaw(t('!title field is required.', array('!title' => $instance['label'])), 'Node save failed when required multiple value file field was empty.');
- // Create a new node with the uploaded file into the multivalue field.
+ // Create a new node with the uploaded file into the multi-value field.
$nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
$node = node_load($nid, NULL, TRUE);
$node_file = (object) $node->{$field_name}[LANGUAGE_NONE][0];
@@ -1191,7 +1191,7 @@ class FileTokenReplaceTestCase extends FileFieldTestCase {
$instance = field_info_instance('node', $field_name, $type_name);
$test_file = $this->getTestFile('text');
- // Coping a file to test uploads with non-latin filenames.
+ // Coping a file to test uploads with non-latin file names.
$filename = drupal_dirname($test_file->uri) . '/текстовый файл.txt';
$test_file = file_copy($test_file, $filename);
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 5c2b8c9..ca07a11 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -842,7 +842,7 @@ function check_markup($text, $format_id = NULL, $langcode = '', $cache = FALSE)
function filter_process_format($element) {
global $user;
- // Ensure that children appear as subkeys of this element.
+ // Ensure that children appear as sub-keys of this element.
$element['#tree'] = TRUE;
$blacklist = array(
// Make form_builder() regenerate child properties.
@@ -850,7 +850,7 @@ function filter_process_format($element) {
'#id',
'#name',
// Do not copy this #process function to prevent form_builder() from
- // recursing infinitely.
+ // recursion infinitely.
'#process',
// Description is handled by theme_text_format_wrapper().
'#description',
@@ -1442,7 +1442,7 @@ function _filter_url_settings($form, &$form_state, $filter, $format, $defaults)
* expression that could possibly match all of the cases in one pass.
*/
function _filter_url($text, $filter) {
- // Tags to skip and not recurse into.
+ // Tags to skip and not recursively into.
$ignore_tags = 'a|script|style|code|pre';
// Pass length to regexp callback.
@@ -1608,7 +1608,7 @@ function _filter_url_parse_partial_links($match) {
* An array containing matches to replace from preg_replace_callback(),
* whereas $match[1] is expected to contain the content to be filtered.
* @param $escape
- * (optional) A Boolean indicating whether to escape (TRUE) or unescape
+ * (optional) A Boolean indicating whether to escape (TRUE) or un-escape
* comments (FALSE). Defaults to NULL, indicating neither. If TRUE, statically
* cached $comments are reset.
*/
@@ -1623,7 +1623,7 @@ function _filter_url_escape_comments($match, $escape = NULL) {
return;
}
- // Replace all HTML coments with a '' placeholder.
+ // Replace all HTML comments with a '' placeholder.
if ($mode) {
$content = $match[1];
$hash = md5($content);
diff --git a/modules/filter/filter.test b/modules/filter/filter.test
index fe9cfc3..e3c00c7 100644
--- a/modules/filter/filter.test
+++ b/modules/filter/filter.test
@@ -1044,7 +1044,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase {
$f = filter_xss("", array('img'));
$this->assertNoNormalized($f, 'focus', 'HTML filter attributes removal evasion -- breaking with nulls.');
- // Only whitelisted scheme names allowed in attributes.
+ // Only white-listed scheme names allowed in attributes.
$f = filter_xss('', array('img'));
$this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing -- no evasion.');
@@ -1142,7 +1142,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase {
* makes HTML filter completely ineffective.
*
* @todo Class, id, name and xmlns should be added to disallowed attributes,
- * or better a whitelist approach should be used for that too.
+ * or better a white list approach should be used for that too.
*/
function testHtmlFilter() {
// Setup dummy filter object.
diff --git a/modules/forum/forum.test b/modules/forum/forum.test
index bc68a3e..8b3045f 100644
--- a/modules/forum/forum.test
+++ b/modules/forum/forum.test
@@ -456,7 +456,7 @@ class ForumTestCase extends DrupalWebTestCase {
);
$tid = $forum['tid'];
- // Create the forum topic, preselecting the forum ID via a URL parameter.
+ // Create the forum topic, pre-selecting the forum ID via a URL parameter.
$this->drupalPost('node/add/forum/' . $tid, $edit, t('Save'));
$type = t('Forum topic');
@@ -493,7 +493,7 @@ class ForumTestCase extends DrupalWebTestCase {
* @param $admin
* Boolean to indicate whether the user can 'access administration pages'.
* @param $response
- * The exptected HTTP response code.
+ * The expected HTTP response code.
*/
private function verifyForums($node_user, $node, $admin, $response = 200) {
$response2 = ($admin) ? 200 : 403;
@@ -592,7 +592,7 @@ class ForumTestCase extends DrupalWebTestCase {
* Generates forum topics to test the display of an active forum block.
*
* @param array $forum
- * The foorum array (a row from taxonomy_term_data table).
+ * The forum array (a row from taxonomy_term_data table).
*/
private function generateForumTopics($forum) {
$this->nids = array();
diff --git a/modules/help/help.test b/modules/help/help.test
index da12ccc..5a226f4 100644
--- a/modules/help/help.test
+++ b/modules/help/help.test
@@ -38,7 +38,7 @@ class HelpTestCase extends DrupalWebTestCase {
}
/**
- * Logs in users, creates dblog events, and tests dblog functionality.
+ * Logs in users, creates db log events, and tests db log functionality.
*/
function testHelp() {
// Login the admin user.
diff --git a/modules/image/image.test b/modules/image/image.test
index 2387314..2ed9a8d 100644
--- a/modules/image/image.test
+++ b/modules/image/image.test
@@ -254,7 +254,7 @@ class ImageStylesPathAndUrlTestCase extends DrupalWebTestCase {
$this->assertEqual($this->drupalGetHeader('Cache-Control'), 'no-cache, must-revalidate, post-check=0, pre-check=0', 'Cache-Control header was set to prevent caching.');
$this->assertEqual($this->drupalGetHeader('X-Image-Owned-By'), 'image_module_test', 'Expected custom header has been added.');
- // Make sure that a second request to the already existing derivate works
+ // Make sure that a second request to the already existing derivative works
// too.
$this->drupalGet($generate_url);
$this->assertResponse(200, 'Image was generated at the URL.');
diff --git a/modules/locale/locale.css b/modules/locale/locale.css
index 38112b5..f412b20 100644
--- a/modules/locale/locale.css
+++ b/modules/locale/locale.css
@@ -12,7 +12,7 @@
margin: 0.1em;
/**
* In Opera 9, DOM elements with the property of "overflow: auto"
- * will partially hide its contents with unnecessary scrollbars when
+ * will partially hide its contents with unnecessary scroll-bars when
* its immediate child is floated without an explicit width set.
*/
width: 15em;
diff --git a/modules/locale/locale.install b/modules/locale/locale.install
index b4db757..1302da7 100644
--- a/modules/locale/locale.install
+++ b/modules/locale/locale.install
@@ -38,7 +38,7 @@ function locale_update_7000() {
db_drop_index('locales_source', 'source');
db_add_index('locales_source', 'source_context', array(array('source', 30), 'context'));
- // Also drop the 'textgroup_location' index added by the i18nstrings module
+ // Also drop the 'textgroup_location' index added by the i18n-strings module
// of the i18n project, which prevents the below schema update from running.
if (db_index_exists('locales_source', 'textgroup_location')) {
db_drop_index('locales_source', 'textgroup_location');
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 768fead..35c56f4 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -8,7 +8,7 @@
* When enabled, multiple languages can be set up. The site interface
* can be displayed in different languages, as well as nodes can have languages
* assigned. The setup of languages and translations is completely web based.
- * Gettext portable object files are supported.
+ * Get text portable object files are supported.
*/
// ---------------------------------------------------------------------------------
@@ -1069,7 +1069,7 @@ function locale_url_outbound_alter(&$path, &$options, $original_path) {
include_once DRUPAL_ROOT . '/includes/language.inc';
foreach (language_types_configurable() as $type) {
- // Get URL rewriter callbacks only from enabled language providers.
+ // Get URL re-writer callbacks only from enabled language providers.
$negotiation = variable_get("language_negotiation_$type", array());
foreach ($negotiation as $id => $provider) {
diff --git a/modules/locale/locale.test b/modules/locale/locale.test
index 9ffec9f..bddcafa 100644
--- a/modules/locale/locale.test
+++ b/modules/locale/locale.test
@@ -6,7 +6,7 @@
*
* The test file includes:
* - a functional test for the language configuration forms;
- * - functional tests for the translation functionalities, including searching;
+ * - functional tests for the translation functionality, including searching;
* - a functional test for the PO files import feature, including validation;
* - functional tests for translations and templates export feature;
* - functional tests for the uninstall process;
@@ -2456,7 +2456,7 @@ class LocaleUILanguageNegotiationTest extends DrupalWebTestCase {
locale_add_language($language_browser_fallback);
$languages = language_list();
- // Enable the path prefix for the default language: this way any unprefixed
+ // Enable the path prefix for the default language: this way any un-prefixed
// URL must have a valid fallback value.
$edit = array('prefix' => 'en');
$this->drupalPost('admin/config/regional/language/edit/en', $edit, t('Save language'));
@@ -2517,7 +2517,7 @@ class LocaleUILanguageNegotiationTest extends DrupalWebTestCase {
$link = (!empty($GLOBALS['conf']['clean_url'])) ? $langcode . '.example.com/admin' : $langcode . '.example.com/?q=admin';
// Test URL in another language.
- // Base path gives problems on the testbot, so $correct_link is hard-coded.
+ // Base path gives problems on the test bot, so $correct_link is hard-coded.
// @see UrlAlterFunctionalTest::assertUrlOutboundAlter (path.test).
$url = url('admin', array('language' => $languages[$langcode]));
$url_scheme = ($is_https) ? 'https://' : 'http://';
diff --git a/modules/menu/menu.admin.js b/modules/menu/menu.admin.js
index 4fa094e..5cac5fb 100644
--- a/modules/menu/menu.admin.js
+++ b/modules/menu/menu.admin.js
@@ -31,9 +31,9 @@ Drupal.menu_update_parent_list = function () {
success: function (options) {
// Save key of last selected element.
var selected = $('fieldset#edit-menu #edit-menu-parent :selected').val();
- // Remove all exisiting options from dropdown.
+ // Remove all existing options from drop-down.
$('fieldset#edit-menu #edit-menu-parent').children().remove();
- // Add new options to dropdown.
+ // Add new options to drop-down.
jQuery.each(options, function(index, value) {
$('fieldset#edit-menu #edit-menu-parent').append(
$('').val(index).text(value)
diff --git a/modules/menu/menu.test b/modules/menu/menu.test
index a9bdb5f..fa117b5 100644
--- a/modules/menu/menu.test
+++ b/modules/menu/menu.test
@@ -715,7 +715,7 @@ class MenuNodeTestCase extends DrupalWebTestCase {
// Assert that it is not possible to set the parent of the first node to itself or the second node.
$this->assertNoOption('edit-menu-parent', 'navigation:'. $item['mlid']);
$this->assertNoOption('edit-menu-parent', 'navigation:'. $child_item['mlid']);
- // Assert that unallowed Management menu is not available in options.
+ // Assert that un-allowed Management menu is not available in options.
$this->assertNoOption('edit-menu-parent', 'management:0');
}
diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc
index 55af667..2d72092 100644
--- a/modules/node/content_types.inc
+++ b/modules/node/content_types.inc
@@ -392,7 +392,7 @@ function node_node_type_update($info) {
*
* @param $type
* The node type to reset. The node type is passed back by reference with its
- * resetted values. If there is no module-defined info for this node type,
+ * re-setted values. If there is no module-defined info for this node type,
* then nothing happens.
*/
function node_type_reset($type) {
diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc
index 35f4c1d..1556f7d 100644
--- a/modules/node/node.admin.inc
+++ b/modules/node/node.admin.inc
@@ -246,7 +246,7 @@ function node_filter_form_submit($form, &$form_state) {
if (isset($form_state['values'][$filter]) && $form_state['values'][$filter] != '[any]') {
// Flatten the options array to accommodate hierarchical/nested options.
$flat_options = form_options_flatten($filters[$filter]['options']);
- // Only accept valid selections offered on the dropdown, block bad input.
+ // Only accept valid selections offered on the drop-down, block bad input.
if (isset($flat_options[$form_state['values'][$filter]])) {
$_SESSION['node_overview_filter'][] = array($filter, $form_state['values'][$filter]);
}
diff --git a/modules/node/node.api.php b/modules/node/node.api.php
index a83dee9..0ce2967 100644
--- a/modules/node/node.api.php
+++ b/modules/node/node.api.php
@@ -405,7 +405,7 @@ function hook_node_grants_alter(&$grants, $account, $op) {
* Add mass node operations.
*
* This hook enables modules to inject custom operations into the mass
- * operations dropdown found at admin/content, by associating a callback
+ * operations drop-down found at admin/content, by associating a callback
* function with the operation, which is called when the form is submitted. The
* callback function receives one initial argument, which is an array of the
* checked nodes.
@@ -413,7 +413,7 @@ function hook_node_grants_alter(&$grants, $account, $op) {
* @return
* An array of operations. Each operation is an associative array that may
* contain the following key-value pairs:
- * - label: (required) The label for the operation, displayed in the dropdown
+ * - label: (required) The label for the operation, displayed in the drop-down
* menu.
* - callback: (required) The function to call for the operation.
* - callback arguments: (optional) An array of additional arguments to pass
diff --git a/modules/node/node.install b/modules/node/node.install
index 76c2aec..6f4d88c 100644
--- a/modules/node/node.install
+++ b/modules/node/node.install
@@ -892,7 +892,7 @@ function node_update_7012() {
// throughout the upgrade process and we do not have an update counterpart
// for _update_7000_field_create_field(). Hence we are forced to update the
// 'field_config' table directly. This is a safe operation since it is
- // being performed while upgrading from D6. Perfoming the same operation
+ // being performed while upgrading from D6. Performing the same operation
// during a D7 update is highly discouraged.
db_update('field_config')
->fields(array('translatable' => 0))
diff --git a/modules/node/node.module b/modules/node/node.module
index dbb1a65..436ef9c 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -981,7 +981,7 @@ function node_object_prepare($node) {
// If this is a new node, fill in the default values.
if (!isset($node->nid) || isset($node->is_new)) {
foreach (array('status', 'promote', 'sticky') as $key) {
- // Multistep node forms might have filled in something already.
+ // Multi-step node forms might have filled in something already.
if (!isset($node->$key)) {
$node->$key = (int) in_array($key, $node_options);
}
@@ -2503,7 +2503,7 @@ function node_modules_uninstalled($modules) {
/**
* Implements hook_block_list_alter().
*
- * Check the content type specific visibilty settings. Remove the block if the
+ * Check the content type specific visibility settings. Remove the block if the
* visibility conditions are not met.
*/
function node_block_list_alter(&$blocks) {
@@ -3395,7 +3395,7 @@ function _node_query_node_access_alter($query, $type) {
if ($type == 'entity') {
// The original query looked something like:
// @code
- // SELECT nid FROM sometable s
+ // SELECT nid FROM some_table s
// INNER JOIN node_access na ON na.nid = s.nid
// WHERE ($node_access_conditions)
// @endcode
@@ -3416,7 +3416,7 @@ function _node_query_node_access_alter($query, $type) {
foreach ($tables as $nalias => $tableinfo) {
$table = $tableinfo['table'];
if (!($table instanceof SelectQueryInterface) && $table == $base_table) {
- // Set the subquery.
+ // Set the sub-query.
$subquery = db_select('node_access', 'na')
->fields('na', array('nid'));
@@ -3432,7 +3432,7 @@ function _node_query_node_access_alter($query, $type) {
}
}
- // Attach conditions to the subquery for nodes.
+ // Attach conditions to the sub-query for nodes.
if (count($grant_conditions->conditions())) {
$subquery->condition($grant_conditions);
}
@@ -3446,7 +3446,7 @@ function _node_query_node_access_alter($query, $type) {
}
$subquery->where("$nalias.$field = na.nid");
- // For an entity query, attach the subquery to entity conditions.
+ // For an entity query, attach the sub-query to entity conditions.
if ($type == 'entity') {
$node_conditions->exists($subquery);
}
@@ -3566,7 +3566,7 @@ function node_access_write_grants($node, $grants, $realm = NULL, $delete = TRUE)
}
/**
- * Flags or unflags the node access grants for rebuilding.
+ * Flags or un-flags the node access grants for rebuilding.
*
* If the argument isn't specified, the current value of the flag is returned.
* When the flag is set, a message is displayed to users with 'access
@@ -3672,7 +3672,7 @@ function node_access_rebuild($batch_mode = FALSE) {
/**
* Performs batch operation for node_access_rebuild().
*
- * This is a multistep operation: we go through all nodes by packs of 20. The
+ * This is a multi-step operation: we go through all nodes by packs of 20. The
* batch processing engine interrupts processing and sends progress feedback
* after 1 second execution time.
*
@@ -3681,7 +3681,7 @@ function node_access_rebuild($batch_mode = FALSE) {
*/
function _node_access_rebuild_batch_operation(&$context) {
if (empty($context['sandbox'])) {
- // Initiate multistep processing.
+ // Initiate multi-step processing.
$context['sandbox']['progress'] = 0;
$context['sandbox']['current_node'] = 0;
$context['sandbox']['max'] = db_query('SELECT COUNT(DISTINCT nid) FROM {node}')->fetchField();
@@ -3701,7 +3701,7 @@ function _node_access_rebuild_batch_operation(&$context) {
$context['sandbox']['current_node'] = $nid;
}
- // Multistep processing : report progress.
+ // Multi-step processing : report progress.
if ($context['sandbox']['progress'] != $context['sandbox']['max']) {
$context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
}
@@ -3999,7 +3999,7 @@ function node_assign_owner_action_form($context) {
$owner_name = db_query("SELECT name FROM {users} WHERE uid = :uid", array(':uid' => $context['owner_uid']))->fetchField();
}
- // Use dropdown for fewer than 200 users; textbox for more than that.
+ // Use drop-down for fewer than 200 users; text-box for more than that.
if (intval($count) < 200) {
$options = array();
$result = db_query("SELECT uid, name FROM {users} WHERE uid > 0 ORDER BY name");
diff --git a/modules/node/node.test b/modules/node/node.test
index 5c9118e..9ddfba2 100644
--- a/modules/node/node.test
+++ b/modules/node/node.test
@@ -633,7 +633,7 @@ class PageViewTestCase extends DrupalWebTestCase {
}
/**
- * Tests an anonymous and unpermissioned user attempting to edit the node.
+ * Tests an anonymous and not permitted user attempting to edit the node.
*/
function testPageView() {
// Create a node to view.
@@ -853,7 +853,7 @@ class NodePostSettingsTestCase extends DrupalWebTestCase {
*
* Create a node, enable the node_test module to ensure that extra data is
* added to the node->content array, then verify that the data appears on the
- * sitewide RSS feed at rss.xml.
+ * site-wide RSS feed at rss.xml.
*/
class NodeRSSContentTestCase extends DrupalWebTestCase {
public static function getInfo() {
@@ -1337,7 +1337,7 @@ class NodeSaveTestCase extends DrupalWebTestCase {
}
/**
- * Tests determing changes in hook_node_presave() and verifies the static node
+ * Tests determining changes in hook_node_presave() and verifies the static node
* load cache is cleared upon save.
*/
function testDeterminingChanges() {
@@ -1490,7 +1490,7 @@ class NodeTypeTestCase extends DrupalWebTestCase {
// Remove the body field.
$this->drupalPost('admin/structure/types/manage/bar/fields/body/delete', NULL, t('Delete'));
- // Resave the settings for this type.
+ // Re-save the settings for this type.
$this->drupalPost('admin/structure/types/manage/bar', array(), t('Save content type'));
// Check that the body field doesn't exist.
$this->drupalGet('node/add/bar');
@@ -1575,7 +1575,7 @@ class NodeTypePersistenceTestCase extends DrupalWebTestCase {
$this->assertNotIdentical($disabled, FALSE, 'Poll node type found in the database');
$this->assertEqual($disabled, 0, 'Poll node type is not disabled');
- // Check that poll node type (uncustomized) shows up.
+ // Check that poll node type (un-customized) shows up.
$this->drupalGet('node/add');
$this->assertText('poll', 'poll type is found on node/add');
@@ -1595,7 +1595,7 @@ class NodeTypePersistenceTestCase extends DrupalWebTestCase {
$this->drupalGet('node/add');
$this->assertNoText('poll', 'poll type is not found on node/add');
- // Reenable poll and check that the customization survived the module
+ // Re-enable poll and check that the customization survived the module
// disable.
$this->drupalPost('admin/modules', $poll_enable, t('Save configuration'));
$disabled = db_query('SELECT disabled FROM {node_type} WHERE type = :type', array(':type' => 'poll'))->fetchField();
@@ -1614,7 +1614,7 @@ class NodeTypePersistenceTestCase extends DrupalWebTestCase {
$this->drupalGet('node/add');
$this->assertNoText('poll', 'poll type is no longer found on node/add');
- // Reenable poll and check that the customization survived the module
+ // Re-enable poll and check that the customization survived the module
// uninstall.
$this->drupalPost('admin/modules', $poll_enable, t('Save configuration'));
$this->drupalGet('node/add');
diff --git a/modules/openid/openid.module b/modules/openid/openid.module
index a28f452..bf9f203 100644
--- a/modules/openid/openid.module
+++ b/modules/openid/openid.module
@@ -349,7 +349,7 @@ function openid_complete($response = array()) {
// The CanonicalID specified in the XRDS document must be used as the
// account key. We rely on the XRI proxy resolver to verify that the
// provider is authorized to respond on behalf of the specified
- // identifer (required per Extensible Resource Identifier (XRI)
+ // identifier (required per Extensible Resource Identifier (XRI)
// (XRI) Resolution Version 2.0, section 14.3):
if (!empty($service['claimed_id'])) {
$response['openid.claimed_id'] = $service['claimed_id'];
@@ -363,7 +363,7 @@ function openid_complete($response = array()) {
// OpenID Authentication, section 11.2:
// If the returned Claimed Identifier is different from the one sent
// to the OpenID Provider, we need to do discovery on the returned
- // identififer to make sure that the provider is authorized to
+ // identifier to make sure that the provider is authorized to
// respond on behalf of this.
if ($response_claimed_id != $claimed_id) {
$discovery = openid_discovery($response['openid.claimed_id']);
@@ -405,7 +405,7 @@ function openid_complete($response = array()) {
* which must contain following keys:
* - 'services' (required) an array of discovered services (including OpenID
* version, endpoint URI, etc).
- * - 'claimed_id' (optional) new claimed identifer, found by following HTTP
+ * - 'claimed_id' (optional) new claimed identifier, found by following HTTP
* redirects during the services discovery.
* If all the discovery method fails or if no appropriate discovery method is
* found, FALSE is returned.
diff --git a/modules/overlay/overlay-child.js b/modules/overlay/overlay-child.js
index 4ff6cf0..fabd293 100644
--- a/modules/overlay/overlay-child.js
+++ b/modules/overlay/overlay-child.js
@@ -158,12 +158,12 @@ Drupal.overlayChild.behaviors.tabs = function (context, settings) {
};
/**
- * If the shortcut add/delete button exists, move it to the overlay titlebar.
+ * If the shortcut add/delete button exists, move it to the overlay title-bar.
*/
Drupal.overlayChild.behaviors.shortcutAddLink = function (context, settings) {
- // Remove any existing shortcut button markup from the titlebar.
+ // Remove any existing shortcut button markup from the title-bar.
$('#overlay-titlebar').find('.add-or-remove-shortcuts').remove();
- // If the shortcut add/delete button exists, move it to the titlebar.
+ // If the shortcut add/delete button exists, move it to the title-bar.
var $addToShortcuts = $('.add-or-remove-shortcuts');
if ($addToShortcuts.length) {
$addToShortcuts.insertAfter('#overlay-title');
diff --git a/modules/overlay/overlay-parent.js b/modules/overlay/overlay-parent.js
index 7452a51..73c84de 100644
--- a/modules/overlay/overlay-parent.js
+++ b/modules/overlay/overlay-parent.js
@@ -360,7 +360,7 @@ Drupal.overlay.isAdminLink = function (url) {
if (!this.adminPathRegExp) {
var prefix = '';
if (Drupal.settings.overlay.pathPrefixes.length) {
- // Allow path prefixes used for language negatiation followed by slash,
+ // Allow path prefixes used for language negotiation followed by slash,
// and the empty string.
prefix = '(' + Drupal.settings.overlay.pathPrefixes.join('/|') + '/|)';
}
diff --git a/modules/overlay/overlay.module b/modules/overlay/overlay.module
index 7b2fc93..4c24705 100644
--- a/modules/overlay/overlay.module
+++ b/modules/overlay/overlay.module
@@ -675,7 +675,7 @@ function overlay_overlay_parent_initialize() {
}
}
drupal_add_js(array('overlay' => array('pathPrefixes' => $path_prefixes)), 'setting');
- // Pass along the Ajax callback for rerendering sections of the parent window.
+ // Pass along the Ajax callback for re-rendering sections of the parent window.
drupal_add_js(array('overlay' => array('ajaxCallback' => 'overlay-ajax')), 'setting');
}
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index d3d64b1..d1d2fbf 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -638,7 +638,7 @@ function poll_block_latest_poll_view($node) {
// This is necessary for shared objects because PHP doesn't copy objects, but
// passes them by reference. So when the objects are cached it can result in
// the wrong output being displayed on subsequent calls. The cloning and
- // unsetting of $node->content prevents the block output from being the same
+ // un-setting of $node->content prevents the block output from being the same
// as the node output.
$node = clone $node;
unset($node->content);
diff --git a/modules/poll/poll.test b/modules/poll/poll.test
index e24032d..fe7c96e 100644
--- a/modules/poll/poll.test
+++ b/modules/poll/poll.test
@@ -595,7 +595,7 @@ class PollVoteCheckHostname extends PollTestCase {
$this->assertTrue(!empty($elements), "'Cancel your vote' button appears.");
// Check to make sure Anonymous user cannot vote again with a new session,
- // and that the vote from the previous session cannot be cancelledd.
+ // and that the vote from the previous session cannot be canceled.
$this->curlClose();
$this->drupalGet('node/' . $this->poll_nid);
$this->assertEqual($this->drupalGetHeader('x-drupal-cache'), 'MISS', 'Page was cacheable but was not in the cache.');
@@ -638,7 +638,7 @@ class PollTokenReplaceTestCase extends PollTestCase {
function testPollTokenReplacement() {
global $language;
- // Craete a poll with three choices.
+ // Create a poll with three choices.
$title = $this->randomName();
$choices = $this->_generateChoices(3);
$poll_nid = $this->pollCreate($title, $choices, FALSE);
diff --git a/modules/search/search.api.php b/modules/search/search.api.php
index 62d53b8..61a873e 100644
--- a/modules/search/search.api.php
+++ b/modules/search/search.api.php
@@ -266,7 +266,7 @@ function hook_search_page($results) {
* - Adding spaces between words of Chinese or Japanese text.
* - Stemming words down to their root words to allow matches between, for
* instance, walk, walked, walking, and walks in searching.
- * - Expanding abbreviations and acronymns that occur in text.
+ * - Expanding abbreviations and acronyms that occur in text.
*
* @param $text
* The text to preprocess. This is a single piece of plain text extracted
diff --git a/modules/search/search.extender.inc b/modules/search/search.extender.inc
index 6709466..7837f4e 100644
--- a/modules/search/search.extender.inc
+++ b/modules/search/search.extender.inc
@@ -184,7 +184,7 @@ class SearchQuery extends SelectQueryExtender {
* We build two queries that match the dataset bodies.
*/
protected function parseSearchExpression() {
- // Matchs words optionally prefixed by a dash. A word in this case is
+ // Matches words optionally prefixed by a dash. A word in this case is
// something between two spaces, optionally quoted.
preg_match_all('/ (-?)("[^"]+"|[^" ]+)/i', ' ' . $this->searchExpression , $keywords, PREG_SET_ORDER);
diff --git a/modules/search/search.module b/modules/search/search.module
index 7542f98..1ca1c37 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -219,7 +219,7 @@ function search_menu() {
'type' => MENU_LOCAL_TASK,
'file' => 'search.pages.inc',
'weight' => 0,
- // These tabs are not subtabs.
+ // These tabs are not sub-tabs.
'tab_root' => 'search/' . $default_info['path'] . '/%',
// These tabs need to display at the same level.
'tab_parent' => 'search/' . $default_info['path'],
diff --git a/modules/search/search.test b/modules/search/search.test
index 19f4e55..8df6090 100644
--- a/modules/search/search.test
+++ b/modules/search/search.test
@@ -1130,7 +1130,7 @@ class SearchSimplifyTestCase extends DrupalWebTestCase {
// This test uses a file that was constructed so that the even lines are
// boundary characters, and the odd lines are valid word characters. (It
// was generated as a sequence of all the Unicode characters, and then the
- // boundary chararacters (punctuation, spaces, etc.) were split off into
+ // boundary characters (punctuation, spaces, etc.) were split off into
// their own lines). So the even-numbered lines should simplify to nothing,
// and the odd-numbered lines we need to split into shorter chunks and
// verify that simplification doesn't lose any characters.
@@ -1219,7 +1219,7 @@ class SearchKeywordsConditions extends DrupalWebTestCase {
}
/**
- * Verify the kewords are captured and conditions respected.
+ * Verify the keywords are captured and conditions respected.
*/
function testSearchKeyswordsConditions() {
// No keys, not conditions - no results.
diff --git a/modules/search/tests/search_embedded_form.module b/modules/search/tests/search_embedded_form.module
index 4845796..e3389e2 100644
--- a/modules/search/tests/search_embedded_form.module
+++ b/modules/search/tests/search_embedded_form.module
@@ -4,7 +4,7 @@
* @file
* Test module implementing a form that can be embedded in search results.
*
- * Embedded form are important, for example, for ecommerce sites where each
+ * Embedded form are important, for example, for e-commerce sites where each
* search result may included an embedded form with buttons like "Add to cart"
* for each individual product (node) listed in the search results.
*/
diff --git a/modules/simpletest/tests/upgrade/drupal-6.bare.database.php b/modules/simpletest/tests/upgrade/drupal-6.bare.database.php
index 40c7562..5de6686 100644
--- a/modules/simpletest/tests/upgrade/drupal-6.bare.database.php
+++ b/modules/simpletest/tests/upgrade/drupal-6.bare.database.php
@@ -7,7 +7,7 @@
* This file was generated by the dump-database-d6.sh tool, from a bare
* installation of Drupal 6, with only the following core optional modules
* enabled:
- * - dblog
+ * - db log
* - update
*
* Dblog fulfills the requirement that a module take care of watchdog calls,
diff --git a/modules/simpletest/tests/upgrade/upgrade.node.test b/modules/simpletest/tests/upgrade/upgrade.node.test
index 4ac14c5..ac484f1 100644
--- a/modules/simpletest/tests/upgrade/upgrade.node.test
+++ b/modules/simpletest/tests/upgrade/upgrade.node.test
@@ -44,7 +44,7 @@ class NodeBodyUpgradePathTestCase extends UpgradePathTestCase {
$revision = node_load($revision->nid, $revision->vid);
$this->assertTrue(!empty($revision->body), 'Unpublished non-current node revisions still have a node body.');
- // Check that fields created during the upgrade can be edited and resaved
+ // Check that fields created during the upgrade can be edited and re-saved
// in the UI.
$this->drupalPost('admin/structure/types/manage/story/fields/body', array(), t('Save settings'));
}
@@ -87,7 +87,7 @@ class DisabledNodeTypeTestCase extends UpgradePathTestCase {
*
* Load a bare installation of Drupal 6 and run the upgrade process on it.
*
- * The install only contains dblog (although it's optional, it's only so that
+ * The install only contains db log (although it's optional, it's only so that
* another hook_watchdog module can take its place, the site is not functional
* without watchdog) and update.
*/
diff --git a/modules/simpletest/tests/upgrade/upgrade.poll.test b/modules/simpletest/tests/upgrade/upgrade.poll.test
index ac4ea43..ae38b03 100644
--- a/modules/simpletest/tests/upgrade/upgrade.poll.test
+++ b/modules/simpletest/tests/upgrade/upgrade.poll.test
@@ -5,7 +5,7 @@
*
* Load a bare installation of Drupal 6 and run the upgrade process on it.
*
- * The install only contains dblog (although it's optional, it's only so that
+ * The install only contains db log (although it's optional, it's only so that
* another hook_watchdog module can take its place, the site is not functional
* without watchdog) and update.
*/
diff --git a/modules/simpletest/tests/upgrade/upgrade.taxonomy.test b/modules/simpletest/tests/upgrade/upgrade.taxonomy.test
index 58a4d5c..1283b43 100644
--- a/modules/simpletest/tests/upgrade/upgrade.taxonomy.test
+++ b/modules/simpletest/tests/upgrade/upgrade.taxonomy.test
@@ -82,7 +82,7 @@ class UpgradePathTaxonomyTestCase extends UpgradePathTestCase {
// Node type 'story' was not explicitly in $vocabulary->nodes but
// each node of type 'story' was associated to one or more terms.
// Check that the node type 'story' has been associated only to
- // the taxonomyextra field.
+ // the taxonomy extra field.
$instances = $this->instanceVocabularies('node', 'story');
$field_names = array_flip($instances);
$this->assertEqual(count($field_names), 1, 'Only one taxonomy term field instance exists for story nodes');
diff --git a/modules/simpletest/tests/upgrade/upgrade.test b/modules/simpletest/tests/upgrade/upgrade.test
index 784a091..4d24f34 100644
--- a/modules/simpletest/tests/upgrade/upgrade.test
+++ b/modules/simpletest/tests/upgrade/upgrade.test
@@ -330,7 +330,7 @@ abstract class UpdatePathTestCase extends UpgradePathTestCase {
*
* Load a bare installation of Drupal 6 and run the upgrade process on it.
*
- * The install only contains dblog (although it's optional, it's only so that
+ * The install only contains db log (although it's optional, it's only so that
* another hook_watchdog module can take its place, the site is not functional
* without watchdog) and update.
*/
@@ -384,7 +384,7 @@ class BasicUpgradePath extends UpgradePathTestCase {
'pass_raw' => 'admin',
));
- // The previous login should've triggered a password rehash, so login one
+ // The previous login should have triggered a password rehash, so login one
// more time to make sure the new hash is readable.
$this->drupalLogout();
$this->drupalLogin((object) array(
@@ -465,7 +465,7 @@ class BasicStandardUpdatePath extends UpdatePathTestCase {
'pass_raw' => 'admin',
));
- // The previous login should've triggered a password rehash, so login one
+ // The previous login should have triggered a password rehash, so login one
// more time to make sure the new hash is readable.
$this->drupalLogout();
$this->drupalLogin((object) array(
@@ -541,7 +541,7 @@ class BasicMinimalUpdatePath extends UpdatePathTestCase {
'pass_raw' => 'admin',
));
- // The previous login should've triggered a password rehash, so login one
+ // The previous login should have triggered a password rehash, so login one
// more time to make sure the new hash is readable.
$this->drupalLogout();
$this->drupalLogin((object) array(
@@ -632,7 +632,7 @@ class FilledStandardUpdatePath extends UpdatePathTestCase {
'pass_raw' => 'admin',
));
- // The previous login should've triggered a password rehash, so login one
+ // The previous login should have triggered a password rehash, so login one
// more time to make sure the new hash is readable.
$this->drupalLogout();
$this->drupalLogin((object) array(
@@ -708,7 +708,7 @@ class FilledMinimalUpdatePath extends UpdatePathTestCase {
'pass_raw' => 'admin',
));
- // The previous login should've triggered a password rehash, so login one
+ // The previous login should have triggered a password rehash, so login one
// more time to make sure the new hash is readable.
$this->drupalLogout();
$this->drupalLogin((object) array(
diff --git a/modules/system/language.api.php b/modules/system/language.api.php
index 40bb3f3..5a2a434 100644
--- a/modules/system/language.api.php
+++ b/modules/system/language.api.php
@@ -156,7 +156,7 @@ function hook_language_negotiation_info() {
}
/**
- * Perform alterations on language negoiation providers.
+ * Perform alterations on language negotiation providers.
*
* @param $language_providers
* Array of language negotiation provider definitions.
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 22c202c..731c816 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -2741,7 +2741,7 @@ function theme_system_themes_page($variables) {
foreach ($theme_groups[$state] as $theme) {
- // Theme the screenshot.
+ // Theme the screen-shot.
$screenshot = $theme->screenshot ? theme('image', $theme->screenshot) : '
' . t('no screenshot') . '
';
// Localize the theme description.
diff --git a/modules/system/system.api.php b/modules/system/system.api.php
index b60f50d..49efa64 100644
--- a/modules/system/system.api.php
+++ b/modules/system/system.api.php
@@ -1814,7 +1814,7 @@ function hook_form_BASE_FORM_ID_alter(&$form, &$form_state, $form_id) {
* function defined in 'callback', which are prepended to $args.
* - wrapper_callback: (optional) The name of a form builder function to
* invoke before the form builder defined in 'callback' is invoked. This
- * wrapper callback may prepopulate the $form array with form elements,
+ * wrapper callback may pre-populate the $form array with form elements,
* which will then be already contained in the $form that is passed on to
* the form builder defined in 'callback'. For example, a wrapper callback
* could setup wizard-alike form buttons that are the same for a variety of
diff --git a/modules/system/system.module b/modules/system/system.module
index a274935..9094c03 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1774,7 +1774,7 @@ function _system_themes_access($theme) {
* Nothing, this function just initializes variables in the user's session.
*/
function system_authorized_init($callback, $file, $arguments = array(), $page_title = NULL) {
- // First, figure out what file transfer backends the site supports, and put
+ // First, figure out what file transfer back-ends the site supports, and put
// all of those in the SESSION so that authorize.php has access to all of
// them via the class autoloader, even without a full bootstrap.
$_SESSION['authorize_filetransfer_info'] = drupal_get_filetransfer_info();
diff --git a/modules/system/system.queue.inc b/modules/system/system.queue.inc
index 901c4d6..63e35bd 100644
--- a/modules/system/system.queue.inc
+++ b/modules/system/system.queue.inc
@@ -35,7 +35,7 @@
* DrupalQueueInterface::claimItem() needs to be passed to
* DrupalQueueInterface::deleteItem() once processing is completed.
*
- * There are two kinds of queue backends available: reliable, which preserves
+ * There are two kinds of queue back-ends available: reliable, which preserves
* the order of messages and guarantees that every item will be executed at
* least once. The non-reliable kind only does a best effort to preserve order
* in messages and to execute them at least once but there is a small chance
diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install
index ebd0084..99f916d 100644
--- a/modules/taxonomy/taxonomy.install
+++ b/modules/taxonomy/taxonomy.install
@@ -460,7 +460,7 @@ function taxonomy_update_7004() {
// Some contrib projects stored term node associations without regard for the
// selections in the taxonomy_vocabulary_node_types table, or have more terms
// for a single node than the vocabulary allowed. We construct the
- // taxonomyextra field to store all the extra stuff.
+ // taxonomy extra field to store all the extra stuff.
// Allowed values for this extra vocabs field is every vocabulary.
$allowed_values = array();
@@ -536,7 +536,7 @@ function taxonomy_update_7005(&$sandbox) {
// type to field name. If a voc id/node type pair does not appear
// in this array but a term_node relationship exists mapping a
// term in voc id to node of that type, the relationship is
- // assigned to the taxonomymyextra field which allows terms of all
+ // assigned to the taxonomy extra field which allows terms of all
// vocabularies.
// - cursor[values], cursor[deltas]: The contents of $values and
// $deltas at the end of the previous call to this function. These
@@ -689,7 +689,7 @@ function taxonomy_update_7005(&$sandbox) {
$query->orderBy('tn.tid');
// Work around a bug in the PostgreSQL driver that would result in fatal
- // errors when this subquery is used in the insert query below. See
+ // errors when this sub-query is used in the insert query below. See
// https://drupal.org/node/2057693.
$fields = &$query->getFields();
unset($fields['td.weight']);
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index e147c1c..a6ec7be 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -1706,7 +1706,7 @@ function taxonomy_field_formatter_prepare_view($entity_type, $entities, $field,
}
if ($rekey) {
- // Rekey the items array.
+ // Re-key the items array.
$items[$id] = array_values($items[$id]);
}
}
diff --git a/modules/translation/translation.module b/modules/translation/translation.module
index 53c4641..5260318 100644
--- a/modules/translation/translation.module
+++ b/modules/translation/translation.module
@@ -350,7 +350,7 @@ function translation_node_insert($node) {
))
->condition('nid', $node->nid)
->execute();
- // Save tnid to avoid loss in case of resave.
+ // Save tnid to avoid loss in case of re-save.
$node->tnid = $tnid;
}
}
diff --git a/modules/update/tests/update_test.module b/modules/update/tests/update_test.module
index 6fe4bdd..41e3a7c 100644
--- a/modules/update/tests/update_test.module
+++ b/modules/update/tests/update_test.module
@@ -42,9 +42,9 @@ function update_test_menu() {
* Checks the 'update_test_system_info' variable and sees if we need to alter
* the system info for the given $file based on the setting. The setting is
* expected to be a nested associative array. If the key '#all' is defined, its
- * subarray will include .info keys and values for all modules and themes on the
+ * sub-array will include .info keys and values for all modules and themes on the
* system. Otherwise, the settings array is keyed by the module or theme short
- * name ($file->name) and the subarrays contain settings just for that module or
+ * name ($file->name) and the sub-arrays contain settings just for that module or
* theme.
*/
function update_test_system_info_alter(&$info, $file) {
@@ -64,9 +64,9 @@ function update_test_system_info_alter(&$info, $file) {
* Checks the 'update_test_update_status' variable and sees if we need to alter
* the update status for the given project based on the setting. The setting is
* expected to be a nested associative array. If the key '#all' is defined, its
- * subarray will include .info keys and values for all modules and themes on the
+ * sub-array will include .info keys and values for all modules and themes on the
* system. Otherwise, the settings array is keyed by the module or theme short
- * name and the subarrays contain settings just for that module or theme.
+ * name and the sub-arrays contain settings just for that module or theme.
*/
function update_test_update_status_alter(&$projects) {
$setting = variable_get('update_test_update_status', array());
@@ -108,10 +108,10 @@ function update_test_mock_page($project_name) {
$availability_scenario = $xml_map['#all'];
}
else {
- // The test didn't specify (for example, the webroot has other modules and
+ // The test didn't specify (for example, the web-root has other modules and
// themes installed but they're disabled by the version of the site
// running the test. So, we default to a file we know won't exist, so at
- // least we'll get an empty page from readfile instead of a bunch of
+ // least we'll get an empty page from read-file instead of a bunch of
// Drupal page output.
$availability_scenario = '#broken#';
}
diff --git a/modules/update/update.api.php b/modules/update/update.api.php
index cb5669e..8672950 100644
--- a/modules/update/update.api.php
+++ b/modules/update/update.api.php
@@ -108,7 +108,7 @@ function hook_update_status_alter(&$projects) {
* @param string $project
* The short name of the project that has been downloaded.
* @param string $archive_file
- * The filename of the unextracted archive.
+ * The filename of the un-extracted archive.
* @param string $directory
* The directory that the archive was extracted into.
*
diff --git a/modules/update/update.authorize.inc b/modules/update/update.authorize.inc
index 6ddd2c5..2ccccbd 100644
--- a/modules/update/update.authorize.inc
+++ b/modules/update/update.authorize.inc
@@ -20,8 +20,8 @@
* The FileTransfer object created by authorize.php for use during this
* operation.
* @param $projects
- * A nested array of projects to install into the live webroot, keyed by
- * project name. Each subarray contains the following keys:
+ * A nested array of projects to install into the live web-root, keyed by
+ * project name. Each sub-array contains the following keys:
* - project: The canonical project short name.
* - updater_name: The name of the Updater class to use for this project.
* - local_url: The locally installed location of new code to update with.
diff --git a/modules/update/update.compare.inc b/modules/update/update.compare.inc
index 072a0da..1ccfda6 100644
--- a/modules/update/update.compare.inc
+++ b/modules/update/update.compare.inc
@@ -114,7 +114,7 @@ function _update_process_info_list(&$projects, $list, $project_type, $status) {
$file->enabled_sub_themes[$key] = $name;
}
}
- // If there are no enabled subthemes, we should ignore this base theme
+ // If there are no enabled sub-themes, we should ignore this base theme
// for the enabled case. If the site is trying to display disabled
// themes, we'll catch it then.
if (empty($file->enabled_sub_themes)) {
@@ -177,7 +177,7 @@ function _update_process_info_list(&$projects, $list, $project_type, $status) {
if (empty($status) && empty($file->enabled_sub_themes)) {
// If we're processing disabled modules or themes, append a suffix.
// However, we don't do this to a a base theme with enabled
- // subthemes, since we treat that case as if it is enabled.
+ // sub-themes, since we treat that case as if it is enabled.
$project_display_type .= '-disabled';
}
// Add a list of sub-themes that "depend on" the project and a list of base
diff --git a/modules/update/update.manager.inc b/modules/update/update.manager.inc
index 85b587d..4e00b1a 100644
--- a/modules/update/update.manager.inc
+++ b/modules/update/update.manager.inc
@@ -6,7 +6,7 @@
*
* 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
+ * ones, so long as the kill-switch setting ('allow_authorize_operations') is
* still TRUE.
*
* To install new code, the administrator is prompted for either the URL of an
@@ -26,7 +26,7 @@
* batch operation is responsible for downloading a single file, extracting the
* archive, and verifying the contents. If there are any errors, the user is
* redirected back to the first page with the error messages. If all downloads
- * were extacted and verified, the user is instead redirected to
+ * were extracted and verified, the user is instead redirected to
* admin/update/ready, a landing page which reminds them to backup their
* database and asks if they want to put the site offline during the update.
* Once the user presses the "Install updates" button, they are redirected to
@@ -78,7 +78,7 @@ function update_manager_update_form($form, $form_state = array(), $context) {
// This will be a nested array. The first key is the kind of project, which
// can be either 'enabled', 'disabled', 'manual' (projects which require
- // manual updates, such as core). Then, each subarray is an array of
+ // manual updates, such as core). Then, each sub-array is an array of
// projects of that type, indexed by project short name, and containing an
// array of data for cells in that project's row in the appropriate table.
$projects = array();
@@ -183,7 +183,7 @@ function update_manager_update_form($form, $form_state = array(), $context) {
}
// Based on what kind of project this is, save the entry into the
- // appropriate subarray.
+ // appropriate sub-array.
switch ($project['project_type']) {
case 'core':
// Core needs manual updates at this time.
@@ -537,7 +537,7 @@ function update_manager_install_form($form, &$form_state, $context) {
}
/**
- * Checks for file transfer backends and prepares a form fragment about them.
+ * Checks for file transfer back-ends and prepares a form fragment about them.
*
* @param array $form
* Reference to the form array we're building.
@@ -559,7 +559,7 @@ function _update_manager_check_backends(&$form, $operation) {
return TRUE;
}
- // Otherwise, show the available backends.
+ // Otherwise, show the available back-ends.
$form['available_backends'] = array(
'#prefix' => '
',
'#suffix' => '
',
@@ -627,7 +627,7 @@ function update_manager_install_form_validate($form, &$form_state) {
* uploads the file attached to the form, then attempts to extract the archive
* into a temporary location and verify it. Instantiate the appropriate
* Updater class for this project and make sure it is not already installed in
- * the live webroot. If everything is successful, setup an operation to run
+ * the live web-root. If everything is successful, setup an operation to run
* via authorize.php which will copy the extracted files from the temporary
* location into the live site.
*
@@ -906,14 +906,14 @@ function update_manager_batch_project_get($project, $url, &$context) {
/**
* Determines if file transfers will be performed locally.
*
- * If the server is configured such that webserver-created files have the same
+ * If the server is configured such that server-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
* locally, without changing their ownership (in other words, without prompting
* the user for FTP, SSH or other credentials).
*
* This server configuration is an inherent security weakness because it allows
- * a malicious webserver process to append arbitrary PHP code and then execute
+ * a malicious web-server process to append arbitrary PHP code and then execute
* it. However, it is supported here because it is a common configuration on
* shared hosting, and there is nothing Drupal can do to prevent it.
*
@@ -925,7 +925,7 @@ function update_manager_batch_project_get($project, $url, &$context) {
* @see install_check_requirements()
*/
function update_manager_local_transfers_allowed() {
- // Compare the owner of a webserver-created temporary file to the owner of
+ // Compare the owner of a server-created temporary file to the owner of
// the configuration directory to determine if local transfers will be
// allowed.
$temporary_file = drupal_tempnam('temporary://', 'update_');
diff --git a/modules/update/update.report.inc b/modules/update/update.report.inc
index f256575..671a913 100644
--- a/modules/update/update.report.inc
+++ b/modules/update/update.report.inc
@@ -48,7 +48,7 @@ function theme_update_report($variables) {
// Create an array of status values keyed by module or theme name, since
// we'll need this while generating the report if we have to cross reference
- // anything (e.g. subthemes which have base themes missing an update).
+ // anything (e.g. sub-themes which have base themes missing an update).
foreach ($data as $project) {
foreach ($project['includes'] as $key => $name) {
$status[$key] = $project['status'];
diff --git a/modules/update/update.settings.inc b/modules/update/update.settings.inc
index 5cd2414..90a2b00 100644
--- a/modules/update/update.settings.inc
+++ b/modules/update/update.settings.inc
@@ -99,7 +99,7 @@ function update_settings_validate($form, &$form_state) {
*
* Also invalidates the cache of available updates if the "Check for updates of
* disabled modules and themes" setting is being changed. The available updates
- * report needs to refetch available update data after this setting changes or
+ * report needs to re-fetch available update data after this setting changes or
* it would show misleading things (e.g., listing the disabled projects on the
* site with the "No available releases found" warning).
*
diff --git a/modules/update/update.test b/modules/update/update.test
index 9e04cda..4c4c74b 100644
--- a/modules/update/update.test
+++ b/modules/update/update.test
@@ -422,17 +422,17 @@ class UpdateTestContribCase extends UpdateTestHelper {
}
/**
- * Tests that subthemes are notified about security updates for base themes.
+ * Tests that sub-themes are notified about security updates for base themes.
*/
function testUpdateBaseThemeSecurityUpdate() {
- // Only enable the subtheme, not the base theme.
+ // Only enable the sub-theme, not the base theme.
db_update('system')
->fields(array('status' => 1))
->condition('type', 'theme')
->condition('name', 'update_test_subtheme')
->execute();
- // Define the initial state for core and the subtheme.
+ // Define the initial state for core and the sub-theme.
$system_info = array(
// We want core to be version 7.0.
'#all' => array(
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 6ca330b..734d1cf 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -132,7 +132,7 @@ function user_filter_form_submit($form, &$form_state) {
if (isset($form_state['values'][$filter]) && $form_state['values'][$filter] != '[any]') {
// Merge an array of arrays into one if necessary.
$options = ($filter == 'permission') ? form_options_flatten($filters[$filter]['options']) : $filters[$filter]['options'];
- // Only accept valid selections offered on the dropdown, block bad input.
+ // Only accept valid selections offered on the drop-down, block bad input.
if (isset($options[$form_state['values'][$filter]])) {
$_SESSION['user_overview_filter'][] = array($filter, $form_state['values'][$filter]);
}
diff --git a/modules/user/user.api.php b/modules/user/user.api.php
index e88c7a9..46b648b 100644
--- a/modules/user/user.api.php
+++ b/modules/user/user.api.php
@@ -152,14 +152,14 @@ function hook_user_cancel_methods_alter(&$methods) {
* Add mass user operations.
*
* This hook enables modules to inject custom operations into the mass operations
- * dropdown found at admin/people, by associating a callback function with
+ * drop-down found at admin/people, by associating a callback function with
* the operation, which is called when the form is submitted. The callback function
* receives one initial argument, which is an array of the checked users.
*
* @return
* An array of operations. Each operation is an associative array that may
* contain the following key-value pairs:
- * - "label": Required. The label for the operation, displayed in the dropdown menu.
+ * - "label": Required. The label for the operation, displayed in the drop-down menu.
* - "callback": Required. The function to call for the operation.
* - "callback arguments": Optional. An array of additional arguments to pass to
* the callback function.
diff --git a/modules/user/user.module b/modules/user/user.module
index 60f32a1..dcacba8 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -452,7 +452,7 @@ function user_save($account, $edit = array(), $category = 'account') {
if (!isset($account->is_new)) {
$account->is_new = empty($account->uid);
}
- // Prepopulate $edit['data'] with the current value of $account->data.
+ // Pre-populate $edit['data'] with the current value of $account->data.
// Modules can add to or remove from this array in hook_user_presave().
if (!empty($account->data)) {
$edit['data'] = !empty($edit['data']) ? array_merge($account->data, $edit['data']) : $account->data;
@@ -1125,7 +1125,7 @@ function user_account_form(&$form, &$form_state) {
);
$roles = array_map('check_plain', user_roles(TRUE));
- // The disabled checkbox subelement for the 'authenticated user' role
+ // The disabled checkbox sub-element for the 'authenticated user' role
// must be generated separately and added to the checkboxes element,
// because of a limitation in Form API not supporting a single disabled
// checkbox within a set of checkboxes.
@@ -2125,7 +2125,7 @@ function user_login_default_validators() {
}
/**
- * A FAPI validate handler. Sets an error if supplied username has been blocked.
+ * A Form API validate handler. Sets an error if supplied username has been blocked.
*/
function user_login_name_validate($form, &$form_state) {
if (!empty($form_state['values']['name']) && user_is_blocked($form_state['values']['name'])) {
diff --git a/modules/user/user.test b/modules/user/user.test
index 03f0bbc..e38bcce 100644
--- a/modules/user/user.test
+++ b/modules/user/user.test
@@ -1034,7 +1034,7 @@ class UserPictureTestCase extends DrupalWebTestCase {
* GD Toolkit is not installed
* Picture has invalid size
*
- * results: The image shouldn't be uploaded
+ * results: The image should not be uploaded
*/
function testWithoutGDinvalidDimension() {
if ($this->_directory_test && !image_get_toolkit()) {
@@ -1066,7 +1066,7 @@ class UserPictureTestCase extends DrupalWebTestCase {
* GD Toolkit is not installed
* Picture has invalid size
*
- * results: The image shouldn't be uploaded
+ * results: The image should not be uploaded
*/
function testWithoutGDinvalidSize() {
if ($this->_directory_test && !image_get_toolkit()) {