diff --git modules/field/field.attach.inc modules/field/field.attach.inc
index baf9a61..0c52ef8 100644
--- modules/field/field.attach.inc
+++ modules/field/field.attach.inc
@@ -520,8 +520,6 @@ function _field_invoke_get_instances($entity_type, $bundle, $options) {
  *
  * Additionally, some processing data is placed in $form_state, and can be
  * accessed by field_form_get_state() and field_form_set_state().
- * @see field_form_get_state()
- * @see field_form_set_state()
  *
  * @param $entity_type
  *   The type of $entity; e.g. 'node' or 'user'.
@@ -539,10 +537,9 @@ function _field_invoke_get_instances($entity_type, $bundle, $options) {
  * @param $langcode
  *   The language the field values are going to be entered, if no language
  *   is provided the default site language will be used.
- * @return
- *   The form elements are added by reference at the top level of the $form
- *   parameter. Processing information is added by reference in
- *   $form_state['field'].
+ *
+ * @see field_form_get_state()
+ * @see field_form_set_state()
  */
 function field_attach_form($entity_type, $entity, &$form, &$form_state, $langcode = NULL) {
   // Set #parents to 'top-level' by default.
diff --git modules/field/field.form.inc modules/field/field.form.inc
index 732fa17..7ee8c13 100644
--- modules/field/field.form.inc
+++ modules/field/field.form.inc
@@ -423,8 +423,6 @@ function field_add_more_js($form, $form_state) {
 /**
  * Retrieves processing information about a field from $form_state.
  *
- * @see field_form_set_state()
- *
  * @param $parents
  *   The array of #parents where the field lives in the form.
  * @param $field_name
@@ -443,6 +441,8 @@ function field_add_more_js($form, $form_state) {
  *     structure. This entry is populated at '#fter_build' time.
  *   - errors: the array of field validation errors reported on the field. This
  *     entry is populated at field_attach_form_validate() time.
+ *
+ * @see field_form_set_state()
  */
 function field_form_get_state($parents, $field_name, $langcode, &$form_state) {
   $path = _field_form_state_path($parents, $field_name, $langcode);
@@ -452,8 +452,6 @@ function field_form_get_state($parents, $field_name, $langcode, &$form_state) {
 /**
  * Stores processing information about a field in $form_state.
  *
- * @see field_form_get_state()
- *
  * @param $parents
  *   The array of #parents where the field lives in the form.
  * @param $field_name
@@ -465,6 +463,8 @@ function field_form_get_state($parents, $field_name, $langcode, &$form_state) {
  * @param $field_state
  *   The array of data to store. See field_form_get_state() for the structure
  *   and content of the array.
+ *
+ * @see field_form_get_state()
  */
 function field_form_set_state($parents, $field_name, $langcode, &$form_state, $field_state) {
   $path = _field_form_state_path($parents, $field_name, $langcode);
@@ -504,15 +504,16 @@ function _field_form_state_path($parents, $field_name, $langcode) {
  * field_info_instance() when they need to access field or instance properties.
  * See hook_field_widget_form() for more details.
  *
- * @see field_widget_instance()
- * @see hook_field_widget_form()
- *
  * @param $element
  *   The structured array for the widget.
  * @param $form_state
  *   The form state.
+ *
  * @return
  *   The $field definition array for the current widget.
+ *
+ * @see field_widget_instance()
+ * @see hook_field_widget_form()
  */
 function field_widget_field($element, $form_state) {
   $field_state = field_form_get_state($element['#field_parents'], $element['#field_name'], $element['#language'], $form_state);
@@ -528,15 +529,16 @@ function field_widget_field($element, $form_state) {
  * field_info_instance() when they need to access field or instance properties.
  * See hook_field_widget_form() for more details.
  *
- * @see field_widget_field()
- * @see hook_field_widget_form()
- *
  * @param $element
  *   The structured array for the widget.
  * @param $form_state
  *   The form state.
+ *
  * @return
  *   The $instance definition array for the current widget.
+ *
+ * @see field_widget_field()
+ * @see hook_field_widget_form()
  */
 function field_widget_instance($element, $form_state) {
   $field_state = field_form_get_state($element['#field_parents'], $element['#field_name'], $element['#language'], $form_state);