Index: modules/field/field.info.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.info.inc,v
retrieving revision 1.56
diff -u -p -r1.56 field.info.inc
--- modules/field/field.info.inc	23 Oct 2010 15:55:04 -0000	1.56
+++ modules/field/field.info.inc	15 Dec 2010 10:28:20 -0000
@@ -167,15 +167,15 @@ function _field_info_collate_types($rese
  * @return
  *   If $reset is TRUE, nothing.
  *   If $reset is FALSE, an array containing the following elements:
- *   - fields: Array of existing fields, keyed by field name. This entry only
- *     lists non-deleted fields. Each field has an additional element,
- *     'bundles', which is an array of all non-deleted instances to which the
- *     field is assigned.
- *   - fields_id: Array of existing fields, keyed by field id. This entry lists
- *     both deleted and non-deleted fields. The bundles element is the same as
- *     for 'fields'.
+ *   - fields: Array of existing fields, keyed by field id. This entry
+ *     lists deleted and non-deleted fields, but not inactive ones. 
+ *     Each field has an additional element, 'bundles', which is an array 
+ *     of all non-deleted instances to which the field is assigned.
+ *   - fields_id: Array of field ids, keyed by field name. This entry only lists
+ *     non-deleted, active fields.
  *   - instances: Array of existing instances, keyed by entity type, bundle
- *     name and field name. This entry only lists non-deleted instances.
+ *     name and field name. This entry only lists non-deleted instances whose
+ *     field is marked active.
  */
 function _field_info_collate_fields($reset = FALSE) {
   static $info;