From bf2096fa2e0aec8ced2d9f62ec8992a47501e92c Mon Sep 17 00:00:00 2001 From: Barrett Smith Date: Mon, 14 Mar 2011 14:16:40 -0400 Subject: [PATCH] Issue #1066118: fixing hyphenation of 'passed-in' --- includes/bootstrap.inc | 2 +- includes/common.inc | 10 +++++----- includes/graph.inc | 2 +- includes/menu.inc | 2 +- includes/module.inc | 2 +- includes/theme.inc | 4 ++-- misc/tabledrag.js | 2 +- modules/field/field.api.php | 2 +- modules/field/field.attach.inc | 2 +- modules/filter/filter.pages.inc | 2 +- modules/node/node.module | 4 ++-- modules/simpletest/drupal_web_test_case.php | 2 +- modules/system/system.api.php | 2 +- modules/taxonomy/taxonomy.module | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index fe1741d..8fa983d 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -1419,7 +1419,7 @@ function request_uri() { * The exception that is going to be logged. * @param $message * The message to store in the log. If empty, a text that contains all useful - * information about the passed in exception is used. + * information about the passed-in exception is used. * @param $variables * Array of variables to replace in the message on display. Defaults to the * return value of drupal_decode_exception(). diff --git a/includes/common.inc b/includes/common.inc index e9286f4..4a99c7c 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -1973,7 +1973,7 @@ function _format_date_callback(array $matches = NULL, $new_langcode = NULL) { /** * Format a username. * - * By default, the passed in object's 'name' property is used if it exists, or + * By default, the passed-in object's 'name' property is used if it exists, or * else, the site-defined value for the 'anonymous' variable. However, a module * may override this by implementing hook_username_alter(&$name, $account). * @@ -5228,7 +5228,7 @@ function drupal_set_page_content($content = NULL) { * browsers, '#browsers' can be set to array('IE' => 'gte IE 8'). * * @return - * The passed in element with markup for conditional comments potentially + * The passed-in element with markup for conditional comments potentially * added to '#prefix' and '#suffix'. */ function drupal_pre_render_conditional_comments($elements) { @@ -5290,7 +5290,7 @@ function drupal_pre_render_conditional_comments($elements) { * - #options: (optional) An array of options to pass to l(). * * @return - * The passed in elements containing a rendered link in '#markup'. + * The passed-in elements containing a rendered link in '#markup'. */ function drupal_pre_render_link($element) { // By default, link options to pass to l() are normally set in #options. @@ -5437,7 +5437,7 @@ function drupal_pre_render_links($element) { * A structured array using the #markup key. * * @return - * The passed in elements, but #markup appended to #children. + * The passed-in elements, but #markup appended to #children. */ function drupal_pre_render_markup($elements) { $elements['#children'] = $elements['#markup']; @@ -5901,7 +5901,7 @@ function drupal_render_collect_attached($elements, $return = FALSE) { * * @return * A renderable array with the following keys and values: - * - #query: The passed in $query. + * - #query: The passed-in $query. * - #pre_render: $function with a _pre_render suffix. * - #cache: An associative array prepared for drupal_render_cache_set(). */ diff --git a/includes/graph.inc b/includes/graph.inc index 339c9be..8b89b73 100644 --- a/includes/graph.inc +++ b/includes/graph.inc @@ -32,7 +32,7 @@ * @endcode * * @return - * The passed in $graph with more secondary keys filled in: + * The passed-in $graph with more secondary keys filled in: * - 'paths': Contains a list of vertices than can be reached on a path from * this vertex. * - 'reverse_paths': Contains a list of vertices that has a path from them diff --git a/includes/menu.inc b/includes/menu.inc index a3121c7..2e208d5 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -2063,7 +2063,7 @@ function menu_local_tasks($level = 0) { * node or array('system', 'navigation') for a certain block. * * @return - * A list of menu router items that are local tasks for the passed in path. + * A list of menu router items that are local tasks for the passed-in path. * * @see contextual_links_preprocess() */ diff --git a/includes/module.inc b/includes/module.inc index ae772ff..08749f3 100644 --- a/includes/module.inc +++ b/includes/module.inc @@ -856,7 +856,7 @@ function drupal_required_modules() { /** * Hands off alterable variables to type-specific *_alter implementations. * - * This dispatch function hands off the passed in variables to type-specific + * This dispatch function hands off the passed-in variables to type-specific * hook_TYPE_alter() implementations in modules. It ensures a consistent * interface for all altering operations. * diff --git a/includes/theme.inc b/includes/theme.inc index 806e5ee..5ac0bf0 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -319,8 +319,8 @@ function drupal_theme_rebuild() { * The theme registry that will eventually be cached; It is an associative * array keyed by theme hooks, whose values are associative arrays describing * the hook: - * - 'type': The passed in $type. - * - 'theme path': The passed in $path. + * - 'type': The passed-in $type. + * - 'theme path': The passed-in $path. * - 'function': The name of the function generating output for this theme * hook. Either defined explicitly in hook_theme() or, if neither 'function' * nor 'template' is defined, then the default theme function name is used. diff --git a/misc/tabledrag.js b/misc/tabledrag.js index 7b526e5..b566168 100644 --- a/misc/tabledrag.js +++ b/misc/tabledrag.js @@ -1079,7 +1079,7 @@ Drupal.tableDrag.prototype.row.prototype.indent = function (indentDiff) { /** * Find all siblings for a row, either according to its subgroup or indentation. - * Note that the passed in row is included in the list of siblings. + * Note that the passed-in row is included in the list of siblings. * * @param settings * The field settings we're using to identify what constitutes a sibling. diff --git a/modules/field/field.api.php b/modules/field/field.api.php index 1b3290f..22171e5 100644 --- a/modules/field/field.api.php +++ b/modules/field/field.api.php @@ -757,7 +757,7 @@ function hook_field_widget_info_alter(&$info) { /** * Return the form for a single field widget. * - * Field widget form elements should be based on the passed in $element, which + * Field widget form elements should be based on the passed-in $element, which * contains the base form element properties derived from the field * configuration. * diff --git a/modules/field/field.attach.inc b/modules/field/field.attach.inc index 5686652..550bade 100644 --- a/modules/field/field.attach.inc +++ b/modules/field/field.attach.inc @@ -877,7 +877,7 @@ function field_attach_presave($entity_type, $entity) { /** * Save field data for a new entity. * - * The passed in entity must already contain its id and (if applicable) + * The passed-in entity must already contain its id and (if applicable) * revision id attributes. * Default values (if any) will be saved for fields not present in the * $entity. diff --git a/modules/filter/filter.pages.inc b/modules/filter/filter.pages.inc index 0fa87ad..dbbbe4c 100644 --- a/modules/filter/filter.pages.inc +++ b/modules/filter/filter.pages.inc @@ -39,7 +39,7 @@ function filter_tips_long() { * ), * ); * @endcode - * - long: (optional) Whether the passed in filter tips contain extended + * - long: (optional) Whether the passed-in filter tips contain extended * explanations, i.e. intended to be output on the path 'filter/tips' * (TRUE), or are in a short format, i.e. suitable to be displayed below a * form element. Defaults to FALSE. diff --git a/modules/node/node.module b/modules/node/node.module index c052f4b..a59a5b1 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -364,7 +364,7 @@ function node_mark($nid, $timestamp) { * Either a string or object, containing the node type information. * * @return - * Node type of the passed in data. + * Node type of the passed-in data. */ function _node_extract_type($node) { return is_object($node) ? $node->type : $node; @@ -1413,7 +1413,7 @@ function node_show($node, $message = FALSE) { } /** - * Returns whether the current page is the full page view of the passed in node. + * Returns whether the current page is the full page view of the passed-in node. * * @param $node * A node object. diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index a0cd114..b60c682 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -1151,7 +1151,7 @@ class DrupalWebTestCase extends DrupalTestCase { * If a user is already logged in, then the current user is logged out before * logging in the specified user. * - * Please note that neither the global $user nor the passed in user object is + * Please note that neither the global $user nor the passed-in user object is * populated with data of the logged in user. If you need full access to the * user object after logging in, it must be updated manually. If you also need * access to the plain-text password of the user (set by drupalCreateUser()), diff --git a/modules/system/system.api.php b/modules/system/system.api.php index 5481e81..d0718ad 100644 --- a/modules/system/system.api.php +++ b/modules/system/system.api.php @@ -873,7 +873,7 @@ function hook_page_build(&$page) { * * This hook is invoked by menu_get_item() and allows for run-time alteration of router * information (page_callback, title, and so on) before it is translated and checked for - * access. The passed in $router_item is statically cached for the current request, so this + * access. The passed-in $router_item is statically cached for the current request, so this * hook is only invoked once for any router item that is retrieved via menu_get_item(). * * Usually, modules will only want to inspect the router item and conditionally diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index f170430..d14a169 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -746,7 +746,7 @@ function template_preprocess_taxonomy_term(&$variables) { } /** - * Returns whether the current page is the page of the passed in term. + * Returns whether the current page is the page of the passed-in term. * * @param $term * A term object. -- 1.7.4.msysgit.0