diff --git includes/actions.inc includes/actions.inc
index 36ce403..e298988 100644
--- includes/actions.inc
+++ includes/actions.inc
@@ -49,6 +49,7 @@
  *   Passed along to the callback.
  * @param $a2
  *   Passed along to the callback.
+ *
  * @return
  *   An associative array containing the results of the functions that
  *   perform the actions, keyed on action ID.
@@ -150,6 +151,7 @@ function actions_do($action_ids, $object = NULL, $context = NULL, $a1 = NULL, $a
  *
  * @param $reset
  *   Reset the action info static cache.
+ *
  * @return
  *   An associative array keyed on action function name, with the same format
  *   as the return value of hook_action_info(), containing all
@@ -206,6 +208,7 @@ function actions_get_all_actions() {
  *   An associative array with function names or action IDs as keys
  *   and associative arrays with keys 'label', 'type', etc. as values.
  *   This is usually the output of actions_list() or actions_get_all_actions().
+ *
  * @return
  *   An associative array whose keys are hashes of the input array keys, and
  *   whose corresponding values are associative arrays with components
@@ -232,6 +235,7 @@ function actions_actions_map($actions) {
  *   Hash of a function name or action ID array key. The array key
  *   is a key into the return value of actions_list() (array key is the action
  *   function name) or actions_get_all_actions() (array key is the action ID).
+ *
  * @return
  *   The corresponding array key, or FALSE if no match is found.
  */
@@ -333,6 +337,7 @@ function actions_synchronize($delete_orphans = FALSE) {
  *   to Jim'.
  * @param $aid
  *   The ID of this action. If omitted, a new action is created.
+ *
  * @return
  *   The ID of the action.
  */
@@ -362,6 +367,7 @@ function actions_save($function, $type, $params, $label, $aid = NULL) {
  *
  * @param $aid
  *   The ID of the action to retrieve.
+ *
  * @return
  *   The appropriate action row from the database as an object.
  */
diff --git includes/archiver.inc includes/archiver.inc
index 0526337..dc3bfc8 100644
--- includes/archiver.inc
+++ includes/archiver.inc
@@ -27,6 +27,7 @@ interface ArchiverInterface {
    * @param $file_path
    *   The full system path of the file or directory to add. Only local files
    *   and directories are supported.
+   *
    * @return ArchiverInterface
    *   The called object.
    */
@@ -37,6 +38,7 @@ interface ArchiverInterface {
    *
    * @param $path
    *   The file name relative to the root of the archive to remove.
+   *
    * @return ArchiverInterface
    *   The called object.
    */
@@ -51,6 +53,7 @@ interface ArchiverInterface {
    *   Optionally specify a list of files to be extracted. Files are
    *   relative to the root of the archive. If not specified, all files
    *   in the archive will be extracted
+   *
    * @return ArchiverInterface
    *   The called object.
    */
diff --git includes/authorize.inc includes/authorize.inc
index 636c90e..c08c466 100644
--- includes/authorize.inc
+++ includes/authorize.inc
@@ -124,6 +124,7 @@ function authorize_filetransfer_form($form_state) {
  *
  * @param $backend
  *   The name of the backend (e.g. 'ftp', 'ssh', etc).
+ *
  * @return
  *   Form API array of connection settings for the given backend.
  *
@@ -158,6 +159,7 @@ function _authorize_filetransfer_connection_settings($backend) {
  *   The key for our current form element, if any.
  * @param array $defaults
  *   The default settings for the file transfer backend we're operating on.
+ *
  * @return
  *   Nothing, this function just sets $element['#default_value'] if needed.
  */
@@ -286,6 +288,7 @@ function authorize_run_operation($filetransfer) {
  *   The FileTransfer backend to get the class for.
  * @param $settings
  *   Array of settings for the FileTransfer.
+ *
  * @return
  *   An instantiated FileTransfer object for the requested method and settings,
  *   or FALSE if there was an error finding or instantiating it.
diff --git includes/batch.inc includes/batch.inc
index c84df76..4585f4b 100644
--- includes/batch.inc
+++ includes/batch.inc
@@ -22,6 +22,7 @@
  * @param $id
  *   The ID of the batch to load. When a progressive batch is being processed,
  *   the relevant ID is found in $_REQUEST['id'].
+ *
  * @return
  *   An array representing the batch, or FALSE if no batch was found.
  */
@@ -375,6 +376,7 @@ function _batch_process() {
  *   The total number of operations.
  * @param $current
  *   The number of the current operation.
+ *
  * @return
  *   The properly formatted percentage, as a string. We output percentages
  *   using the correct number of decimal places so that we never print "100%"
diff --git includes/bootstrap.inc includes/bootstrap.inc
index 710634d..8e23725 100644
--- includes/bootstrap.inc
+++ includes/bootstrap.inc
@@ -266,6 +266,7 @@ function timer_start($name) {
  *
  * @param name
  *   The name of the timer.
+ *
  * @return
  *   The current timer value in ms.
  */
@@ -289,6 +290,7 @@ function timer_read($name) {
  *
  * @param name
  *   The name of the timer.
+ *
  * @return
  *   A timer array. The array contains the number of times the timer has been
  *   started and stopped (count) and the accumulated timer value in ms (time).
@@ -372,6 +374,7 @@ function timer_stop($name) {
  * @param reset
  *   Force a full search for matching directories even if one had been
  *   found previously.
+ *
  * @return
  *   The path of the matching directory.
  */
@@ -983,6 +986,7 @@ function drupal_add_http_header($name, $value, $append = FALSE) {
  * @param $name
  *   An HTTP header name. If omitted, all headers are returned as name/value
  *   pairs. If an array value is FALSE, the header has been unset.
+ *
  * @return
  *   A string containing the header value, or FALSE if the header has been set,
  *   or NULL if the header has not been set.
@@ -1498,6 +1502,7 @@ function check_plain($text) {
  *
  * @param $text
  *   The text to check.
+ *
  * @return
  *   TRUE if the text is valid UTF-8, FALSE if not.
  */
@@ -1681,6 +1686,7 @@ function drupal_set_message($message = NULL, $type = 'status', $repeat = TRUE) {
  *   (optional) Only return messages of this type.
  * @param $clear_queue
  *   (optional) Set to FALSE if you do not want to clear the messages queue
+ *
  * @return
  *   An associative array, the key is the message type, the value an array
  *   of messages. If the $type parameter is passed, you get only that type,
@@ -1759,6 +1765,7 @@ function drupal_set_title($title = NULL, $output = CHECK_PLAIN) {
  *
  * @param $ip
  *   IP address to check.
+ *
  * @return bool
  *   TRUE if access is denied, FALSE if access is allowed.
  */
@@ -1983,6 +1990,7 @@ function drupal_anonymous_user() {
  * @param $new_phase
  *   A boolean, set to FALSE if calling drupal_bootstrap from inside a
  *   function called from drupal_bootstrap (recursion).
+ *
  * @return
  *   The most recently completed phase.
  *
@@ -2716,6 +2724,7 @@ function drupal_get_schema($table = NULL, $rebuild = FALSE) {
  *
  * @param $interface
  *   The name of the interface to check or load.
+ *
  * @return
  *   TRUE if the interface is currently available, FALSE otherwise.
  */
@@ -2731,6 +2740,7 @@ function drupal_autoload_interface($interface) {
  *
  * @param $class
  *   The name of the class to check or load.
+ *
  * @return
  *   TRUE if the class is currently available, FALSE otherwise.
  */
@@ -2748,6 +2758,7 @@ function drupal_autoload_class($class) {
  * @param $name
  *   The name of the resource, or NULL if either of the REGISTRY_* constants
  *   is passed in.
+ *
  * @return
  *   TRUE if the resource was found, FALSE if not.
  *   NULL if either of the REGISTRY_* constants is passed in as $type.
diff --git includes/cache.inc includes/cache.inc
index e5d0c49..a56c6ed 100644
--- includes/cache.inc
+++ includes/cache.inc
@@ -12,6 +12,7 @@
  *
  * @param $bin
  *   The cache bin for which the cache object should be returned.
+ *
  * @return DrupalCacheInterface
  *   The cache object associated with the specified bin.
  */
@@ -58,6 +59,7 @@ function cache_get($cid, $bin = 'cache') {
  *   reference, and will have the IDs successfully returned from cache removed.
  * @param $bin
  *   The cache bin where the data is stored.
+ *
  * @return
  *   An array of the items successfully returned from cache indexed by cid.
  */
@@ -178,6 +180,7 @@ function cache_clear_all($cid = NULL, $bin = NULL, $wildcard = FALSE) {
  *
  * @param $bin
  *   The cache bin to check.
+ *
  * @return
  *   TRUE if the cache bin specified is empty.
  */
@@ -238,6 +241,7 @@ interface DrupalCacheInterface {
    *
    * @param $cid
    *   The cache ID of the data to retrieve.
+   *
    * @return
    *   The cache or FALSE on failure.
    */
@@ -250,6 +254,7 @@ interface DrupalCacheInterface {
    *   An array of cache IDs for the data to retrieve. This is passed by
    *   reference, and will have the IDs successfully returned from cache
    *   removed.
+   *
    * @return
    *   An array of the items successfully returned from cache indexed by cid.
    */
@@ -376,6 +381,7 @@ class DrupalDatabaseCache implements DrupalCacheInterface {
    *
    * @param $cache
    *   An item loaded from cache_get() or cache_get_multiple().
+   *
    * @return
    *   The item with data unserialized as appropriate or FALSE if there is no
    *   valid item to load.
diff --git includes/common.inc includes/common.inc
index 0220a2e..263dc68 100644
--- includes/common.inc
+++ includes/common.inc
@@ -1074,6 +1074,7 @@ function fix_gpc_magic() {
  *
  * @param $mail
  *   A string containing an e-mail address.
+ *
  * @return
  *   TRUE if the address is in a valid format.
  */
@@ -1091,6 +1092,7 @@ function valid_email_address($mail) {
  *   The URL to verify.
  * @param $absolute
  *   Whether the URL is absolute (beginning with a scheme such as "http:").
+ *
  * @return
  *   TRUE if the URL is in a valid format.
  */
@@ -1365,6 +1367,7 @@ function filter_xss($string, $allowed_tags = array('a', 'em', 'strong', 'cite',
  *   If $store is FALSE then the array has one element, the HTML tag to process.
  * @param $store
  *   Whether to store $m.
+ *
  * @return
  *   If the element isn't allowed, an empty string. Otherwise, the cleaned up
  *   version of the HTML element.
@@ -1541,6 +1544,7 @@ function _filter_xss_attributes($attr) {
  *   $string is in plain text, TRUE otherwise. Defaults to TRUE. This parameter
  *   is deprecated and will be removed in Drupal 8. To process a plain-text URI,
  *   call drupal_strip_dangerous_protocols() or check_url() instead.
+ *
  * @return
  *   Cleaned up and HTML-escaped version of $string.
  */
@@ -1690,6 +1694,7 @@ function format_xml_elements($array) {
  *       translate to a language other than what is used to display the page.
  *     - 'context' (default to the empty context) The context the source string
  *       belongs to.
+ *
  * @return
  *   A translated string.
  */
@@ -1725,6 +1730,7 @@ function format_plural($count, $singular, $plural, array $args = array(), array
  * @param $size
  *   A size expressed as a number of bytes with optional SI or IEC binary unit
  *   prefix (e.g. 2, 3K, 5MB, 10G, 6GiB, 8 bytes, 9mbytes).
+ *
  * @return
  *   An integer representation of the size in bytes.
  */
@@ -1748,6 +1754,7 @@ function parse_size($size) {
  * @param $langcode
  *   Optional language code to translate to a language other than what is used
  *   to display the page.
+ *
  * @return
  *   A translated string representation of the size.
  */
@@ -1789,6 +1796,7 @@ function format_size($size, $langcode = NULL) {
  * @param $langcode
  *   Optional language code to translate to a language other than
  *   what is used to display the page.
+ *
  * @return
  *   A translated string representation of the interval.
  */
@@ -1923,6 +1931,7 @@ function format_date($timestamp, $type = 'medium', $format = '', $timezone = NUL
  *
  * @param $date
  *   A UNIX timestamp.
+ *
  * @return string
  *   An ISO8601 formatted date.
  */
@@ -2182,6 +2191,7 @@ function url($path = NULL, array $options = array()) {
  * @param $path
  *   The internal path or external URL being linked to, such as "node/34" or
  *   "http://example.com/foo".
+ *
  * @return
  *   Boolean TRUE or FALSE, where TRUE indicates an external path.
  */
@@ -2223,6 +2233,7 @@ function drupal_http_header_attributes(array $attributes = array()) {
  *
  * @param $attributes
  *   An associative array of HTML attributes.
+ *
  * @return
  *   An HTML string ready for insertion in a tag.
  */
@@ -2871,6 +2882,7 @@ function drupal_add_css($data = NULL, $options = NULL) {
  *   (optional) If set to TRUE, this function skips calling drupal_alter() on
  *   $css, useful when the calling function passes a $css array that has already
  *   been altered.
+ *
  * @return
  *   A string of XHTML CSS tags.
  */
@@ -3489,6 +3501,7 @@ function drupal_load_stylesheet($file, $optimize = NULL, $reset_basepath = TRUE)
  * @param $optimize
  *   (optional) Boolean whether CSS contents should be minified. Defaults to
  *   FALSE.
+ *
  * @return
  *   Contents of the stylesheet including the imported stylesheets.
  */
@@ -3600,6 +3613,7 @@ function drupal_delete_file_if_stale($uri) {
  *   The identifier to clean.
  * @param $filter
  *   An array of string replacements to use on the identifier.
+ *
  * @return
  *   The cleaned identifier.
  */
@@ -3628,6 +3642,7 @@ function drupal_clean_css_identifier($identifier, $filter = array(' ' => '-', '_
  *
  * @param $class
  *   The class name to clean.
+ *
  * @return
  *   The cleaned class name.
  */
@@ -4022,6 +4037,7 @@ function drupal_js_defaults($data = NULL) {
  *   (optional) If set to TRUE, this function skips calling drupal_alter() on
  *   $javascript, useful when the calling function passes a $javascript array
  *   that has already been altered.
+ *
  * @return
  *   All JavaScript code segments and includes for the scope as HTML tags.
  * @see drupal_add_js()
@@ -4501,6 +4517,7 @@ function drupal_add_library($module, $name, $every_page = NULL) {
  *   The name of a module that registered a library.
  * @param $library
  *   The name of a registered library.
+ *
  * @return
  *   The definition of the requested library, if existent, or FALSE.
  *
@@ -4836,6 +4853,7 @@ function drupal_get_token($value = '') {
  *   An additional value to base the token on.
  * @param $skip_anonymous
  *   Set to true to skip token validation for anonymous users.
+ *
  * @return
  *   True for a valid token, false for an invalid token. When $skip_anonymous
  *   is true, the return value will always be true for anonymous users.
@@ -5153,6 +5171,7 @@ function drupal_system_listing($mask, $directory, $key = 'name', $min_depth = 1)
  *
  * @param $content
  *   A string or renderable array representing the body of the page.
+ *
  * @return
  *   If called without $content, a renderable array representing the body of
  *   the page.
@@ -5521,6 +5540,7 @@ function drupal_render_page($page) {
  *
  * @param $elements
  *   The structured array describing the data to be rendered.
+ *
  * @return
  *   The rendered HTML.
  */
@@ -5716,6 +5736,7 @@ function show(&$element) {
  *
  * @param $elements
  *   A renderable array.
+ *
  * @return
  *   A markup string containing the rendered content of the element, or FALSE
  *   if no cached copy of the element is available.
@@ -6001,6 +6022,7 @@ function element_child($key) {
  *   The element to be sorted.
  * @param $sort
  *   Boolean to indicate whether the children should be sorted by weight.
+ *
  * @return
  *   The array keys of the element's children.
  */
@@ -6040,6 +6062,7 @@ function element_children(&$elements, $sort = FALSE) {
  *
  * @param $elements
  *   The parent element.
+ *
  * @return
  *   The array keys of the element's visible children.
  */
@@ -6512,6 +6535,7 @@ function drupal_install_schema($module) {
  *
  * @param $module
  *   The module for which the tables will be removed.
+ *
  * @return
  *   An array of arrays with the following key/value pairs:
  *    - success: a boolean indicating whether the query succeeded.
@@ -6815,6 +6839,7 @@ function drupal_write_record($table, &$record, $primary_keys = array()) {
  *
  * @param $filename
  *   The file we are parsing. Accepts file with relative or absolute path.
+ *
  * @return
  *   The info array.
  *
@@ -6860,6 +6885,7 @@ function drupal_parse_info_file($filename) {
  *
  * @param $data
  *   A string to parse.
+ *
  * @return
  *   The info array.
  *
@@ -7070,6 +7096,7 @@ function debug($data, $label = NULL, $print_r = FALSE) {
  *
  * @param $dependency
  *   A dependency string, for example 'foo (>=7.x-4.5-beta5, 3.x)'.
+ *
  * @return
  *   An associative array with three keys:
  *   - 'name' includes the name of the thing to depend on (e.g. 'foo').
@@ -7129,6 +7156,7 @@ function drupal_parse_dependency($dependency) {
  *   The parsed dependency structure from drupal_parse_dependency().
  * @param $current_version
  *   The version to check against (like 4.2).
+ *
  * @return
  *   NULL if compatible, otherwise the original dependency version string that
  *   caused the incompatibility.
@@ -7241,6 +7269,7 @@ function entity_info_cache_clear() {
  *   The entity type; e.g. 'node' or 'user'.
  * @param $entity
  *   The entity from which to extract values.
+ *
  * @return
  *   A numerically indexed array (not a hash table) containing these
  *   elements:
@@ -7272,6 +7301,7 @@ function entity_extract_ids($entity_type, $entity) {
  *   0: primary id of the entity
  *   1: revision id of the entity, or NULL if $entity_type is not versioned
  *   2: bundle name of the entity, or NULL if $entity_type has no bundles
+ *
  * @return
  *   An entity structure, initialized with the ids provided.
  */
@@ -7415,6 +7445,7 @@ function entity_prepare_view($entity_type, $entities) {
  *   The entity type; e.g. 'node' or 'user'.
  * @param $entity
  *   The entity for which to generate a path.
+ *
  * @return
  *   An array containing the 'path' and 'options' keys used to build the uri of
  *   the entity, and matching the signature of url(). NULL if the entity has no
@@ -7630,6 +7661,7 @@ function archiver_get_extensions() {
  * @param $file
  *   The full path of the archive file.  Note that stream wrapper
  *   paths are supported, but not remote ones.
+ *
  * @return
  *   A newly created instance of the archiver class appropriate
  *   for the specified file, already bound to that file.
diff --git includes/database/database.inc includes/database/database.inc
index 5ab9405..6a3dfa4 100644
--- includes/database/database.inc
+++ includes/database/database.inc
@@ -653,6 +653,7 @@ abstract class DatabaseConnection extends PDO {
    * @param $use_autoload
    *   If TRUE, attempt to load classes using PHP's autoload capability
    *   as well as the manual approach here.
+   *
    * @return string
    *   The name of the class that should be used for this driver.
    */
@@ -1461,6 +1462,7 @@ abstract class Database {
    *   The old connection key.
    * @param $new_key
    *   The new connection key.
+   *
    * @return
    *   TRUE in case of success, FALSE otherwise.
    */
@@ -1492,6 +1494,7 @@ abstract class Database {
    *
    * @param $key
    *   The connection key.
+   *
    * @return
    *   TRUE in case of success, FALSE otherwise.
    */
@@ -2526,6 +2529,7 @@ function db_xor() {
  *
  * @param $conjunction
  *   The conjunction to use for query conditions (AND, OR or XOR).
+ *
  * @return DatabaseCondition
  */
 function db_condition($conjunction) {
diff --git includes/database/log.inc includes/database/log.inc
index e579bbc..c022e63 100644
--- includes/database/log.inc
+++ includes/database/log.inc
@@ -73,6 +73,7 @@ class DatabaseLog {
    *
    * @param $logging_key
    *   The logging key to fetch.
+   *
    * @return
    *   An indexed array of all query records for this logging key.
    */
@@ -134,6 +135,7 @@ class DatabaseLog {
    * by the query builders.
    *
    * @link http://www.php.net/debug_backtrace
+   *
    * @return
    *   This method returns a stack trace entry similar to that generated by
    *   debug_backtrace(). However, it flattens the trace entry and the trace
diff --git includes/database/mysql/schema.inc includes/database/mysql/schema.inc
index 05fe2d5..2452b5a 100644
--- includes/database/mysql/schema.inc
+++ includes/database/mysql/schema.inc
@@ -73,6 +73,7 @@ class DatabaseSchema_mysql extends DatabaseSchema {
    *   The name of the table to create.
    * @param $table
    *   A Schema API table definition array.
+   *
    * @return
    *   An array of SQL statements to create the table.
    */
diff --git includes/database/pgsql/schema.inc includes/database/pgsql/schema.inc
index 343d3bc..c26e277 100644
--- includes/database/pgsql/schema.inc
+++ includes/database/pgsql/schema.inc
@@ -32,6 +32,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema {
    *
    * @param $table_name
    *   The non-prefixed name of the table.
+   *
    * @return
    *   An object with two member variables:
    *     - 'blob_fields' that lists all the blob fields in the table.
@@ -81,6 +82,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema {
    *   The name of the table to create.
    * @param $table
    *   A Schema API table definition array.
+   *
    * @return
    *   An array of SQL statements to create the table.
    */
diff --git includes/database/prefetch.inc includes/database/prefetch.inc
index a314eac..4b01817 100644
--- includes/database/prefetch.inc
+++ includes/database/prefetch.inc
@@ -139,6 +139,7 @@ class DatabaseStatementPrefetch implements Iterator, DatabaseStatementInterface
    *   An array of values with as many elements as there are bound parameters in the SQL statement being executed.
    * @param $options
    *   An array of options for this query.
+   *
    * @return
    *   TRUE on success, or FALSE on failure.
    */
@@ -220,6 +221,7 @@ class DatabaseStatementPrefetch implements Iterator, DatabaseStatementInterface
    *   The query.
    * @param array $args
    *   An array of arguments.
+   *
    * @return PDOStatement
    *   A PDOStatement object.
    */
diff --git includes/database/select.inc includes/database/select.inc
index 5a9a6f0..b0e9d65 100644
--- includes/database/select.inc
+++ includes/database/select.inc
@@ -28,6 +28,7 @@ interface QueryExtendableInterface {
    *   against the current database connection to allow driver-specific subclasses
    *   as well, using the same logic as the query objects themselves.  For example,
    *   PagerDefault_mysql is the MySQL-specific override for PagerDefault.
+   *
    * @return QueryExtendableInterface
    *   The extender object, which now contains a reference to this object.
    */
@@ -169,6 +170,7 @@ interface SelectQueryInterface extends QueryConditionInterface, QueryAlterableIn
    *
    * @param $distinct
    *   TRUE to flag this query DISTINCT, FALSE to disable it.
+   *
    * @return SelectQueryInterface
    *   The called object.
    */
@@ -188,6 +190,7 @@ interface SelectQueryInterface extends QueryConditionInterface, QueryAlterableIn
    *   automatically based on the $table_alias and $field. The alias will be
    *   checked for uniqueness, so the requested alias may not be the alias
    *   that is assigned in all cases.
+   *
    * @return
    *   The unique alias that was assigned for this field.
    */
@@ -211,6 +214,7 @@ interface SelectQueryInterface extends QueryConditionInterface, QueryAlterableIn
    *   An indexed array of fields present in the specified table that should be
    *   included in this query. If not specified, $table_alias.* will be generated
    *   without any aliases.
+   *
    * @return SelectQueryInterface
    *   The called object.
    */
@@ -232,6 +236,7 @@ interface SelectQueryInterface extends QueryConditionInterface, QueryAlterableIn
    *   in all cases.
    * @param $arguments
    *   Any placeholder arguments needed for this expression.
+   *
    * @return
    *   The unique alias that was assigned for this expression.
    */
@@ -257,6 +262,7 @@ interface SelectQueryInterface extends QueryConditionInterface, QueryAlterableIn
    *   system, for example, when joining the same table more than once.
    * @param $arguments
    *   An array of arguments to replace into the $condition of this join.
+   *
    * @return
    *   The unique alias that was assigned for this table.
    */
@@ -280,6 +286,7 @@ interface SelectQueryInterface extends QueryConditionInterface, QueryAlterableIn
    *   system, for example, when joining the same table more than once.
    * @param $arguments
    *   An array of arguments to replace into the $condition of this join.
+   *
    * @return
    *   The unique alias that was assigned for this table.
    */
@@ -303,6 +310,7 @@ interface SelectQueryInterface extends QueryConditionInterface, QueryAlterableIn
    *   system, for example, when joining the same table more than once.
    * @param $arguments
    *   An array of arguments to replace into the $condition of this join.
+   *
    * @return
    *   The unique alias that was assigned for this table.
    */
@@ -326,6 +334,7 @@ interface SelectQueryInterface extends QueryConditionInterface, QueryAlterableIn
    *   system, for example, when joining the same table more than once.
    * @param $arguments
    *   An array of arguments to replace into the $condition of this join.
+   *
    * @return
    *   The unique alias that was assigned for this table.
    */
@@ -357,6 +366,7 @@ interface SelectQueryInterface extends QueryConditionInterface, QueryAlterableIn
    *   system, for example, when joining the same table more than once.
    * @param $arguments
    *   An array of arguments to replace into the $condition of this join.
+   *
    * @return
    *   The unique alias that was assigned for this table.
    */
@@ -379,6 +389,7 @@ interface SelectQueryInterface extends QueryConditionInterface, QueryAlterableIn
    *   The field on which to order.
    * @param $direction
    *   The direction to sort. Legal values are "ASC" and "DESC".
+   *
    * @return SelectQueryInterface
    *   The called object.
    */
@@ -417,6 +428,7 @@ interface SelectQueryInterface extends QueryConditionInterface, QueryAlterableIn
    *   range directives that are set.
    * @param $limit
    *   The number of records to return from the result set.
+   *
    * @return SelectQueryInterface
    *   The called object.
    */
@@ -442,6 +454,7 @@ interface SelectQueryInterface extends QueryConditionInterface, QueryAlterableIn
    * @param $type
    *   The type of UNION to add to the query. Defaults to plain
    *   UNION.
+   *
    * @return SelectQueryInterface
    *   The called object.
    */
@@ -452,6 +465,7 @@ interface SelectQueryInterface extends QueryConditionInterface, QueryAlterableIn
    *
    * @param $field
    *   The field on which to group. This should be the field as aliased.
+   *
    * @return SelectQueryInterface
    *   The called object.
    */
@@ -499,6 +513,7 @@ interface SelectQueryInterface extends QueryConditionInterface, QueryAlterableIn
    *   The comparison operator, such as =, <, or >=. It also accepts more complex
    *   options such as IN, LIKE, or BETWEEN. Defaults to IN if $value is an array
    *   = otherwise.
+   *
    * @return QueryConditionInterface
    *   The called object.
    */
diff --git includes/database/sqlite/schema.inc includes/database/sqlite/schema.inc
index e8a02db..5fe156a 100644
--- includes/database/sqlite/schema.inc
+++ includes/database/sqlite/schema.inc
@@ -38,6 +38,7 @@ class DatabaseSchema_sqlite extends DatabaseSchema {
    *   The name of the table to create.
    * @param $table
    *   A Schema API table definition array.
+   *
    * @return
    *   An array of SQL statements to create the table.
    */
@@ -354,6 +355,7 @@ class DatabaseSchema_sqlite extends DatabaseSchema {
    *
    * @param $table
    *   Name of the table.
+   *
    * @return
    *   An array representing the schema, from drupal_get_schema().
    * @see drupal_get_schema()
diff --git includes/errors.inc includes/errors.inc
index 2022fc4..532ed60 100644
--- includes/errors.inc
+++ includes/errors.inc
@@ -93,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().
  */
@@ -139,6 +140,7 @@ function _drupal_decode_exception($exception) {
  *
  * @param $exception
  *   The exception object that was thrown.
+ *
  * @return
  *   An error message.
  */
@@ -262,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 includes/file.inc includes/file.inc
index 0256116..8bf1428 100644
--- includes/file.inc
+++ includes/file.inc
@@ -1590,6 +1590,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.
  */
@@ -2370,6 +2371,7 @@ function file_directory_temp() {
  *
  * @param $file
  *   A file object.
+ *
  * @return
  *   An associative array of headers, as expected by file_transfer().
  */
diff --git includes/filetransfer/filetransfer.inc includes/filetransfer/filetransfer.inc
index 4df80b4..34d7299 100644
--- includes/filetransfer/filetransfer.inc
+++ includes/filetransfer/filetransfer.inc
@@ -29,6 +29,7 @@ abstract class FileTransfer {
    *
    * @param string $jail
    * @param array $settings
+   *
    * @return object New instance of the appropriate FileTransfer subclass.
    */
   static function factory($jail, $settings) {
@@ -183,6 +184,7 @@ abstract class FileTransfer {
   * Changes backslashes to slashes, also removes a trailing slash.
   *
   * @param string $path
+   *
   * @return string
   */
   function sanitizePath($path) {
diff --git includes/filetransfer/ftp.inc includes/filetransfer/ftp.inc
index 1a4ab67..c2cf284 100644
--- includes/filetransfer/ftp.inc
+++ includes/filetransfer/ftp.inc
@@ -19,6 +19,7 @@ abstract class FileTransferFTP extends FileTransfer {
    *
    * @param string $jail
    * @param array $settings
+   *
    * @return FileTransferFTP
    *   The appropriate FileTransferFTP subclass based on the available
    *   options. If the FTP PHP extension is available, use it.
diff --git includes/form.inc includes/form.inc
index 93960f0..76729de 100644
--- includes/form.inc
+++ includes/form.inc
@@ -2105,6 +2105,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.
@@ -2150,6 +2151,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.
@@ -2190,6 +2192,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.
@@ -2230,6 +2233,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.
@@ -2266,6 +2270,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.
@@ -2285,6 +2290,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.
@@ -2325,6 +2331,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.
@@ -2345,6 +2352,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.
@@ -2528,6 +2536,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.
  */
@@ -2591,6 +2600,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.
@@ -3053,6 +3063,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.
  */
@@ -3158,6 +3169,7 @@ function theme_tableselect($variables) {
  * @param $element
  *   An associative array containing the properties and children of the
  *   tableselect element.
+ *
  * @return
  *   The processed element.
  */
@@ -3361,6 +3373,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.
  */
@@ -3464,6 +3477,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.
  */
@@ -4287,6 +4301,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.
  */
@@ -4316,6 +4331,7 @@ function _batch_populate_queue(&$batch, $set_id) {
  *
  * @param $batch_set
  *   The batch set.
+ *
  * @return
  *   The queue object.
  */
diff --git includes/install.inc includes/install.inc
index 72a7c72..cdf61b5 100644
--- includes/install.inc
+++ includes/install.inc
@@ -87,6 +87,7 @@ function drupal_load_updates() {
  *
  * @param $module
  *   A module name.
+ *
  * @return
  *   If the module has updates, an array of available updates sorted by version.
  *   Otherwise, FALSE.
@@ -135,6 +136,7 @@ function drupal_get_schema_versions($module) {
  * @param $array
  *   Set to TRUE if you want to get information about all modules in the
  *   system.
+ *
  * @return
  *   The currently installed schema version, or SCHEMA_UNINSTALLED if the
  *   module is not installed.
@@ -210,6 +212,7 @@ function drupal_install_profile_distribution_name() {
  * @param $file
  *   The name of the file calling this function so we can strip it out of
  *   the URI when generating the base_url.
+ *
  * @return
  *   The auto-detected $base_url that should be configured in settings.php
  */
@@ -658,6 +661,7 @@ function drupal_rewrite_settings($settings = array(), $prefix = '') {
  *
  * @param $install_state
  *   An array of information about the current installation state.
+ *
  * @return
  *   The list of modules to install.
  */
@@ -840,6 +844,7 @@ function drupal_uninstall_modules($module_list = array(), $uninstall_dependents
  *   An optional bitmask created from various FILE_* constants.
  * @param $type
  *   The type of file. Can be file (default), dir, or link.
+ *
  * @return
  *   TRUE on success or FALSE on failure. A message is set for the latter.
  */
@@ -919,6 +924,7 @@ function drupal_verify_install_file($file, $mask = NULL, $type = 'file') {
  *  The permissions of the directory to create.
  * @param $message
  *  (optional) Whether to output messages. Defaults to TRUE.
+ *
  * @return
  *  TRUE/FALSE whether or not the directory was successfully created.
  */
@@ -967,6 +973,7 @@ function drupal_install_mkdir($file, $mask, $message = TRUE) {
  *  The desired permissions for the file.
  * @param $message
  *  (optional) Whether to output messages. Defaults to TRUE.
+ *
  * @return
  *  TRUE/FALSE whether or not we were able to fix the file's permissions.
  */
@@ -1103,6 +1110,7 @@ function st($string, array $args = array(), array $options = array()) {
  *
  * @param $profile
  *   Name of install profile to check.
+ *
  * @return
  *   Array of the install profile's requirements.
  */
@@ -1135,6 +1143,7 @@ function drupal_check_profile($profile) {
  * @param $requirements
  *   An array of requirements, in the same format as is returned by
  *   hook_requirements().
+ *
  * @return
  *   The highest severity in the array.
  */
@@ -1153,6 +1162,7 @@ function drupal_requirements_severity(&$requirements) {
  *
  * @param $module
  *   Machine name of module to check.
+ *
  * @return
  *   TRUE/FALSE depending on the requirements are in place.
  */
@@ -1205,6 +1215,7 @@ function drupal_check_module($module) {
  *   Name of profile.
  * @param locale
  *   Name of locale used (if any).
+ *
  * @return
  *   The info array.
  */
diff --git includes/iso.inc includes/iso.inc
index bf1a3fc..f7baf1a 100644
--- includes/iso.inc
+++ includes/iso.inc
@@ -12,6 +12,7 @@
  * Get an array of all country code => country name pairs as laid out
  * in ISO 3166-1 alpha-2.
  * Grabbed from location project (http://drupal.org/project/location).
+ *
  * @return
  *   An array of all country code => country name pairs.
  */
diff --git includes/menu.inc includes/menu.inc
index 47d4941..3cf18ed 100644
--- includes/menu.inc
+++ includes/menu.inc
@@ -3061,6 +3061,7 @@ function menu_link_save(&$item) {
  *
  * @param $menu_link
  *   A menu link.
+ *
  * @return
  *   A menu link structure of the possible parent or FALSE if no valid parent
  *   has been found.
diff --git includes/tablesort.inc includes/tablesort.inc
index a221cdc..935b6e3 100644
--- includes/tablesort.inc
+++ includes/tablesort.inc
@@ -37,6 +37,7 @@ class TableSort extends SelectQueryExtender {
    * @see theme_table()
    * @param $header
    *   Table header array.
+   *
    * @return SelectQueryInterface
    *   The called object.
    */
@@ -70,6 +71,7 @@ class TableSort extends SelectQueryExtender {
    *
    * @param $headers
    *   An array of column headers in the format described in theme_table().
+   *
    * @return
    *   The current sort direction ("asc" or "desc").
    */
@@ -106,6 +108,7 @@ class TableSort extends SelectQueryExtender {
    *
    * @param $headers
    *   An array of column headers in the format described in theme_table().
+   *
    * @return
    *   An associative array describing the criterion, containing the keys:
    *   - "name": The localized title of the table column.
@@ -163,6 +166,7 @@ function tablesort_init($header) {
  *   An array of column headers in the format described in theme_table().
  * @param $ts
  *   The current table sort context as returned from tablesort_init().
+ *
  * @return
  *   A properly formatted cell, ready for _theme_table_cell().
  */
@@ -200,6 +204,7 @@ function tablesort_header($cell, $header, $ts) {
  *   The current table sort context as returned from tablesort_init().
  * @param $i
  *   The index of the cell's table column.
+ *
  * @return
  *   A properly formatted cell, ready for _theme_table_cell().
  */
@@ -231,6 +236,7 @@ function tablesort_get_query_parameters() {
  *
  * @param $headers
  *   An array of column headers in the format described in theme_table().
+ *
  * @return
  *   An associative array describing the criterion, containing the keys:
  *   - "name": The localized title of the table column.
@@ -269,6 +275,7 @@ function tablesort_get_order($headers) {
  *
  * @param $headers
  *   An array of column headers in the format described in theme_table().
+ *
  * @return
  *   The current sort direction ("asc" or "desc").
  */
diff --git includes/token.inc includes/token.inc
index 8bd61e9..0d5450c 100644
--- includes/token.inc
+++ includes/token.inc
@@ -71,6 +71,7 @@
  *     display to a web browser. Defaults to TRUE. Developers who set this option
  *     to FALSE assume responsibility for running filter_xss(), check_plain() or
  *     other appropriate scrubbing functions before displaying data to users.
+ *
  * @return
  *   Text with tokens replaced.
  */
@@ -100,6 +101,7 @@ function token_replace($text, array $data = array(), array $options = array()) {
  *
  * @param $text
  *   The text to be scanned for possible tokens.
+ *
  * @return
  *   An associative array of discovered tokens, grouped by type.
  */
@@ -148,6 +150,7 @@ function token_scan($text) {
  *     display to a web browser. Developers who set this option to FALSE assume
  *     responsibility for running filter_xss(), check_plain() or other
  *     appropriate scrubbing functions before displaying data to users.
+ *
  * @return
  *   An associative array of replacement values, keyed by the original 'raw'
  *   tokens that were found in the source text. For example:
@@ -194,6 +197,7 @@ function token_generate($type, array $tokens, array $data = array(), array $opti
  * @param $delimiter
  *   An optional string containing the character that separates the prefix from
  *   the rest of the token. Defaults to ':'.
+ *
  * @return
  *   An associative array of discovered tokens, with the prefix and delimiter
  *   stripped from the key.
@@ -230,6 +234,7 @@ function token_find_with_prefix(array $tokens, $prefix, $delimiter = ':') {
  *     'type' => 'user',
  *   );
  * @endcode
+ *
  * @return
  *   An associative array of token information, grouped by token type.
  */
diff --git includes/utility.inc includes/utility.inc
index 38e7e40..68a3d12 100644
--- includes/utility.inc
+++ includes/utility.inc
@@ -13,6 +13,7 @@
  *   The variable to export.
  * @param $prefix
  *   A prefix that will be added at the begining of every lines of the output.
+ *
  * @return
  *   The variable exported in a way compatible to Drupal's coding standards.
  */