commit aaff3c235d78b1e7cd21f0419eec1b26e6709c16
Author: Nikki Stevens <nikkilstevens@gmail.com>
Date:   Sat Jul 28 16:32:18 2012 -0400

    1326666-new changes

diff --git a/core/modules/user/tests/user_form_test.module b/core/modules/user/tests/user_form_test.module
index 56bcf25..50fd4ea 100644
--- a/core/modules/user/tests/user_form_test.module
+++ b/core/modules/user/tests/user_form_test.module
@@ -25,6 +25,9 @@ function user_form_test_menu() {
 /**
  * Form constructor for user_validate_current_pass() test form.
  *
+ * @param account
+ *   user account object
+ *
  * @see user_form_test_current_password_submit()
  */
 function user_form_test_current_password($form, &$form_state, $account) {
diff --git a/core/modules/user/user.admin.inc b/core/modules/user/user.admin.inc
index 6114f5c..37b66fd 100644
--- a/core/modules/user/user.admin.inc
+++ b/core/modules/user/user.admin.inc
@@ -962,6 +962,9 @@ function theme_user_admin_roles($variables) {
 /**
  * Form constructor for the role configuration form.
  *
+ * @param role
+ *   user role object
+ *
  * @see user_admin_role_validate()
  * @see user_admin_role_submit()
  * @ingroup forms
@@ -1030,8 +1033,8 @@ function user_admin_role_submit($form, &$form_state) {
 /**
  * Form submission handler for user_admin_role().
  *
- * Called when a user clicks on the 'Delete Role' button. Redirects the user to
- * a confirmation dialogue.
+ * Called when a user clicks on the 'Delete role' button. Redirects the user to
+ * a confirmation dialog.
  *
  * @see user_admin_role_delete_confirm()
  * @see user_admin_role_delete_confirm_submit()
@@ -1043,6 +1046,9 @@ function user_admin_role_delete_submit($form, &$form_state) {
 /**
  * Form constructor for the confirm role delete form.
  *
+ * @param role
+ *   user role object
+ *
  * @see user_admin_role_delete_confirm_submit()
  */
 function user_admin_role_delete_confirm($form, &$form_state, $role) {
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 26a63d8..d1eee36 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -3046,7 +3046,11 @@ function user_multiple_role_edit($accounts, $operation, $rid) {
 }
 
 /**
- * Form constructor for multiple user account cancellation confirmation form.
+ * Form constructor for the multiple user account
+ * cancellation confirmation form.
+ *
+ * @see user_multiple_cancel_confirm_submit()
+ * @ingroup forms
  */
 function user_multiple_cancel_confirm($form, &$form_state) {
   $edit = $form_state['input'];
@@ -3270,7 +3274,7 @@ function theme_user_signature($variables) {
  * Gets the language object preferred by the user.
  *
  * This user preference can be set on the user account editing page, and is only
- * available if there are more than one languages enabled on the site. If the
+ * available if there is more than one language enabled on the site. If the
  * user did not choose a preferred language, or is the anonymous user, the
  * $default value, or if it is not set, the site default language will be
  * returned.
diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc
index b4b0ba4..363eac9 100644
--- a/core/modules/user/user.pages.inc
+++ b/core/modules/user/user.pages.inc
@@ -309,7 +309,7 @@ function user_profile_form_submit($form, &$form_state) {
  * Form submission handler for user_profile_form().
  *
  * Called when the 'Cancel account' button is clicked. Redirects the user to a
- * confirm dialogue.
+ * confirm dialog.
  */
 function user_edit_cancel_submit($form, &$form_state) {
   $destination = array();
@@ -324,6 +324,9 @@ function user_edit_cancel_submit($form, &$form_state) {
 /**
  * Form constructor for the user cancellation confirm form.
  *
+ * @param account
+ *   user account object
+ *
  * @see user_edit_cancel_submit()
  * @ingroup forms
  */