diff --git a/includes/errors.inc b/includes/errors.inc
index e62d55f..ca483b6 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -61,7 +61,8 @@ function drupal_error_levels() {
  * @param $line
  *   The line number the error was raised at.
  * @param $context
- *   An array that points to the active symbol table at the point the error occurred.
+ *   An array that points to the active symbol table at the point the error
+ *   occurred.
  */
 function _drupal_error_handler_real($error_level, $message, $filename, $line, $context) {
   if ($error_level & error_reporting()) {
@@ -92,6 +93,7 @@ function _drupal_error_handler_real($error_level, $message, $filename, $line, $c
  *
  * @param $exception
  *   The exception object that was thrown.
+ *
  * @return
  *   An error in the format expected by _drupal_log_error().
  */
@@ -134,10 +136,11 @@ function _drupal_decode_exception($exception) {
 }
 
 /**
- * Render an error message for an exception without any possibility of a further exception occurring.
+ * Renders an error message for an exception, preventing further exceptions.
  *
  * @param $exception
  *   The exception object that was thrown.
+ *
  * @return
  *   An error message.
  */
@@ -173,8 +176,8 @@ function error_displayable($error = NULL) {
  *
  * @param $error
  *   An array with the following keys: %type, !message, %function, %file, %line
- *   and severity_level. All the parameters are plain-text, with the exception of
- *   !message, which needs to be a safe HTML string.
+ *   and severity_level. All the parameters are plain-text, with the exception
+ *   of !message, which needs to be a safe HTML string.
  * @param $fatal
  *   TRUE if the error is fatal.
  */
@@ -261,6 +264,7 @@ function _drupal_log_error($error, $fatal = FALSE) {
  *
  * @param $backtrace
  *   A standard PHP backtrace.
+ *
  * @return
  *   An associative array with keys 'file', 'line' and 'function'.
  */
diff --git a/includes/file.inc b/includes/file.inc
index d8dc3cd..1e06de2 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -90,8 +90,8 @@ define('FILE_STATUS_PERMANENT', 1);
  * A stream is referenced as "scheme://target".
  *
  * The optional $filter parameter can be used to retrieve only the stream
- * wrappers that are appropriate for particular usage. For example, this returns
- * only stream wrappers that use local file storage:
+ * wrappers that are appropriate for particular usage. For example, this
+ * returns only stream wrappers that use local file storage:
  * @code
  *   $local_stream_wrappers = file_get_stream_wrappers(STEAM_WRAPPERS_LOCAL);
  * @endcode
@@ -110,16 +110,17 @@ define('FILE_STATUS_PERMANENT', 1);
  *   (Optional) Filters out all types except those with an on bit for each on
  *   bit in $filter. For example, if $filter is STREAM_WRAPPERS_WRITE_VISIBLE,
  *   which is equal to (STREAM_WRAPPERS_READ | STREAM_WRAPPERS_WRITE |
- *   STREAM_WRAPPERS_VISIBLE), then only stream wrappers with all three of these
- *   bits set are returned. Defaults to STREAM_WRAPPERS_ALL, which returns all
- *   registered stream wrappers.
+ *   STREAM_WRAPPERS_VISIBLE), then only stream wrappers with all three of
+ *   these bits set are returned. Defaults to STREAM_WRAPPERS_ALL, which
+ *   returns all registered stream wrappers.
  *
  * @return
  *   An array keyed by scheme, with values containing an array of information
- *   about the stream wrapper, as returned by hook_stream_wrappers(). If $filter
- *   is omitted or set to STREAM_WRAPPERS_ALL, the entire Drupal stream wrapper
- *   registry is returned. Otherwise only the stream wrappers whose 'type'
- *   bitmask has an on bit for each bit specified in $filter are returned.
+ *   about the stream wrapper, as returned by hook_stream_wrappers(). If
+ *   $filter is omitted or set to STREAM_WRAPPERS_ALL, the entire Drupal
+ *   stream wrapper registry is returned. Otherwise only the stream wrappers
+ *   whose 'type' bitmask has an on bit for each bit specified in $filter are
+ *   returned.
  *
  * @see hook_stream_wrappers()
  * @see hook_stream_wrappers_alter()
@@ -322,7 +323,7 @@ function file_stream_wrapper_get_instance_by_uri($uri) {
 }
 
 /**
- * Returns a reference to the stream wrapper class responsible for a given scheme.
+ * Returns a reference to the stream wrapper class for a given scheme.
  *
  * This helper method returns a stream instance using a scheme. That is, the
  * passed string does not contain a "://". For example, "public" is a scheme
@@ -357,7 +358,6 @@ function file_stream_wrapper_get_instance_by_scheme($scheme) {
  * Creates a web-accessible URL for a stream to an external or local file.
  *
  * Compatibility: normal paths and stream wrappers.
- * @see http://drupal.org/node/515192
  *
  * There are two kinds of local files:
  * - "managed files", i.e. those stored by a Drupal-compatible stream wrapper.
@@ -375,6 +375,8 @@ function file_stream_wrapper_get_instance_by_scheme($scheme) {
  *   If the provided string already contains a preceding 'http', 'https', or
  *   '/', nothing is done and the same string is returned. If a stream wrapper
  *   could not be found to generate an external URL, then FALSE is returned.
+ *
+ * @see http://drupal.org/node/515192
  */
 function file_create_url($uri) {
   // Allow the URI to be altered, e.g. to serve a file from a CDN or static
@@ -742,10 +744,10 @@ function file_usage_delete(stdClass $file, $module, $type = NULL, $id = NULL, $c
  * @param $replace
  *   Replace behavior when the destination file already exists:
  *   - FILE_EXISTS_REPLACE - Replace the existing file. If a managed file with
- *       the destination name exists then its database entry will be updated. If
- *       no database entry is found then a new one will be created.
+ *     the destination name exists then its database entry will be updated. If
+ *     no database entry is found then a new one will be created.
  *   - FILE_EXISTS_RENAME - Append _{incrementing number} until the filename is
- *       unique.
+ *     unique.
  *   - FILE_EXISTS_ERROR - Do nothing and return FALSE.
  *
  * @return
@@ -982,12 +984,12 @@ function file_destination($destination, $replace) {
  * @param $replace
  *   Replace behavior when the destination file already exists:
  *   - FILE_EXISTS_REPLACE - Replace the existing file. If a managed file with
- *       the destination name exists then its database entry will be updated and
- *       file_delete() called on the source file after hook_file_move is called.
- *       If no database entry is found then the source files record will be
- *       updated.
+ *     the destination name exists then its database entry will be updated and
+ *     file_delete() called on the source file after hook_file_move is called.
+ *     If no database entry is found then the source files record will be
+ *     updated.
  *   - FILE_EXISTS_RENAME - Append _{incrementing number} until the filename is
- *       unique.
+ *     unique.
  *   - FILE_EXISTS_ERROR - Do nothing and return FALSE.
  *
  * @return
@@ -1092,7 +1094,8 @@ function file_unmanaged_move($source, $destination = NULL, $replace = FILE_EXIST
  *
  * Function behavior is also controlled by the Drupal variable
  * 'allow_insecure_uploads'. If 'allow_insecure_uploads' evaluates to TRUE, no
- * alterations will be made, if it evaluates to FALSE, the filename is 'munged'.
+ * alterations will be made, if it evaluates to FALSE, the filename is
+ * 'munged'.
  *
  * @param $filename
  *   File name to modify.
@@ -1573,7 +1576,6 @@ function file_save_upload($source, $validators = array(), $destination = FALSE,
  * or open_basedir are enabled, so this function fills that gap.
  *
  * Compatibility: normal paths and stream wrappers.
- * @see http://drupal.org/node/515192
  *
  * @param $filename
  *   The filename of the uploaded file.
@@ -1585,6 +1587,8 @@ function file_save_upload($source, $validators = array(), $destination = FALSE,
  *
  * @see move_uploaded_file()
  * @ingroup php_wrappers
+ *
+ * @see http://drupal.org/node/515192
  */
 function drupal_move_uploaded_file($filename, $uri) {
   $result = @move_uploaded_file($filename, $uri);
@@ -1643,6 +1647,7 @@ function file_validate(stdClass &$file, $validators = array()) {
  *
  * @param $file
  *   A Drupal file object.
+ *
  * @return
  *   An array. If the file name is too long, it will contain an error message.
  */
@@ -1807,16 +1812,17 @@ function file_validate_image_resolution(stdClass $file, $maximum_dimensions = 0,
  * @param $data
  *   A string containing the contents of the file.
  * @param $destination
- *   A string containing the destination URI. This must be a stream wrapper URI.
- *   If no value is provided, a randomized name will be generated and the file
- *   will be saved using Drupal's default files scheme, usually "public://".
+ *   A string containing the destination URI. This must be a stream wrapper
+ *   URI. If no value is provided, a randomized name will be generated and the
+ *   file will be saved using Drupal's default files scheme, usually
+ *   "public://".
  * @param $replace
  *   Replace behavior when the destination file already exists:
  *   - FILE_EXISTS_REPLACE - Replace the existing file. If a managed file with
- *       the destination name exists then its database entry will be updated. If
- *       no database entry is found then a new one will be created.
+ *     the destination name exists then its database entry will be updated. If
+ *     no database entry is found then a new one will be created.
  *   - FILE_EXISTS_RENAME - Append _{incrementing number} until the filename is
- *       unique.
+ *     unique.
  *   - FILE_EXISTS_ERROR - Do nothing and return FALSE.
  *
  * @return
@@ -1875,14 +1881,15 @@ function file_save_data($data, $destination = NULL, $replace = FILE_EXISTS_RENAM
  * @param $data
  *   A string containing the contents of the file.
  * @param $destination
- *   A string containing the destination location. This must be a stream wrapper
- *   URI. If no value is provided, a randomized name will be generated and the
- *   file will be saved using Drupal's default files scheme, usually "public://".
+ *   A string containing the destination location. This must be a stream
+ *   wrapper URI. If no value is provided, a randomized name will be generated
+ *   and the file will be saved using Drupal's default files scheme, usually
+ *   "public://".
  * @param $replace
  *   Replace behavior when the destination file already exists:
  *   - FILE_EXISTS_REPLACE - Replace the existing file.
  *   - FILE_EXISTS_RENAME - Append _{incrementing number} until the filename is
- *                          unique.
+ *     unique.
  *   - FILE_EXISTS_ERROR - Do nothing and return FALSE.
  *
  * @return
@@ -2238,7 +2245,6 @@ function drupal_realpath($uri) {
  * PHP's dirname() as a fallback.
  *
  * Compatibility: normal paths and stream wrappers.
- * @see http://drupal.org/node/515192
  *
  * @param $uri
  *   A URI or path.
@@ -2247,6 +2253,7 @@ function drupal_realpath($uri) {
  *   A string containing the directory name.
  *
  * @see dirname()
+ * @see http://drupal.org/node/515192
  * @ingroup php_wrappers
  */
 function drupal_dirname($uri) {
@@ -2267,7 +2274,6 @@ function drupal_dirname($uri) {
  * is not provided, this function will make sure that Drupal's is used.
  *
  * Compatibility: normal paths and stream wrappers.
- * @see http://drupal.org/node/515192
  *
  * @param $uri
  *   A URI or pathname.
@@ -2282,6 +2288,7 @@ function drupal_dirname($uri) {
  *   Boolean TRUE on success, or FALSE on failure.
  *
  * @see mkdir()
+ * @see http://drupal.org/node/515192
  * @ingroup php_wrappers
  */
 function drupal_mkdir($uri, $mode = NULL, $recursive = FALSE, $context = NULL) {
@@ -2335,7 +2342,6 @@ function drupal_rmdir($uri, $context = NULL) {
  * given a filepath.
  *
  * Compatibility: normal paths and stream wrappers.
- * @see http://drupal.org/node/515192
  *
  * @param $directory
  *   The directory where the temporary filename will be created.
@@ -2347,6 +2353,7 @@ function drupal_rmdir($uri, $context = NULL) {
  *   The new temporary filename, or FALSE on failure.
  *
  * @see tempnam()
+ * @see http://drupal.org/node/515192
  * @ingroup php_wrappers
  */
 function drupal_tempnam($directory, $prefix) {
@@ -2422,6 +2429,7 @@ function file_directory_temp() {
  *
  * @param $file
  *   A file object.
+ *
  * @return
  *   An associative array of headers, as expected by file_transfer().
  */
diff --git a/includes/form.inc b/includes/form.inc
index 1b163a0..a2cc2be 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -24,13 +24,13 @@
  * @{
  * Functions to enable the processing and display of HTML forms.
  *
- * Drupal uses these functions to achieve consistency in its form processing and
- * presentation, while simplifying code and reducing the amount of HTML that
- * must be explicitly generated by modules.
+ * Drupal uses these functions to achieve consistency in its form processing
+ * and presentation, while simplifying code and reducing the amount of HTML
+ * that must be explicitly generated by modules.
  *
  * The primary function used with forms is drupal_get_form(), which is
- * used for forms presented interactively to a user. Forms can also be built and
- * submitted programmatically without any user input using the
+ * used for forms presented interactively to a user. Forms can also be built
+ * and submitted programmatically without any user input using the
  * drupal_form_submit() function.
  *
  * drupal_get_form() handles retrieving, processing, and displaying a rendered
@@ -70,9 +70,9 @@
  * }
  * @endcode
  *
- * The $form argument to form-related functions is a structured array containing
- * the elements and properties of the form. For information on the array
- * components and format, and more detailed explanations of the Form API
+ * The $form argument to form-related functions is a structured array
+ * containing the elements and properties of the form. For information on the
+ * array components and format, and more detailed explanations of the Form API
  * workflow, see the
  * @link http://api.drupal.org/api/drupal/developer--topics--forms_api_reference.html Form API reference @endlink
  * and the
@@ -139,22 +139,22 @@ function drupal_get_form($form_id) {
  *   search_forms(), and user_forms().
  * @param $form_state
  *   An array which stores information about the form. This is passed as a
- *   reference so that the caller can use it to examine what in the form changed
- *   when the form submission process is complete. Furthermore, it may be used
- *   to store information related to the processed data in the form, which will
- *   persist across page requests when the 'cache' or 'rebuild' flag is set.
- *   The following parameters may be set in $form_state to affect how the form
- *   is rendered:
+ *   reference so that the caller can use it to examine what in the form
+ *   changed when the form submission process is complete. Furthermore, it may
+ *   be used to store information related to the processed data in the form,
+ *   which will persist across page requests when the 'cache' or 'rebuild'
+ *   flag is set. The following parameters may be set in $form_state to affect
+ *   how the form is rendered:
  *   - build_info: Internal. An associative array of information stored by Form
  *     API that is necessary to build and rebuild the form from cache when the
  *     original context may no longer be available:
  *     - args: A list of arguments to pass to the form constructor.
  *     - files: An optional array defining include files that need to be loaded
  *       for building the form. Each array entry may be the path to a file or
- *       another array containing values for the parameters 'type', 'module' and
- *       'name' as needed by module_load_include(). The files listed here are
- *       automatically loaded by form_get_cache(). By default the current menu
- *       router item's 'file' definition is added, if any. Use
+ *       another array containing values for the parameters 'type', 'module'
+ *       and 'name' as needed by module_load_include(). The files listed here
+ *       are automatically loaded by form_get_cache(). By default the current
+ *       menu router item's 'file' definition is added, if any. Use
  *       form_load_include() to add include files from a form constructor.
  *   - rebuild_info: Internal. Similar to 'build_info', but pertaining to
  *     drupal_rebuild_form().
@@ -163,8 +163,8 @@ function drupal_get_form($form_id) {
  *     drupal_redirect_form() will redirect the user to a new page using a GET
  *     request (so a browser refresh does not re-submit the form). However, if
  *     'rebuild' has been set to TRUE, then a new copy of the form is
- *     immediately built and sent to the browser, instead of a redirect. This is
- *     used for multi-step forms, such as wizards and confirmation forms.
+ *     immediately built and sent to the browser, instead of a redirect. This
+ *     is used for multi-step forms, such as wizards and confirmation forms.
  *     Normally, $form_state['rebuild'] is set by a submit handler, since it is
  *     usually logic within a submit handler that determines whether a form is
  *     done or requires another step. However, a validation handler may already
@@ -179,10 +179,10 @@ function drupal_get_form($form_id) {
  *     even if 'redirect' is set.
  *   - method: The HTTP form method to use for finding the input for this form.
  *     May be 'post' or 'get'. Defaults to 'post'. Note that 'get' method
- *     forms do not use form ids so are always considered to be submitted, which
- *     can have unexpected effects. The 'get' method should only be used on
- *     forms that do not change data, as that is exclusively the domain of
- *     'post.'
+ *     forms do not use form ids so are always considered to be submitted,
+ *     which can have unexpected effects. The 'get' method should only be
+ *     used on forms that do not change data, as that is exclusively the
+ *     domain of 'post.'
  *   - cache: If set to TRUE the original, unprocessed form structure will be
  *     cached, which allows the entire form to be rebuilt from cache. A typical
  *     form workflow involves two page requests; first, a form is built and
@@ -191,22 +191,22 @@ function drupal_get_form($form_id) {
  *     built and processed. By default, $form and $form_state are built from
  *     scratch during each of these page requests. Often, it is necessary or
  *     desired to persist the $form and $form_state variables from the initial
- *     page request to the one that processes the submission. 'cache' can be set
- *     to TRUE to do this. A prominent example is an Ajax-enabled form, in which
- *     ajax_process_form() enables form caching for all forms that include an
- *     element with the #ajax property. (The Ajax handler has no way to build
- *     the form itself, so must rely on the cached version.) Note that the
- *     persistence of $form and $form_state happens automatically for
- *     (multi-step) forms having the 'rebuild' flag set, regardless of the value
- *     for 'cache'.
+ *     page request to the one that processes the submission. 'cache' can be
+ *     set to TRUE to do this. A prominent example is an Ajax-enabled form,
+ *     in which ajax_process_form() enables form caching for all forms that
+ *     include an element with the #ajax property. (The Ajax handler has no
+ *     way to build the form itself, so must rely on the cached version.)
+ *     Note that the persistence of $form and $form_state happens
+ *     automatically for(multi-step) forms having the 'rebuild' flag set,
+ *     regardless of the value for 'cache'.
  *   - no_cache: If set to TRUE the form will NOT be cached, even if 'cache' is
  *     set.
  *   - values: An associative array of values submitted to the form. The
  *     validation functions and submit functions use this array for nearly all
  *     their decision making. (Note that
  *     @link http://api.drupal.org/api/drupal/developer--topics--forms_api_reference.html/7#tree #tree @endlink
- *     determines whether the values are a flat array or an array whose structure
- *     parallels the $form array.)
+ *     determines whether the values are a flat array or an array whose
+ *     structure parallels the $form array.)
  *   - input: The array of values as they were submitted by the user. These are
  *     raw and unvalidated, so should not be used without a thorough
  *     understanding of security implications. In almost all cases, code should
@@ -226,51 +226,51 @@ function drupal_get_form($form_id) {
  *   - programmed: If TRUE, the form was submitted programmatically, usually
  *     invoked via drupal_form_submit(). Defaults to FALSE.
  *   - process_input: Boolean flag. TRUE signifies correct form submission.
- *     This is always TRUE for programmed forms coming from drupal_form_submit()
- *     (see 'programmed' key), or if the form_id coming from the $_POST data is
- *     set and matches the current form_id.
+ *     This is always TRUE for programmed forms coming from
+ *     drupal_form_submit()  (see 'programmed' key), or if the form_id coming
+ *     from the $_POST data is set and matches the current form_id.
  *   - submitted: If TRUE, the form has been submitted. Defaults to FALSE.
  *   - executed: If TRUE, the form was submitted and has been processed and
  *     executed. Defaults to FALSE.
  *   - triggering_element: (read-only) The form element that triggered
  *     submission. This is the same as the deprecated
  *     $form_state['clicked_button']. It is the element that caused submission,
- *     which may or may not be a button (in the case of Ajax forms). This key is
- *     often used to distinguish between various buttons in a submit handler,
- *     and is also used in Ajax handlers.
- *   - has_file_element: Internal. If TRUE, there is a file element and Form API
- *     will set the appropriate 'enctype' HTML attribute on the form.
+ *     which may or may not be a button (in the case of Ajax forms). This key
+ *     is often used to distinguish between various buttons in a submit
+ *     handler, and is also used in Ajax handlers.
+ *   - has_file_element: Internal. If TRUE, there is a file element and Form
+ *     API will set the appropriate 'enctype' HTML attribute on the form.
  *   - groups: Internal. An array containing references to fieldsets to render
  *     them within vertical tabs.
  *   - storage: $form_state['storage'] is not a special key, and no specific
  *     support is provided for it in the Form API. By tradition it was
- *     the location where application-specific data was stored for communication
- *     between the submit, validation, and form builder functions, especially
- *     in a multi-step-style form. Form implementations may use any key(s)
- *     within $form_state (other than the keys listed here and other reserved
- *     ones used by Form API internals) for this kind of storage. The
- *     recommended way to ensure that the chosen key doesn't conflict with ones
- *     used by the Form API or other modules is to use the module name as the
- *     key name or a prefix for the key name. For example, the Node module uses
- *     $form_state['node'] in node editing forms to store information about the
- *     node being edited, and this information stays available across successive
- *     clicks of the "Preview" button as well as when the "Save" button is
- *     finally clicked.
+ *     the location where application-specific data was stored for
+ *     communication between the submit, validation, and form builder
+ *     functions, especially in a multi-step-style form. Form implementations
+ *     may use any key(s) within $form_state (other than the keys listed here
+ *     and other reserved ones used by Form API internals) for this kind of
+ *     storage. The recommended way to ensure that the chosen key doesn't
+ *     conflict with ones used by the Form API or other modules is to use the
+ *     module name as the key name or a prefix for the key name. For example,
+ *     the Node module uses $form_state['node'] in node editing forms to
+ *     store information about the node being edited, and this information
+ *     stays available across successive clicks of the "Preview" button as
+ *     well as when the "Save" button is finally clicked.
  *   - buttons: A list containing copies of all submit and button elements in
  *     the form.
  *   - complete_form: A reference to the $form variable containing the complete
  *     form structure. #process, #after_build, #element_validate, and other
- *     handlers being invoked on a form element may use this reference to access
- *     other information in the form the element is contained in.
+ *     handlers being invoked on a form element may use this reference to
+ *     access other information in the form the element is contained in.
  *   - temporary: An array holding temporary data accessible during the current
  *     page request only. All $form_state properties that are not reserved keys
  *     (see form_state_keys_no_cache()) persist throughout a multistep form
  *     sequence. Form API provides this key for modules to communicate
  *     information across form-related functions during a single page request.
  *     It may be used to temporarily save data that does not need to or should
- *     not be cached during the whole form workflow; e.g., data that needs to be
- *     accessed during the current form build process only. There is no use-case
- *     for this functionality in Drupal core.
+ *     not be cached during the whole form workflow; e.g., data that needs to
+ *     be accessed during the current form build process only. There is no
+ *     use-case for this functionality in Drupal core.
  *   - wrapper_callback: Modules that wish to pre-populate certain forms with
  *     common elements, such as back/next/save buttons in multi-step form
  *     wizards, may define a form builder function name that returns a form
@@ -404,28 +404,28 @@ function form_state_defaults() {
  * This is the key function for making multi-step forms advance from step to
  * step. It is called by drupal_process_form() when all user input processing,
  * including calling validation and submission handlers, for the request is
- * finished. If a validate or submit handler set $form_state['rebuild'] to TRUE,
- * and if other conditions don't preempt a rebuild from happening, then this
- * function is called to generate a new $form, the next step in the form
+ * finished. If a validate or submit handler set $form_state['rebuild'] to
+ * TRUE, and if other conditions don't preempt a rebuild from happening, then
+ * this function is called to generate a new $form, the next step in the form
  * workflow, to be returned for rendering.
  *
  * Ajax form submissions are almost always multi-step workflows, so that is one
- * common use-case during which form rebuilding occurs. See ajax_form_callback()
- * for more information about creating Ajax-enabled forms.
+ * common use-case during which form rebuilding occurs. See
+ * ajax_form_callback() for more information about creating Ajax-enabled forms.
  *
  * @param $form_id
  *   The unique string identifying the desired form. If a function
  *   with that name exists, it is called to build the form array.
  *   Modules that need to generate the same form (or very similar forms)
  *   using different $form_ids can implement hook_forms(), which maps
- *   different $form_id values to the proper form constructor function. Examples
- *   may be found in node_forms(), search_forms(), and user_forms().
+ *   different $form_id values to the proper form constructor function.
+ *   Examples may be found in node_forms(), search_forms(), and user_forms().
  * @param $form_state
  *   A keyed array containing the current state of the form.
  * @param $old_form
  *   (optional) A previously built $form. Used to retain the #build_id and
- *   #action properties in Ajax callbacks and similar partial form rebuilds. The
- *   only properties copied from $old_form are the ones which both exist in
+ *   #action properties in Ajax callbacks and similar partial form rebuilds.
+ *   The only properties copied from $old_form are the ones which both exist in
  *   $old_form and for which $form_state['rebuild_info']['copy'][PROPERTY] is
  *   TRUE. If $old_form is not passed, the entire $form is rebuilt freshly.
  *   'rebuild_info' needs to be a separate top-level property next to
@@ -561,7 +561,7 @@ function form_state_keys_no_cache() {
 }
 
 /**
- * Loads an include file and makes sure it is loaded whenever the form is processed.
+ * Ensures an include file is loaded whenever the form is processed.
  *
  * Example:
  * @code
@@ -624,8 +624,8 @@ function form_load_include(&$form_state, $type, $module, $name = NULL) {
  *   with that name exists, it is called to build the form array.
  *   Modules that need to generate the same form (or very similar forms)
  *   using different $form_ids can implement hook_forms(), which maps
- *   different $form_id values to the proper form constructor function. Examples
- *   may be found in node_forms(), search_forms(), and user_forms().
+ *   different $form_id values to the proper form constructor function.
+ *   Examples may be found in node_forms(), search_forms(), and user_forms().
  * @param $form_state
  *   A keyed array containing the current state of the form. Most important is
  *   the $form_state['values'] collection, a tree of data used to simulate the
@@ -799,8 +799,8 @@ function drupal_retrieve_form($form_id, &$form_state) {
 /**
  * Processes a form submission.
  *
- * This function is the heart of form API. The form gets built, validated and in
- * appropriate cases, submitted and rebuilt.
+ * This function is the heart of form API. The form gets built, validated, and
+ * (in appropriate cases) submitted and rebuilt.
  *
  * @param $form_id
  *   The unique string identifying the current form.
@@ -1074,12 +1074,12 @@ function drupal_prepare_form($form_id, &$form, &$form_state) {
  *   theming, and hook_form_alter functions.
  * @param $form
  *   An associative array containing the structure of the form, which is passed
- *   by reference. Form validation handlers are able to alter the form structure
- *   (like #process and #after_build callbacks during form building) in case of
- *   a validation error. If a validation handler alters the form structure, it
- *   is responsible for validating the values of changed form elements in
- *   $form_state['values'] to prevent form submit handlers from receiving
- *   unvalidated values.
+ *   by reference. Form validation handlers are able to alter the form
+ *   structure (like #process and #after_build callbacks during form
+ *   building) in case of a validation error. If a validation handler alters
+ *   the form structure, it is responsible for validating the values of
+ *   changed form elements in $form_state['values'] to prevent form submit
+ *   handlers from receiving unvalidated values.
  * @param $form_state
  *   A keyed array containing the current state of the form. The current
  *   user-submitted data is stored in $form_state['values'], though
@@ -1198,8 +1198,8 @@ function drupal_validate_form($form_id, &$form, &$form_state) {
  *   callback to prevent any redirection. $form_state['no_redirect'] should NOT
  *   be altered by form builder functions or form validation/submit handlers.
  * - If $form_state['programmed'] is TRUE, the form submission was usually
- *   invoked via drupal_form_submit(), so any redirection would break the script
- *   that invoked drupal_form_submit().
+ *   invoked via drupal_form_submit(), so any redirection would break the
+ *   script that invoked drupal_form_submit().
  * - If $form_state['rebuild'] is TRUE, the form needs to be rebuilt without
  *   redirection.
  *
@@ -1446,10 +1446,10 @@ function form_execute_handlers($type, &$form, &$form_state) {
  * Files an error against a form element.
  *
  * When a validation error is detected, the validator calls form_set_error() to
- * indicate which element needs to be changed and provide an error message. This
- * causes the Form API to not execute the form submit handlers, and instead to
- * re-display the form to the user with the corresponding elements rendered with
- * an 'error' CSS class (shown as red by default).
+ * indicate which element needs to be changed and provide an error message.
+ * This causes the Form API to not execute the form submit handlers, and
+ * instead to re-display the form to the user with the corresponding elements
+ * rendered with an 'error' CSS class (shown as red by default).
  *
  * The standard form_set_error() behavior can be changed if a button provides
  * the #limit_validation_errors property. Multistep forms not wanting to
@@ -1458,9 +1458,9 @@ function form_execute_handlers($type, &$form, &$form_state) {
  * "Previous" button in a multistep form should not fire validation errors just
  * because the current step has invalid values. If #limit_validation_errors is
  * set on a clicked button, the button must also define a #submit property
- * (may be set to an empty array). Any #submit handlers will be executed even if
- * there is invalid input, so extreme care should be taken with respect to any
- * actions taken by them. This is typically not a problem with buttons like
+ * (may be set to an empty array). Any #submit handlers will be executed even
+ * if there is invalid input, so extreme care should be taken with respect to
+ * any actions taken by them. This is typically not a problem with buttons like
  * "Previous" or "Add more" that do not invoke persistent storage of the
  * submitted form values. Do not use the #limit_validation_errors property on
  * buttons that trigger saving of form values to the database.
@@ -1470,8 +1470,8 @@ function form_execute_handlers($type, &$form, &$form_state) {
  * array with the ordered set of keys needed to reach that part of
  * $form_state['values'] (i.e., the #parents property of the element).
  *
- * Example 1: Allow the "Previous" button to function, regardless of whether any
- * user input is valid.
+ * Example 1: Allow the "Previous" button to function, regardless of whether
+ * any user input is valid.
  *
  * @code
  *   $form['actions']['previous'] = array(
@@ -1519,8 +1519,6 @@ function form_execute_handlers($type, &$form, &$form_state) {
  * doing anything with that data that requires it to be valid, PHP errors
  * would be triggered if the input processing and validation steps were fully
  * skipped.
- * @see http://drupal.org/node/370537
- * @see http://drupal.org/node/763376
  *
  * @param $name
  *   The name of the form element. If the #parents property of your form
@@ -1536,6 +1534,9 @@ function form_execute_handlers($type, &$form, &$form_state) {
  * @return
  *   Return value is for internal use only. To get a list of errors, use
  *   form_get_errors() or form_get_error().
+ *
+ * @see http://drupal.org/node/370537
+ * @see http://drupal.org/node/763376
  */
 function form_set_error($name = NULL, $message = '', $limit_validation_errors = NULL) {
   $form = &drupal_static(__FUNCTION__, array());
@@ -1600,8 +1601,8 @@ function form_get_errors() {
 /**
  * Returns the error message filed against the given form element.
  *
- * Form errors higher up in the form structure override deeper errors as well as
- * errors on the element itself.
+ * Form errors higher up in the form structure override deeper errors as well
+ * as errors on the element itself.
  */
 function form_get_error($element) {
   $form = form_set_error();
@@ -1640,19 +1641,19 @@ function form_error(&$element, $message = '') {
  * - $element['#process']: An array of functions called after user input has
  *   been mapped to the element's #value property. These functions can be used
  *   to dynamically add child elements: for example, for the 'date' element
- *   type, one of the functions in this array is form_process_date(), which adds
- *   the individual 'year', 'month', 'day', etc. child elements. These functions
- *   can also be used to set additional properties or implement special logic
- *   other than adding child elements: for example, for the 'fieldset' element
- *   type, one of the functions in this array is form_process_fieldset(), which
- *   adds the attributes and JavaScript needed to make the fieldset collapsible
- *   if the #collapsible property is set. The #process functions are called in
- *   preorder traversal, meaning they are called for the parent element first,
- *   then for the child elements.
- * - $element['#after_build']: An array of functions called after form_builder()
- *   is done with its processing of the element. These are called in postorder
- *   traversal, meaning they are called for the child elements first, then for
- *   the parent element.
+ *   type, one of the functions in this array is form_process_date(), which
+ *   adds the individual 'year', 'month', 'day', etc. child elements. These
+ *   functions can also be used to set additional properties or implement
+ *   special logic other than adding child elements: for example, for the 
+ *  'fieldset' element type, one of the functions in this array is form
+ *  _process_fieldset(), which adds the attributes and JavaScript needed to
+ *   make the fieldset collapsible if the #collapsible property is set. The 
+ *   #process functions are called in preorder traversal, meaning they are
+ *   called for the parent element first, then for the child elements.
+ * - $element['#after_build']: An array of functions called after
+ *   form_builder() is done with its processing of the element. These are
+ *   called in postorder traversal, meaning they are called for the child
+ *   elements first, then for the parent element.
  * There are similar properties containing callback functions invoked by
  * _form_validate() and drupal_render(), appropriate for those operations.
  *
@@ -1674,28 +1675,28 @@ function form_error(&$element, $message = '') {
  * element's #value has not yet been validated, so any code that requires
  * validated values must reside within a submit handler.
  *
- * As a security measure, user input is used for an element's #value only if the
- * element exists within $form, is not disabled (as per the #disabled property),
- * and can be accessed (as per the #access property, except that forms submitted
- * using drupal_form_submit() bypass #access restrictions). When user input is
- * ignored due to #disabled and #access restrictions, the element's default
- * value is used.
+ * As a security measure, user input is used for an element's #value only if
+ * the element exists within $form, is not disabled (as per the #disabled
+ * property), and can be accessed (as per the #access property, except that
+ * forms submitted using drupal_form_submit() bypass #access restrictions).
+ * When user input is ignored due to #disabled and #access restrictions, the
+ * element's default value is used.
  *
- * Because of the preorder traversal, where #process functions of an element run
- * before user input for its child elements is processed, and because of the
- * Form API security of user input processing with respect to #access and
+ * Because of the preorder traversal, where #process functions of an element
+ * run before user input for its child elements is processed, and because of
+ * the Form API security of user input processing with respect to #access and
  * #disabled described above, this generally means that #process functions
  * should not use an element's (unvalidated) #value to affect the #disabled or
  * #access of child elements. Use-cases where a developer may be tempted to
  * implement such conditional logic usually fall into one of two categories:
- * - Where user input from the current submission must affect the structure of a
- *   form, including properties like #access and #disabled that affect how the
- *   next submission needs to be processed, a multi-step workflow is needed.
- *   This is most commonly implemented with a submit handler setting persistent
- *   data within $form_state based on *validated* values in
- *   $form_state['values'] and setting $form_state['rebuild']. The form building
- *   functions must then be implemented to use the $form_state data to rebuild
- *   the form with the structure appropriate for the new state.
+ * - Where user input from the current submission must affect the structure
+ *   of a form, including properties like #access and #disabled that affect
+ *   how the next submission needs to be processed, a multi-step workflow is
+ *   needed. This is most commonly implemented with a submit handler setting
+ *   persistent data within $form_state based on *validated* values in
+ *   $form_state['values'] and setting $form_state['rebuild']. The form
+ *   building functions must then be implemented to use the $form_state data
+ *   to rebuild the form with the structure appropriate for the new state.
  * - Where user input must affect the rendering of the form without affecting
  *   its structure, the necessary conditional rendering logic should reside
  *   within functions that run during the rendering phase (#pre_render, #theme,
@@ -2039,13 +2040,13 @@ function _form_builder_handle_input_element($form_id, &$element, &$form_state) {
 /**
  * Helper function to handle the convoluted logic of button click detection.
  *
- * This detects button or non-button controls that trigger a form submission via
- * Ajax or some other scriptable environment. These environments can set the
- * special input key '_triggering_element_name' to identify the triggering
+ * This detects button or non-button controls that trigger a form submission
+ * via Ajax or some other scriptable environment. These environments can set
+ * the special input key '_triggering_element_name' to identify the triggering
  * element. If the name alone doesn't identify the element uniquely, the input
- * key '_triggering_element_value' may also be set to require a match on element
- * value. An example where this is needed is if there are several buttons all
- * named 'op', and only differing in their value.
+ * key '_triggering_element_value' may also be set to require a match on
+ * element value. An example where this is needed is if there are several
+ * buttons all named 'op', and only differing in their value.
  */
 function _form_element_triggered_scripted_submission($element, &$form_state) {
   if (!empty($form_state['input']['_triggering_element_name']) && $element['#name'] == $form_state['input']['_triggering_element_name']) {
@@ -2161,6 +2162,7 @@ function form_state_values_clean(&$form_state) {
  *   the element's default value should be returned.
  * @param $form_state
  *   A keyed array containing the current state of the form.
+ *
  * @return
  *   The data that will appear in the $form_state['values'] collection
  *   for this element. Return nothing to use the default.
@@ -2206,6 +2208,7 @@ function form_type_image_button_value($form, $input, $form_state) {
 *  @param $input
  *   The incoming input to populate the form element. If this is FALSE,
  *   the element's default value should be returned.
+ *
  * @return
  *   The data that will appear in the $element_state['values'] collection
  *   for this element. Return nothing to use the default.
@@ -2246,6 +2249,7 @@ function form_type_checkbox_value($element, $input = FALSE) {
  * @param $input
  *   The incoming input to populate the form element. If this is FALSE,
  *   the element's default value should be returned.
+ *
  * @return
  *   The data that will appear in the $element_state['values'] collection
  *   for this element. Return nothing to use the default.
@@ -2286,6 +2290,7 @@ function form_type_checkboxes_value($element, $input = FALSE) {
  * @param $input
  *   The incoming input to populate the form element. If this is FALSE,
  *   the element's default value should be returned.
+ *
  * @return
  *   The data that will appear in the $element_state['values'] collection
  *   for this element. Return nothing to use the default.
@@ -2322,6 +2327,7 @@ function form_type_tableselect_value($element, $input = FALSE) {
  * @param $input
  *   The incoming input to populate the form element. If this is FALSE,
  *   the element's default value should be returned.
+ *
  * @return
  *   The data that will appear in the $element_state['values'] collection
  *   for this element. Return nothing to use the default.
@@ -2341,6 +2347,7 @@ function form_type_password_confirm_value($element, $input = FALSE) {
  * @param $input
  *   The incoming input to populate the form element. If this is FALSE,
  *   the element's default value should be returned.
+ *
  * @return
  *   The data that will appear in the $element_state['values'] collection
  *   for this element. Return nothing to use the default.
@@ -2381,6 +2388,7 @@ function form_type_select_value($element, $input = FALSE) {
  * @param $input
  *   The incoming input to populate the form element. If this is FALSE,
  *   the element's default value should be returned.
+ *
  * @return
  *   The data that will appear in the $element_state['values'] collection
  *   for this element. Return nothing to use the default.
@@ -2401,6 +2409,7 @@ function form_type_textfield_value($element, $input = FALSE) {
  * @param $input
  *   The incoming input to populate the form element. If this is FALSE,
  *   the element's default value should be returned.
+ *
  * @return
  *   The data that will appear in the $element_state['values'] collection
  *   for this element. Return nothing to use the default.
@@ -2430,8 +2439,8 @@ function form_type_token_value($element, $input = FALSE) {
  *   that is actually used is '#parents'. If constructing yourself, set
  *   $element['#parents'] to be an array giving the path through the form
  *   array's keys to the element whose value you want to update. For instance,
- *   if you want to update the value of $form['elem1']['elem2'], which should be
- *   stored in $form_state['values']['elem1']['elem2'], you would set
+ *   if you want to update the value of $form['elem1']['elem2'], which should
+ *   be stored in $form_state['values']['elem1']['elem2'], you would set
  *   $element['#parents'] = array('elem1','elem2').
  * @param $value
  *   The new value for the form element.
@@ -2497,24 +2506,24 @@ function _form_options_flatten($array) {
  *   The form element to process. Properties used:
  *   - #multiple: (optional) Indicates whether one or more options can be
  *     selected. Defaults to FALSE.
- *   - #default_value: Must be NULL or not set in case there is no value for the
- *     element yet, in which case a first default option is inserted by default.
- *     Whether this first option is a valid option depends on whether the field
- *     is #required or not.
+ *   - #default_value: Must be NULL or not set in case there is no value for
+ *     the element yet, in which case a first default option is inserted by
+ *     default. Whether this first option is a valid option depends on
+ *     whether the field is #required or not.
  *   - #required: (optional) Whether the user needs to select an option (TRUE)
  *     or not (FALSE). Defaults to FALSE.
- *   - #empty_option: (optional) The label to show for the first default option.
- *     By default, the label is automatically set to "- Please select -" for a
- *     required field and "- None -" for an optional field.
- *   - #empty_value: (optional) The value for the first default option, which is
- *     used to determine whether the user submitted a value or not.
+ *   - #empty_option: (optional) The label to show for the first default
+ *     option. By default, the label is automatically set to "- Please
+ *     select -" for a required field and "- None -" for an optional field.
+ *   - #empty_value: (optional) The value for the first default option, which
+ *     is used to determine whether the user submitted a value or not.
  *     - If #required is TRUE, this defaults to '' (an empty string).
- *     - If #required is not TRUE and this value isn't set, then no extra option
- *       is added to the select control, leaving the control in a slightly
- *       illogical state, because there's no way for the user to select nothing,
- *       since all user agents automatically preselect the first available
- *       option. But people are used to this being the behavior of select
- *       controls.
+ *     - If #required is not TRUE and this value isn't set, then no extra
+ *       option is added to the select control, leaving the control in a
+ *       slightly illogical state, because there's no way for the user to
+ *       select nothing, since all user agents automatically preselect the
+ *       first available option. But people are used to this being the
+ *       behavior of select controls.
  *       @todo Address the above issue in Drupal 8.
  *     - If #required is not TRUE and this value is set (most commonly to an
  *       empty string), then an extra option (see #empty_option above)
@@ -2584,6 +2593,7 @@ function theme_select($variables) {
  *   Mixed: Either an associative array of items to list as choices, or an
  *   object with an 'option' member that is an associative array. This
  *   parameter is only used internally and should not be passed.
+ *
  * @return
  *   An HTML string of options for the select form element.
  */
@@ -2647,6 +2657,7 @@ function form_select_options($element, $choices = NULL) {
  *   The select element to search.
  * @param $key
  *   The key to look for.
+ *
  * @return
  *   An array of indexes that match the given $key. Array will be
  *   empty if no elements were found. FALSE if optgroups were found.
@@ -3124,6 +3135,7 @@ function form_process_actions($element, &$form_state) {
  *   container.
  * @param $form_state
  *   The $form_state array for the form this element belongs to.
+ *
  * @return
  *   The processed element.
  */
@@ -3234,11 +3246,12 @@ function theme_tableselect($variables) {
 }
 
 /**
- * Create the correct amount of checkbox or radio elements to populate the table.
+ * Creates the correct amount of checkbox/radio elements to populate the table.
  *
  * @param $element
  *   An associative array containing the properties and children of the
  *   tableselect element.
+ *
  * @return
  *   The processed element.
  */
@@ -3317,23 +3330,25 @@ function form_process_tableselect($element) {
  *     - exists: A function name to invoke for checking whether a submitted
  *       machine name value already exists. The submitted value is passed as
  *       argument. In most cases, an existing API or menu argument loader
- *       function can be re-used. The callback is only invoked, if the submitted
- *       value differs from the element's #default_value.
+ *       function can be re-used. The callback is only invoked, if the
+ *       submitted value differs from the element's #default_value.
  *     - source: (optional) The #array_parents of the form element containing
  *       the human-readable name (i.e., as contained in the $form structure) to
  *       use as source for the machine name. Defaults to array('name').
- *     - label: (optional) A text to display as label for the machine name value
- *       after the human-readable name form element. Defaults to "Machine name".
+ *     - label: (optional) A text to display as label for the machine name
+ *       value after the human-readable name form element. Defaults to 
+ *       "Machine name".
  *     - replace_pattern: (optional) A regular expression (without delimiters)
  *       matching disallowed characters in the machine name. Defaults to
  *       '[^a-z0-9_]+'.
- *     - replace: (optional) A character to replace disallowed characters in the
- *       machine name via JavaScript. Defaults to '_' (underscore). When using a
- *       different character, 'replace_pattern' needs to be set accordingly.
+ *     - replace: (optional) A character to replace disallowed characters in
+ *       the machine name via JavaScript. Defaults to '_' (underscore). When
+ *       using a different character, 'replace_pattern' needs to be set
+ *       accordingly.
  *     - error: (optional) A custom form error message string to show, if the
  *       machine name contains disallowed characters.
- *   - #maxlength: (optional) Should be set to the maximum allowed length of the
- *     machine name. Defaults to 64.
+ *   - #maxlength: (optional) Should be set to the maximum allowed length of
+ *     the machine name. Defaults to 64.
  *   - #disabled: (optional) Should be set to TRUE in case an existing machine
  *     name must not be changed after initial creation.
  */
@@ -3442,6 +3457,7 @@ function form_validate_machine_name(&$element, &$form_state) {
  *   child elements are taken over into $form_state.
  * @param $form_state
  *   The $form_state array for the form this fieldset belongs to.
+ *
  * @return
  *   The processed element.
  */
@@ -3545,6 +3561,7 @@ function form_pre_render_fieldset($element) {
  *   fieldset.
  * @param $form_state
  *   The $form_state array for the form this vertical tab widget belongs to.
+ *
  * @return
  *   The processed element.
  */
@@ -3579,8 +3596,8 @@ function form_process_vertical_tabs($element, &$form_state) {
  *
  * @param $variables
  *   An associative array containing:
- *   - element: An associative array containing the properties and children of the
- *     fieldset. Properties used: #children.
+ *   - element: An associative array containing the properties and children
+ *     of the fieldset. Properties used: #children.
  *
  * @ingroup themeable
  */
@@ -3959,7 +3976,8 @@ function theme_form_required_marker($variables) {
  *
  * Form element labels include the #title and a #required marker. The label is
  * associated with the element itself by the element #id. Labels may appear
- * before or after elements, depending on theme_form_element() and #title_display.
+ * before or after elements, depending on theme_form_element() and
+ * #title_display.
  *
  * This function will not be called for elements with no labels, depending on
  * #title_display. For elements that have an empty #title and are not required,
@@ -4197,8 +4215,8 @@ function element_validate_number($element, &$form_state) {
  *       array('my_function_2', array($arg2_1, $arg2_2)),
  *     )
  *     @endcode
- *   - 'title': Title for the progress page. Only safe strings should be passed.
- *     Defaults to t('Processing').
+ *   - 'title': Title for the progress page. Only safe strings should be
+ *     passed. Defaults to t('Processing').
  *   - 'init_message': Message displayed while the processing is initialized.
  *     Defaults to t('Initializing.').
  *   - 'progress_message': Message displayed while processing the batch.
@@ -4405,6 +4423,7 @@ function &batch_get() {
  *   The batch array.
  * @param $set_id
  *   The id of the set to process.
+ *
  * @return
  *   The name and class of the queue are added by reference to the batch set.
  */
@@ -4434,6 +4453,7 @@ function _batch_populate_queue(&$batch, $set_id) {
  *
  * @param $batch_set
  *   The batch set.
+ *
  * @return
  *   The queue object.
  */
diff --git a/includes/gettext.inc b/includes/gettext.inc
index a3d2a7c..955a9d2 100644
--- a/includes/gettext.inc
+++ b/includes/gettext.inc
@@ -4,7 +4,8 @@
  * @file
  * Gettext parsing and generating API.
  *
- * @todo Decouple these functions from Locale API and put to gettext_ namespace.
+ * @todo Decouple these functions from Locale API and put to gettext_
+ *   namespace.
  */
 
 /**
@@ -352,7 +353,8 @@ function _locale_import_message($message, $file, $lineno = NULL) {
  * Imports a string into the database
  *
  * @param $op
- *   Operation to perform: 'db-store', 'db-report', 'mem-store' or 'mem-report'.
+ *   Operation to perform: 'db-store', 'db-report', 'mem-store' or
+ *   'mem-report'.
  * @param $value
  *   Details of the string stored.
  * @param $mode