diff --git a/modules/field/field.api.php b/modules/field/field.api.php
index 5ed0369..66b9056 100644
--- a/modules/field/field.api.php
+++ b/modules/field/field.api.php
@@ -688,6 +688,72 @@ function hook_field_is_empty($item, $field) {
 }
 
 /**
+ * Alters the display settings of a field on a given entity type before it gets displayed.
+ *
+ * Modules can implement hook_field_display_ENTITY_TYPE_alter() to alter display
+ * settings for fields on a specific entity type, rather than implementing
+ * hook_field_display_alter().
+ *
+ * This hook is called once per field per displayed entity. If the result of the
+ * hook involves reading from the database, it is highly recommended to
+ * statically cache the information.
+ *
+ * @param $display
+ *   The display settings that will be used to display the field values, as
+ *   found in the 'display' key of $instance definitions.
+ * @param $context
+ *   An associative array containing:
+ *   - entity_type: The entity type; e.g., 'node' or 'user'.
+ *   - field: The field being rendered.
+ *   - instance: The instance being rendered.
+ *   - entity: The entity being rendered.
+ *   - view_mode: The view mode, e.g. 'full', 'teaser'...
+ *
+ * @see hook_field_display_alter()
+ */
+function hook_field_display_ENTITY_TYPE_alter(&$display, $context) {
+  // Leave field labels out of the search index.
+  if ($context['view_mode'] == 'search_index') {
+    $display['label'] = 'hidden';
+  }
+}
+
+/**
+ * Alters the display settings of a field before it gets displayed.
+ *
+ * Note that instead of hook_field_display_alter(), which is called for all
+ * fields on all entity types, hook_field_display_ENTITY_TYPE_alter() may be
+ * used to alter display settings for fields on a specific entity type only.
+ *
+ * This hook is called once per field per displayed entity. If the result of the
+ * hook involves reading from the database, it is highly recommended to
+ * statically cache the information.
+ *
+ * @param $display
+ *   The display settings that will be used to display the field values, as
+ *   found in the 'display' key of $instance definitions.
+ * @param $context
+ *   An associative array containing:
+ *   - entity_type: The entity type; e.g., 'node' or 'user'.
+ *   - field: The field being rendered.
+ *   - instance: The instance being rendered.
+ *   - entity: The entity being rendered.
+ *   - view_mode: The view mode, e.g. 'full', 'teaser'...
+ *
+ * @see hook_field_display_ENTITY_TYPE_alter()
+ */
+function hook_field_display_alter(&$display, $context) {
+  // Leave field labels out of the search index.
+  // Note: The check against $context['entity_type'] == 'node' could be avoided
+  // by using hook_field_display_node_alter() instead of
+  // hook_field_display_alter(), resulting in less function calls when
+  // rendering non-node entities.
+  if ($context['entity_type'] == 'node' && $context['view_mode'] == 'search_index') {
+    $display['label'] = 'hidden';
+  }
+}
+
+/**
  * @} End of "defgroup field_types".
  */
 
@@ -2270,99 +2336,6 @@ function hook_field_storage_pre_update($entity_type, $entity, &$skip_fields) {
 }
 
 /**
- * Returns the maximum weight for the entity components handled by the module.
- *
- * Field API takes care of fields and 'extra_fields'. This hook is intended for
- * third-party modules adding other entity components (e.g. field_group).
- *
- * @param $entity_type
- *   The type of entity; e.g. 'node' or 'user'.
- * @param $bundle
- *   The bundle name.
- * @param $context
- *   The context for which the maximum weight is requested. Either 'form', or
- *   the name of a view mode.
- * @return
- *   The maximum weight of the entity's components, or NULL if no components
- *   were found.
- */
-function hook_field_info_max_weight($entity_type, $bundle, $context) {
-  $weights = array();
-
-  foreach (my_module_entity_additions($entity_type, $bundle, $context) as $addition) {
-    $weights[] = $addition['weight'];
-  }
-
-  return $weights ? max($weights) : NULL;
-}
-
-/**
- * Alters the display settings of a field before it gets displayed.
- *
- * Note that instead of hook_field_display_alter(), which is called for all
- * fields on all entity types, hook_field_display_ENTITY_TYPE_alter() may be
- * used to alter display settings for fields on a specific entity type only.
- *
- * This hook is called once per field per displayed entity. If the result of the
- * hook involves reading from the database, it is highly recommended to
- * statically cache the information.
- *
- * @param $display
- *   The display settings that will be used to display the field values, as
- *   found in the 'display' key of $instance definitions.
- * @param $context
- *   An associative array containing:
- *   - entity_type: The entity type; e.g., 'node' or 'user'.
- *   - field: The field being rendered.
- *   - instance: The instance being rendered.
- *   - entity: The entity being rendered.
- *   - view_mode: The view mode, e.g. 'full', 'teaser'...
- *
- * @see hook_field_display_ENTITY_TYPE_alter()
- */
-function hook_field_display_alter(&$display, $context) {
-  // Leave field labels out of the search index.
-  // Note: The check against $context['entity_type'] == 'node' could be avoided
-  // by using hook_field_display_node_alter() instead of
-  // hook_field_display_alter(), resulting in less function calls when
-  // rendering non-node entities.
-  if ($context['entity_type'] == 'node' && $context['view_mode'] == 'search_index') {
-    $display['label'] = 'hidden';
-  }
-}
-
-/**
- * Alters the display settings of a field on a given entity type before it gets displayed.
- *
- * Modules can implement hook_field_display_ENTITY_TYPE_alter() to alter display
- * settings for fields on a specific entity type, rather than implementing
- * hook_field_display_alter().
- *
- * This hook is called once per field per displayed entity. If the result of the
- * hook involves reading from the database, it is highly recommended to
- * statically cache the information.
- *
- * @param $display
- *   The display settings that will be used to display the field values, as
- *   found in the 'display' key of $instance definitions.
- * @param $context
- *   An associative array containing:
- *   - entity_type: The entity type; e.g., 'node' or 'user'.
- *   - field: The field being rendered.
- *   - instance: The instance being rendered.
- *   - entity: The entity being rendered.
- *   - view_mode: The view mode, e.g. 'full', 'teaser'...
- *
- * @see hook_field_display_alter()
- */
-function hook_field_display_ENTITY_TYPE_alter(&$display, $context) {
-  // Leave field labels out of the search index.
-  if ($context['view_mode'] == 'search_index') {
-    $display['label'] = 'hidden';
-  }
-}
-
-/**
  * Alters the display settings of pseudo-fields before an entity is displayed.
  *
  * This hook is called once per displayed entity. If the result of the hook
@@ -2674,6 +2647,42 @@ function hook_field_storage_purge($entity_type, $entity, $field, $instance) {
  */
 
 /**
+ * @addtogroup field_info Field Info API
+ * @{
+ */
+
+/**
+ * Returns the maximum weight for the entity components handled by the module.
+ *
+ * Field API takes care of fields and 'extra_fields'. This hook is intended for
+ * third-party modules adding other entity components (e.g. field_group).
+ *
+ * @param $entity_type
+ *   The type of entity; e.g. 'node' or 'user'.
+ * @param $bundle
+ *   The bundle name.
+ * @param $context
+ *   The context for which the maximum weight is requested. Either 'form', or
+ *   the name of a view mode.
+ * @return
+ *   The maximum weight of the entity's components, or NULL if no components
+ *   were found.
+ */
+function hook_field_info_max_weight($entity_type, $bundle, $context) {
+  $weights = array();
+
+  foreach (my_module_entity_additions($entity_type, $bundle, $context) as $addition) {
+    $weights[] = $addition['weight'];
+  }
+
+  return $weights ? max($weights) : NULL;
+}
+
+/**
+ * @} End of "addtogroup field_info".
+ */
+
+/**
  * Determine whether the user has access to a given field.
  *
  * This hook is invoked from field_access() to let modules block access to