diff --git a/core/modules/menu/menu.admin.css b/core/modules/menu/menu.admin.css
index 8717aca..f922cd6 100644
--- a/core/modules/menu/menu.admin.css
+++ b/core/modules/menu/menu.admin.css
@@ -1,3 +1,7 @@
+/**
+ * @file
+ * CSS for the menu overview form.
+ */
 .menu-operations {
   width: 100px;
 }
diff --git a/core/modules/menu/menu.admin.inc b/core/modules/menu/menu.admin.inc
index 2e1725d..f444082 100644
--- a/core/modules/menu/menu.admin.inc
+++ b/core/modules/menu/menu.admin.inc
@@ -6,7 +6,12 @@
  */
 
 /**
- * Menu callback which shows an overview page of all the custom menus and their descriptions.
+ * Page callback: Shows an overview page of all the custom menus.
+ *
+ * @return
+ *   An HTML string containing a themed table of all custom menus.
+ *
+ * @see menu_menu()
  */
 function menu_overview_page() {
   $result = db_query("SELECT * FROM {menu_custom} ORDER BY title", array(), array('fetch' => PDO::FETCH_ASSOC));
@@ -41,10 +46,17 @@ function theme_menu_admin_overview($variables) {
 }
 
 /**
- * Form for editing an entire menu tree at once.
+ * Form constructor for the menu overview form.
+ *
+ * Shows a custom menu's menu links that are accessible to the current user and
+ * relevant operations. Allows editing an entire menu tree at once.
+ *
+ * @param $menu
+ *   An array defining a custom menu.
  *
- * Shows for one menu the menu links accessible to the current user and
- * relevant operations.
+ * @see menu_menu()
+ * @see menu_overview_form_submit()
+ * @ingroup forms
  */
 function menu_overview_form($form, &$form_state, $menu) {
   global $menu_admin;
@@ -84,10 +96,13 @@ function menu_overview_form($form, &$form_state, $menu) {
 }
 
 /**
- * Recursive helper function for menu_overview_form().
+ * Helps menu_overview_form() build the menu overview form.
  *
  * @param $tree
- *   The menu_tree retrieved by menu_tree_data.
+ *   The array of menu items retrieved by menu_tree_data().
+ *
+ * @return
+ *   An array containing a tree of menu item form elements.
  */
 function _menu_overview_tree_form($tree) {
   $form = &drupal_static(__FUNCTION__, array('#tree' => TRUE));
@@ -143,12 +158,10 @@ function _menu_overview_tree_form($tree) {
 }
 
 /**
- * Submit handler for the menu overview form.
+ * Form submission handler for menu_overview_form().
  *
  * This function takes great care in saving parent items first, then items
  * underneath them. Saving items in the incorrect order can break the menu tree.
- *
- * @see menu_overview_form()
  */
 function menu_overview_form_submit($form, &$form_state) {
   // When dealing with saving menu items, the order in which these items are
@@ -190,7 +203,7 @@ function menu_overview_form_submit($form, &$form_state) {
 }
 
 /**
- * Returns HTML for the menu overview form into a table.
+ * Returns HTML for displaying the menu overview form as a table.
  *
  * @param $variables
  *   An associative array containing:
@@ -253,7 +266,22 @@ function theme_menu_overview_form($variables) {
 }
 
 /**
- * Menu callback; Build the menu link editing form.
+ * Form constructor for the menu link adding and editing form.
+ *
+ * @param $type
+ *   The type of operation being done, 'add' or 'edit'.
+ * @param $item
+ *   When $type is 'edit', an array representing the menu item; when $type is
+ *   'add', NULL.
+ * @param $menu
+ *   When $type is 'add', an array representing the menu the link will be added
+ *   to; when $type is 'edit', NULL.
+ *
+ * @see menu_menu()
+ * @see menu_edit_item_validate()
+ * @see menu_edit_item_submit()
+ * @see menu_item_delete_submit()
+ * @ingroup forms
  */
 function menu_edit_item($form, &$form_state, $type, $item, $menu) {
   if ($type == 'add' || empty($item)) {
@@ -363,7 +391,9 @@ function menu_edit_item($form, &$form_state, $type, $item, $menu) {
 }
 
 /**
- * Validate form values for a menu link being added or edited.
+ * Form validation handler for menu_edit_item().
+ *
+ * @see menu_edit_item_submit()
  */
 function menu_edit_item_validate($form, &$form_state) {
   $item = &$form_state['values'];
@@ -398,14 +428,16 @@ function menu_edit_item_validate($form, &$form_state) {
 }
 
 /**
- * Submit function for the delete button on the menu item editing form.
+ * Form submission handler for the delete button on menu_edit_item().
  */
 function menu_item_delete_submit($form, &$form_state) {
   $form_state['redirect'] = 'admin/structure/menu/item/' . $form_state['values']['mlid'] . '/delete';
 }
 
 /**
- * Process menu and menu item add/edit form submissions.
+ * Form submission handler for menu_edit_item().
+ *
+ * @see menu_edit_item_validate()
  */
 function menu_edit_item_submit($form, &$form_state) {
   $item = &$form_state['values'];
@@ -427,7 +459,18 @@ function menu_edit_item_submit($form, &$form_state) {
 }
 
 /**
- * Menu callback; Build the form that handles the adding/editing of a custom menu.
+ * Form constructor for adding or editing a custom menu.
+ *
+ * @param $type
+ *   The type of operation being done, 'add' or 'edit'.
+ * @param $menu
+ *   (optional) When $type is 'edit', an array representing the menu that is to
+ *   be edited.
+ *
+ * @see menu_menu()
+ * @see menu_edit_menu_submit()
+ * @see menu_custom_delete_submit()
+ * @ingroup forms
  */
 function menu_edit_menu($form, &$form_state, $type, $menu = array()) {
   $system_menus = menu_list_system_menus();
@@ -493,14 +536,22 @@ function menu_edit_menu($form, &$form_state, $type, $menu = array()) {
 }
 
 /**
- * Submit function for the 'Delete' button on the menu editing form.
+ * Form submission handler for the 'Delete' button on menu_edit_menu().
  */
 function menu_custom_delete_submit($form, &$form_state) {
   $form_state['redirect'] = 'admin/structure/menu/manage/' . $form_state['values']['menu_name'] . '/delete';
 }
 
 /**
- * Menu callback; check access and get a confirm form for deletion of a custom menu.
+ * Page callback: Gets a confirmation form for the deletion of a custom menu.
+ *
+ * @param $menu
+ *   An array representing the custom menu.
+ *
+ * @return array
+ *   A renderable array.
+ *
+ * @see menu_menu()
  */
 function menu_delete_menu_page($menu) {
   // System-defined menus may not be deleted.
@@ -513,7 +564,13 @@ function menu_delete_menu_page($menu) {
 }
 
 /**
- * Build a confirm form for deletion of a custom menu.
+ * Form constructor for a confirmation form for deleting a custom menu.
+ *
+ * @param $menu
+ *   An array representing the custom menu.
+ *
+ * @see menu_delete_menu_confirm_submit()
+ * @ingroup forms
  */
 function menu_delete_menu_confirm($form, &$form_state, $menu) {
   $form['#menu'] = $menu;
@@ -527,7 +584,9 @@ function menu_delete_menu_confirm($form, &$form_state, $menu) {
 }
 
 /**
- * Delete a custom menu and all links in it.
+ * Form submission handler for menu_delete_menu_confirm().
+ *
+ * Deletes a custom menu and all links in it.
  */
 function menu_delete_menu_confirm_submit($form, &$form_state) {
   $menu = $form['#menu'];
@@ -560,7 +619,13 @@ function menu_delete_menu_confirm_submit($form, &$form_state) {
 }
 
 /**
- * Returns whether a menu name already exists.
+ * Checks whether a menu name already exists.
+ *
+ * @param $value
+ *   The menu name.
+ *
+ * @return
+ *   TRUE if the menu name already exists; FALSE otherwise.
  *
  * @see menu_edit_menu()
  * @see form_validate_machine_name()
@@ -575,7 +640,9 @@ function menu_edit_menu_name_exists($value) {
 }
 
 /**
- * Submit function for adding or editing a custom menu.
+ * Form submission handler for menu_edit_menu()
+ *
+ * Handles adding or editing a custom menu.
  */
 function menu_edit_menu_submit($form, &$form_state) {
   $menu = $form_state['values'];
@@ -610,7 +677,15 @@ function menu_edit_menu_submit($form, &$form_state) {
 }
 
 /**
- * Menu callback; Check access and present a confirm form for deleting a menu link.
+ * Page callback: Confirms deletion of a menu link.
+ *
+ * @param $item
+ *   An array representing the menu link.
+ *
+ * @return aray
+ *   A renderable array.
+ *
+ * @see menu_menu()
  */
 function menu_item_delete_page($item) {
   // Links defined via hook_menu may not be deleted. Updated items are an
@@ -623,7 +698,13 @@ function menu_item_delete_page($item) {
 }
 
 /**
- * Build a confirm form for deletion of a single menu link.
+ * Form constructor for a confirmation form for deleting a single menu link.
+ *
+ * @param $item
+ *   An array representing the menu link.
+ *
+ * @see menu_item_delete_form_submit()
+ * @ingroup forms
  */
 function menu_item_delete_form($form, &$form_state, $item) {
   $form['#item'] = $item;
@@ -631,7 +712,7 @@ function menu_item_delete_form($form, &$form_state, $item) {
 }
 
 /**
- * Process menu delete form submissions.
+ * Form submission handler for menu_item_delete_form().
  */
 function menu_item_delete_form_submit($form, &$form_state) {
   $item = $form['#item'];
@@ -643,7 +724,14 @@ function menu_item_delete_form_submit($form, &$form_state) {
 }
 
 /**
- * Menu callback; reset a single modified menu link.
+ * Form constructor to confirm resetting a single modified menu link.
+ *
+ * @param $item
+ *   An array representing the menu link.
+ *
+ * @see menu_menu()
+ * @see menu_reset_item_confirm_submit()
+ * @ingroup forms
  */
 function menu_reset_item_confirm($form, &$form_state, $item) {
   $form['item'] = array('#type' => 'value', '#value' => $item);
@@ -651,7 +739,7 @@ function menu_reset_item_confirm($form, &$form_state, $item) {
 }
 
 /**
- * Process menu reset item form submissions.
+ * Form submission handler for menu_reset_item_confirm().
  */
 function menu_reset_item_confirm_submit($form, &$form_state) {
   $item = $form_state['values']['item'];
@@ -661,7 +749,10 @@ function menu_reset_item_confirm_submit($form, &$form_state) {
 }
 
 /**
- * Menu callback; Build the form presenting menu configuration options.
+ * Form constructor for the menu configuration form.
+ *
+ * @see menu_menu()
+ * @ingroup forms
  */
 function menu_configure() {
   $form['intro'] = array(
diff --git a/core/modules/menu/menu.admin.js b/core/modules/menu/menu.admin.js
index 4fa094e..7680cf4 100644
--- a/core/modules/menu/menu.admin.js
+++ b/core/modules/menu/menu.admin.js
@@ -1,3 +1,7 @@
+/**
+ * @file
+ * Adds menu options to the node type form.
+ */
 (function ($) {
 
 Drupal.behaviors.menuChangeParentItems = {
diff --git a/core/modules/menu/menu.api.php b/core/modules/menu/menu.api.php
index 3f3818e..4f4cbac 100644
--- a/core/modules/menu/menu.api.php
+++ b/core/modules/menu/menu.api.php
@@ -11,7 +11,7 @@
  */
 
 /**
- * Informs modules that a custom menu was created.
+ * Respond to custom menu creation.
  *
  * This hook is used to notify modules that a custom menu has been created.
  * Contributed modules may use the information to perform actions based on the
@@ -34,7 +34,7 @@ function hook_menu_insert($menu) {
 }
 
 /**
- * Informs modules that a custom menu was updated.
+ * Respond to a custom menu update.
  *
  * This hook is used to notify modules that a custom menu has been updated.
  * Contributed modules may use the information to perform actions based on the
@@ -43,7 +43,7 @@ function hook_menu_insert($menu) {
  * @param $menu
  *   An array representing a custom menu:
  *   - menu_name: The unique name of the custom menu.
- *   - title: The human readable menu title.
+ *   - title: The human-readable menu title.
  *   - description: The custom menu description.
  *   - old_name: The current 'menu_name'. Note that internal menu names cannot
  *     be changed after initial creation.
@@ -59,17 +59,17 @@ function hook_menu_update($menu) {
 }
 
 /**
- * Informs modules that a custom menu was deleted.
+ * Respond to custom menu deletion.
  *
  * This hook is used to notify modules that a custom menu along with all links
  * contained in it (if any) has been deleted. Contributed modules may use the
  * information to perform actions based on the information entered into the menu
  * system.
  *
- * @param $link
+ * @param $menu
  *   An array representing a custom menu:
  *   - menu_name: The unique name of the custom menu.
- *   - title: The human readable menu title.
+ *   - title: The human-readable menu title.
  *   - description: The custom menu description.
  *
  * @see hook_menu_insert()
diff --git a/core/modules/menu/menu.js b/core/modules/menu/menu.js
index ff4ef1e..293a37e 100644
--- a/core/modules/menu/menu.js
+++ b/core/modules/menu/menu.js
@@ -1,3 +1,7 @@
+/**
+ * @file
+ * Adds menu fields to the node form.
+ */
 (function ($) {
 
 Drupal.behaviors.menuFieldsetSummaries = {
diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index 6862eae..cc0adb4 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -12,8 +12,9 @@
  */
 
 /**
- * Maximum length of menu name as entered by the user. Database length is 32
- * and we add a menu- prefix.
+ * Maximum length of menu name as entered by the user.
+ *
+ * Database length is 32 and we add a menu- prefix.
  */
 const MENU_MAX_MENU_NAME_LENGTH_UI = 27;
 
@@ -175,7 +176,7 @@ function menu_theme() {
 /**
  * Implements hook_enable().
  *
- * Add a link for each custom menu.
+ * Adds a link for each custom menu.
  */
 function menu_enable() {
   menu_rebuild();
@@ -202,17 +203,23 @@ function menu_enable() {
 }
 
 /**
- * Title callback for the menu overview page and links.
+ * Title callback: Returns a title for the menu overview page and links.
+ *
+ * @param $menu
+ *   An array defining a custom menu.
+ *
+ * @see menu_menu()
  */
 function menu_overview_title($menu) {
   return $menu['title'];
 }
 
 /**
- * Load the data for a single custom menu.
+ * Loads the data for a single custom menu.
  *
  * @param $menu_name
  *   The unique name of a custom menu to load.
+ *
  * @return
  *   Array defining the custom menu, or FALSE if the menu doesn't exist.
  */
@@ -222,7 +229,7 @@ function menu_load($menu_name) {
 }
 
 /**
- * Load all custom menu data.
+ * Loads all custom menu data.
  *
  * @return
  *   Array of custom menu data.
@@ -242,18 +249,18 @@ function menu_load_all() {
 }
 
 /**
- * Save a custom menu.
+ * Saves a custom menu.
+ *
+ * Modules should always pass a fully populated $menu when saving a custom menu,
+ * so other modules are able to output proper status or watchdog messages.
  *
  * @param $menu
  *   An array representing a custom menu:
  *   - menu_name: The unique name of the custom menu (composed of lowercase
  *     letters, numbers, and hyphens).
- *   - title: The human readable menu title.
+ *   - title: The human-readable menu title.
  *   - description: The custom menu description.
  *
- * Modules should always pass a fully populated $menu when saving a custom
- * menu, so other modules are able to output proper status or watchdog messages.
- *
  * @see menu_load()
  */
 function menu_save($menu) {
@@ -287,7 +294,7 @@ function menu_save($menu) {
 }
 
 /**
- * Delete a custom menu and all contained links.
+ * Deletes a custom menu and all contained links.
  *
  * Note that this function deletes all menu links in a custom menu. While menu
  * links derived from router paths may be restored by rebuilding the menu, all
@@ -295,20 +302,20 @@ function menu_save($menu) {
  * function should usually be called from a user interface (form submit) handler
  * only, which allows the user to confirm the action.
  *
+ * menu_delete_links() will take care of clearing the page cache. Other modules
+ * should take care of their menu-related data by implementing
+ * hook_menu_delete().
+ *
+ * Modules should always pass a fully populated $menu when deleting a custom
+ * menu, so other modules are able to output proper status or watchdog messages.
+ *
  * @param $menu
  *   An array representing a custom menu:
  *   - menu_name: The unique name of the custom menu.
  *   - title: The human readable menu title.
  *   - description: The custom menu description.
  *
- * Modules should always pass a fully populated $menu when deleting a custom
- * menu, so other modules are able to output proper status or watchdog messages.
- *
  * @see menu_load()
- *
- * menu_delete_links() will take care of clearing the page cache. Other modules
- * should take care of their menu-related data by implementing
- * hook_menu_delete().
  */
 function menu_delete($menu) {
   // Delete all links from the menu.
@@ -333,19 +340,20 @@ function menu_delete($menu) {
 }
 
 /**
- * Return a list of menu items that are valid possible parents for the given menu item.
+ * Returns a list of valid possible parents for the given menu item.
  *
  * @param $menus
  *   An array of menu names and titles, such as from menu_get_menus().
  * @param $item
- *   The menu item or the node type for which to generate a list of parents.
- *   If $item['mlid'] == 0 then the complete tree is returned.
+ *   The menu item or the node type for which to generate a list of parents. If
+ *   $item['mlid'] == 0 then the complete tree is returned.
  * @param $type
- *   The node type for which to generate a list of parents.
- *   If $item itself is a node type then $type is ignored.
+ *   The node type for which to generate a list of parents. If $item itself is a
+ *   node type then $type is ignored.
+ *
  * @return
  *   An array of menu link titles keyed on the a string containing the menu name
- *   and mlid. The list excludes the given item and its children.
+ *   and menu link ID. The list excludes the given item and its children.
  *
  * @todo This has to be turned into a #process form element callback. The
  *   'menu_override_parent_selector' variable is entirely superfluous.
@@ -382,8 +390,11 @@ function menu_parent_options($menus, $item, $type = '') {
 }
 
 /**
- * Page callback.
- * Get all the available menus and menu items as a JavaScript array.
+ * Page callback: Gets all the available menus and menu items.
+ *
+ * The menus and menu items are output as a JavaScript array.
+ *
+ * @see menu_menu()
  */
 function menu_parent_options_js() {
   $available_menus = array();
@@ -398,8 +409,20 @@ function menu_parent_options_js() {
 }
 
 /**
- * Helper function to get the items of the given menu.
+ * Gets the items of the given menus.
+ *
+ * @param $menus
+ *   An array of menu names and titles, such as from menu_get_menus().
+ * @param $available_menus
+ *   An array of menu names and titles of menus that $item can be assigned to.
+ * @param $item
+ *   The menu item for which to generate a list of parents. If
+ *   $item['mlid'] == 0 then the complete tree is returned.
+ *
+ * @return
+ *   An array of menu items to be used as options in a select form element.
  */
+
 function _menu_get_options($menus, $available_menus, $item) {
   // If the item has children, there is an added limit to the depth of valid parents.
   if (isset($item['parent_depth_limit'])) {
@@ -421,7 +444,23 @@ function _menu_get_options($menus, $available_menus, $item) {
 }
 
 /**
- * Recursive helper function for menu_parent_options().
+ * Adds menu links to an option array.
+ *
+ * Helper function for menu_parent_options().
+ *
+ * @param $tree
+ *   A tree of menu links in an array.
+ * @param $menu_name
+ *   The name of the menu represented in $tree.
+ * @param $indent
+ *   Text to prefix indented menu items with.
+ * @param $options
+ *   An array of menu items to be used as options in a select form element.
+ *   This array is updated by reference.
+ * @param $exclude
+ *   A menu link ID to exclude from the options.
+ * @param $depth_limit
+ *   Maximum depth of links to retrieve.
  */
 function _menu_parents_recurse($tree, $menu_name, $indent, &$options, $exclude, $depth_limit) {
   foreach ($tree as $data) {
@@ -443,7 +482,13 @@ function _menu_parents_recurse($tree, $menu_name, $indent, &$options, $exclude,
 }
 
 /**
- * Reset a system-defined menu link.
+ * Resets a system-defined menu link.
+ *
+ * @param $link
+ *   The link that is to be reset.
+ *
+ * @return
+ *   The link after it has been reset.
  */
 function menu_reset_item($link) {
   // To reset the link to its original values, we need to retrieve its
@@ -521,7 +566,12 @@ function menu_node_update($node) {
 }
 
 /**
+ * Updates menus when a node is saved.
+ *
  * Helper for hook_node_insert() and hook_node_update().
+ *
+ * @param $node
+ *   The node that is being saved.
  */
 function menu_node_save($node) {
   if (isset($node->menu)) {
@@ -611,7 +661,13 @@ function menu_node_prepare($node) {
 }
 
 /**
- * Find the depth limit for items in the parent select.
+ * Finds the depth limit for items in the parent select.
+ *
+ * @param $item
+ *   An array representing a menu link.
+ *
+ * @return
+ *   The depth limit.
  */
 function _menu_parent_depth_limit($item) {
   return MENU_MAX_DEPTH - 1 - (($item['mlid'] && $item['has_children']) ? menu_link_children_relative_depth($item) : 0);
@@ -772,11 +828,12 @@ function menu_form_node_type_form_alter(&$form, $form_state) {
 }
 
 /**
- * Return an associative array of the custom menus names.
+ * Returns an associative array of the custom menu names.
  *
  * @param $all
  *   If FALSE return only user-added menus, or if TRUE also include
  *   the menus defined by the system.
+ *
  * @return
  *   An array with the machine-readable names as the keys, and human-readable
  *   titles as the values.
diff --git a/core/modules/menu/menu.test b/core/modules/menu/menu.test
index e1f2aa9..3f9cc1e 100644
--- a/core/modules/menu/menu.test
+++ b/core/modules/menu/menu.test
@@ -5,12 +5,33 @@
  * Tests for menu.module.
  */
 
+/**
+ * Provides tests for menu administration.
+ */
 class MenuTestCase extends DrupalWebTestCase {
+  /**
+   * Requires Standard profile modules/dependencies.
+   */
   protected $profile = 'standard';
 
+  /**
+   * A user with various administrative privileges.
+   */
   protected $big_user;
+
+  /**
+   * A user with no administrative privileges.
+   */
   protected $std_user;
+
+  /**
+   * An array representing a menu.
+   */
   protected $menu;
+
+  /**
+   * An array of menu items.
+   */
   protected $items;
 
   public static function getInfo() {
@@ -29,7 +50,7 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Login users, add menus and menu links, and test menu functionality through the admin and user interfaces.
+   * Tests menu functionality through the admin and user interfaces.
    */
   function testMenu() {
     // Login the user.
@@ -77,8 +98,7 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test standard menu functionality using navigation menu.
-   *
+   * Tests standard menu functionality the using navigation menu.
    */
   function doStandardMenuTests() {
     $this->doMenuTests();
@@ -86,8 +106,7 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test custom menu functionality using navigation menu.
-   *
+   * Tests custom menu functionality using the navigation menu.
    */
   function doCustomMenuTests() {
     $this->menu = $this->addCustomMenu();
@@ -97,7 +116,7 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Add custom menu using CRUD functions.
+   * Adds a custom menu using CRUD functions.
    */
   function addCustomMenuCRUD() {
     // Add a new custom menu.
@@ -124,7 +143,10 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Add custom menu.
+   * Adds a custom menu.
+   *
+   * @return
+   *   The new menu.
    */
   function addCustomMenu() {
     // Add custom menu.
@@ -175,9 +197,10 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Delete custom menu.
+   * Deletes a custom menu.
    *
-   * @param string $menu_name Custom menu name.
+   * @param string $menu_name
+   *   The custom menu name.
    */
   function deleteCustomMenu($menu) {
     $menu_name = $this->menu['menu_name'];
@@ -194,8 +217,10 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test menu functionality using navigation menu.
+   * Tests menu functionality using the navigation menu.
    *
+   * @param $menu_name
+   *   The menu name.
    */
   function doMenuTests($menu_name = 'navigation') {
     // Add nodes to use as links for menu links.
@@ -258,7 +283,7 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Add and remove a menu link with a query string and fragment.
+   * Adds and removes a menu link with a query string and fragment.
    */
   function testMenuQueryAndFragment() {
     $this->drupalLogin($this->big_user);
@@ -278,12 +303,17 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Add a menu link using the menu module UI.
+   * Adds a menu link using the Menu module UI.
+   *
+   * @param integer $plid
+   *   The parent menu link ID.
+   * @param string $link
+   *   The link path.
+   * @param string $menu_name
+   *   The menu name.
    *
-   * @param integer $plid Parent menu link id.
-   * @param string $link Link path.
-   * @param string $menu_name Menu name.
-   * @return array Menu link created.
+   * @return array
+   *   The menu link that was created.
    */
   function addMenuLink($plid = 0, $link = '<front>', $menu_name = 'navigation', $expanded = TRUE) {
     // View add menu link page.
@@ -315,9 +345,10 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Attempt to add menu link with invalid path or no access permission.
+   * Attempts to add a menu link with invalid path or no access permission.
    *
-   * @param string $menu_name Menu name.
+   * @param string $menu_name
+   *   The menu name.
    */
   function addInvalidMenuLink($menu_name = 'navigation') {
     foreach (array('-&-', 'admin/people/permissions', '#') as $link_path) {
@@ -331,12 +362,16 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Verify a menu link using the menu module UI.
+   * Verifies a menu link using the Menu module UI.
    *
-   * @param array $item Menu link.
-   * @param object $item_node Menu link content node.
-   * @param array $parent Parent menu link.
-   * @param object $parent_node Parent menu link content node.
+   * @param array $item
+   *   The menu link.
+   * @param object $item_node
+   *   The menu link content node.
+   * @param array $parent
+   *   The parent menu link.
+   * @param object $parent_node
+   *   The parent menu link content node.
    */
   function verifyMenuLink($item, $item_node, $parent = NULL, $parent_node = NULL) {
     // View home page.
@@ -366,7 +401,14 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Change the parent of a menu link using the menu module UI.
+   * Changes the parent of a menu link using the Menu module UI.
+   *
+   * @param $item
+   *   The menu link.
+   * @param $plid
+   *   The parent menu link ID.
+   * @param $menu_name
+   *   The menu name.
    */
   function moveMenuLink($item, $plid, $menu_name) {
     $mlid = $item['mlid'];
@@ -379,9 +421,10 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Modify a menu link using the menu module UI.
+   * Modifies a menu link using the Menu module UI.
    *
-   * @param array $item Menu link passed by reference.
+   * @param array $item
+   *   A menu link passed by reference.
    */
   function modifyMenuLink(&$item) {
     $item['link_title'] = $this->randomName(16);
@@ -402,10 +445,12 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Reset a standard menu link using the menu module UI.
+   * Resets a standard menu link using the Menu module UI.
    *
-   * @param array $item Menu link.
-   * @param string $old_title Original title for menu link.
+   * @param array $item
+   *   The menu link.
+   * @param string $old_title
+   *   Original title for the menu link.
    */
   function resetMenuLink($item, $old_title) {
     $mlid = $item['mlid'];
@@ -423,9 +468,10 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Delete a menu link using the menu module UI.
+   * Deletes a menu link using the Menu module UI.
    *
-   * @param array $item Menu link.
+   * @param array $item
+   *   The menu link.
    */
   function deleteMenuLink($item) {
     $mlid = $item['mlid'];
@@ -442,10 +488,10 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Alternately disable and enable a menu link.
+   * Alternately disables and enables a menu link.
    *
    * @param $item
-   *   Menu link.
+   *   The menu link.
    */
   function toggleMenuLink($item) {
     $this->disableMenuLink($item);
@@ -461,10 +507,10 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Disable a menu link.
+   * Disables a menu link.
    *
    * @param $item
-   *   Menu link.
+   *   The menu link.
    */
   function disableMenuLink($item) {
     $mlid = $item['mlid'];
@@ -477,10 +523,10 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Enable a menu link.
+   * Enables a menu link.
    *
    * @param $item
-   *   Menu link.
+   *   The menu link.
    */
   function enableMenuLink($item) {
     $mlid = $item['mlid'];
@@ -492,13 +538,12 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Fetch the menu item from the database and compare it to the specified
-   * array.
+   * Gets a menu item from the database and compares it to the specified array.
    *
    * @param $mlid
-   *   Menu item id.
+   *   The menu item ID.
    * @param $item
-   *   Array containing properties to verify.
+   *   An array containing properties to verify.
    */
   function assertMenuLink($mlid, array $expected_item) {
     // Retrieve menu link.
@@ -516,7 +561,10 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Get standard menu link.
+   * Gets a standard menu link.
+   *
+   * @return
+   *   The menu link.
    */
   private function getStandardMenuLink() {
     // Retrieve menu link id of the Log out menu link, which will always be on the front page.
@@ -530,9 +578,10 @@ class MenuTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Verify the logged in user has the desired access to the various menu nodes.
+   * Verifies that the user has the desired access to the various menu nodes.
    *
-   * @param integer $response HTTP response code.
+   * @param integer $response
+   *   An HTTP response code.
    */
   private function verifyAccess($response = 200) {
     // View menu help node.
@@ -581,7 +630,7 @@ class MenuTestCase extends DrupalWebTestCase {
 }
 
 /**
- * Test menu settings for nodes.
+ * Tests menu settings for nodes.
  */
 class MenuNodeTestCase extends DrupalWebTestCase {
   protected $profile = 'standard';
@@ -609,7 +658,7 @@ class MenuNodeTestCase extends DrupalWebTestCase {
   }
 
   /**
-   * Test creating, editing, deleting menu links via node form widget.
+   * Tests creating, editing, and deleting menu links via node form widget.
    */
   function testMenuNodeFormWidget() {
     // Enable Navigation menu as available menu.