diff --git "a/C:\\Documents and Settings\\kcraft\\Desktop\\Patches\\doc-cleanup-filter-module-1347914-37.patch" "b/C:\\Documents and Settings\\kcraft\\Desktop\\Patches\\doc-cleanup-filter-module-1347914-40.patch" index 9942392..77c4956 100644 --- "a/C:\\Documents and Settings\\kcraft\\Desktop\\Patches\\doc-cleanup-filter-module-1347914-37.patch" +++ "b/C:\\Documents and Settings\\kcraft\\Desktop\\Patches\\doc-cleanup-filter-module-1347914-40.patch" @@ -1,5 +1,5 @@ diff --git a/core/modules/filter/filter.admin.inc b/core/modules/filter/filter.admin.inc -index 40a5eab..691cd71 100644 +index 40a5eab..48701df 100644 --- a/core/modules/filter/filter.admin.inc +++ b/core/modules/filter/filter.admin.inc @@ -2,14 +2,15 @@ @@ -31,17 +31,7 @@ index 40a5eab..691cd71 100644 function filter_admin_overview_submit($form, &$form_state) { foreach ($form_state['values']['formats'] as $id => $data) { if (is_array($data) && isset($data['weight'])) { -@@ -66,6 +70,9 @@ function filter_admin_overview_submit($form, &$form_state) { - * An associative array containing: - * - form: A render element representing the form. - * -+ * @return -+ * A renderable array. -+ * - * @ingroup themeable - */ - function theme_filter_admin_overview($variables) { -@@ -95,7 +102,17 @@ function theme_filter_admin_overview($variables) { +@@ -95,7 +99,17 @@ function theme_filter_admin_overview($variables) { } /** @@ -50,8 +40,8 @@ index 40a5eab..691cd71 100644 + * + * @param $format + * An associative array containing: -+ * - format: The new format to be used. -+ * - name: The name of the new format. ++ * - format: A string used as the primary key to describe the new format. ++ * - name: A string to label the new format. + * + * @return + * A form array. @@ -60,7 +50,7 @@ index 40a5eab..691cd71 100644 */ function filter_admin_format_page($format = NULL) { if (!isset($format->name)) { -@@ -109,11 +126,16 @@ function filter_admin_format_page($format = NULL) { +@@ -109,11 +123,16 @@ function filter_admin_format_page($format = NULL) { } /** @@ -69,8 +59,8 @@ index 40a5eab..691cd71 100644 + * + * @param $format + * An associative array containing: -+ * - format: The format to be used. -+ * - name: The name of the format. ++ * - format: A string used as the primary key to describe the new format. ++ * - name: A string to label the new format. * - * @ingroup forms * @see filter_admin_format_form_validate() @@ -79,7 +69,7 @@ index 40a5eab..691cd71 100644 */ function filter_admin_format_form($form, &$form_state, $format) { $is_fallback = ($format->format == filter_fallback_format()); -@@ -262,6 +284,9 @@ function filter_admin_format_form($form, &$form_state, $format) { +@@ -262,6 +281,9 @@ function filter_admin_format_form($form, &$form_state, $format) { * An associative array containing: * - element: A render element representing the form. * @@ -89,7 +79,7 @@ index 40a5eab..691cd71 100644 * @ingroup themeable */ function theme_filter_admin_format_filter_order($variables) { -@@ -287,7 +312,9 @@ function theme_filter_admin_format_filter_order($variables) { +@@ -287,7 +309,9 @@ function theme_filter_admin_format_filter_order($variables) { } /** @@ -100,7 +90,7 @@ index 40a5eab..691cd71 100644 */ function filter_admin_format_form_validate($form, &$form_state) { $format_format = trim($form_state['values']['format']); -@@ -304,7 +331,9 @@ function filter_admin_format_form_validate($form, &$form_state) { +@@ -304,7 +328,9 @@ function filter_admin_format_form_validate($form, &$form_state) { } /** @@ -111,18 +101,18 @@ index 40a5eab..691cd71 100644 */ function filter_admin_format_form_submit($form, &$form_state) { // Remove unnecessary values. -@@ -336,10 +365,16 @@ function filter_admin_format_form_submit($form, &$form_state) { +@@ -336,10 +362,16 @@ function filter_admin_format_form_submit($form, &$form_state) { } /** - * Menu callback; confirm deletion of a format. -+ * Form constructor for text format deletion confirmation form. ++ * Form constructor for the text format deletion confirmation form. * - * @ingroup forms + * @param $format + * An associative array containing: -+ * - format: The format to be used. -+ * - name: The name of the format. ++ * - format: A string used as the primary key to describe the new format. ++ * - name: A string to label the new format. + * + * @see filter_menu() * @see filter_admin_disable_submit() @@ -130,7 +120,7 @@ index 40a5eab..691cd71 100644 */ function filter_admin_disable($form, &$form_state, $format) { $form['#format'] = $format; -@@ -353,7 +388,7 @@ function filter_admin_disable($form, &$form_state, $format) { +@@ -353,7 +385,7 @@ function filter_admin_disable($form, &$form_state, $format) { } /** @@ -139,7 +129,7 @@ index 40a5eab..691cd71 100644 */ function filter_admin_disable_submit($form, &$form_state) { $format = $form['#format']; -@@ -362,4 +397,3 @@ function filter_admin_disable_submit($form, &$form_state) { +@@ -362,4 +394,3 @@ function filter_admin_disable_submit($form, &$form_state) { $form_state['redirect'] = 'admin/config/content/formats'; } @@ -158,18 +148,9 @@ index 3bc6233..93b695a 100644 Drupal.behaviors.filterStatus = { diff --git a/core/modules/filter/filter.api.php b/core/modules/filter/filter.api.php -index 6675e4a..0fa36d7 100644 +index 6675e4a..f11a528 100644 --- a/core/modules/filter/filter.api.php +++ b/core/modules/filter/filter.api.php -@@ -11,7 +11,7 @@ - */ - - /** -- * Define content filters. -+ * Defines content filters. - * - * User submitted content is passed through a group of filters before it is - * output in HTML, in order to remove insecure or unwanted parts, correct or @@ -24,12 +24,12 @@ * input filters they provide. * @@ -229,51 +210,6 @@ index 6675e4a..0fa36d7 100644 * - weight: A default weight for the filter in new text formats. * * @see filter_example.module -@@ -100,7 +101,7 @@ function hook_filter_info() { - } - - /** -- * Perform alterations on filter definitions. -+ * Performs alterations on filter definitions. - * - * @param $info - * Array of information on filters exposed by hook_filter_info() -@@ -134,7 +135,7 @@ function hook_filter_info_alter(&$info) { - * module will take care of saving the settings in the database. - * - * If the filter's behavior depends on an extensive list and/or external data -- * (e.g. a list of smileys, a list of glossary terms), then the filter module -+ * (e.g. a list of smileys, a list of glossary terms), then the Filter module - * can choose to provide a separate, global configuration page rather than - * per-text-format settings. In that case, the settings callback function - * should provide a link to the separate settings page. -@@ -276,7 +277,7 @@ function hook_filter_FILTER_tips($filter, $format, $long) { - */ - - /** -- * Perform actions when a new text format has been created. -+ * Performs actions when a new text format has been created. - * - * @param $format - * The format object of the format being updated. -@@ -289,7 +290,7 @@ function hook_filter_format_insert($format) { - } - - /** -- * Perform actions when a text format has been updated. -+ * Performs actions when a text format has been updated. - * - * This hook allows modules to act when a text format has been updated in any - * way. For example, when filters have been reconfigured, disabled, or -@@ -306,7 +307,7 @@ function hook_filter_format_update($format) { - } - - /** -- * Perform actions when a text format has been disabled. -+ * Performs actions when a text format has been disabled. - * - * @param $format - * The format object of the format being disabled. diff --git a/core/modules/filter/filter.install b/core/modules/filter/filter.install index da9ecb8..9237ad1 100644 --- a/core/modules/filter/filter.install @@ -306,7 +242,7 @@ index c286159..e21d289 100644 Drupal.behaviors.filterGuidelines = { attach: function (context) { diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module -index 5fe4caa..e3076a1 100644 +index 5fe4caa..cece7fe 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -2,7 +2,7 @@ @@ -361,8 +297,9 @@ index 5fe4caa..e3076a1 100644 + * Saves a text format object to the database. * * @param $format - * A format object using the properties: +- * A format object using the properties: - * - 'format': A machine-readable name representing the ID of the text format ++ * A format object having the properties: + * - format: A machine-readable name representing the ID of the text format * to save. If this corresponds to an existing text format, that format * will be updated; otherwise, a new format will be created. @@ -409,7 +346,7 @@ index 5fe4caa..e3076a1 100644 /** - * Display a text format form title. -+ * Title callback: Displays a text format form title. ++ * Displays a text format form title. + * + * @see filter_menu() */