Index: modules/node/node.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.install,v
retrieving revision 1.25
diff -u -r1.25 node.install
--- modules/node/node.install	27 Jul 2009 19:26:31 -0000	1.25
+++ modules/node/node.install	18 Aug 2009 17:07:04 -0000
@@ -300,7 +300,7 @@
         'default' => '',
       ),
       'custom' => array(
-        'description' => 'A boolean indicating whether this type is defined by a module (FALSE) or by a user via a module like the Content Construction Kit (TRUE).',
+        'description' => 'A boolean indicating whether this type is defined by a module (FALSE) or by a user via Add content type (TRUE).',
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
Index: modules/simpletest/tests/field_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/field_test.module,v
retrieving revision 1.14
diff -u -r1.14 field_test.module
--- modules/simpletest/tests/field_test.module	11 Aug 2009 14:59:40 -0000	1.14
+++ modules/simpletest/tests/field_test.module	18 Aug 2009 17:07:04 -0000
@@ -424,7 +424,7 @@
 /**
  * Implement hook_field_widget_info().
  *
- * Here we indicate that the content module will handle
+ * Here we indicate that the field module will handle
  * the default value and multiple values for these widgets.
  *
  * Callbacks can be omitted if default handing is used.
@@ -464,11 +464,7 @@
  * plugged into any module that can provide it with valid
  * $field information.
  *
- * Content module will set the weight, field name and delta values
- * for each form element. This is a change from earlier CCK versions
- * where the widget managed its own multiple values.
- *
- * If there are multiple values for this field, the content module will
+ * If there are multiple values for this field, the field module will
  * call this function as many times as needed.
  *
  * @param $form
Index: modules/field/field.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.module,v
retrieving revision 1.22
diff -u -r1.22 field.module
--- modules/field/field.module	11 Aug 2009 14:59:40 -0000	1.22
+++ modules/field/field.module	18 Aug 2009 17:07:04 -0000
@@ -37,8 +37,7 @@
  * - @link field_crud Field CRUD API @endlink. Create, updates, and
  *   deletes fields, bundles (a.k.a. "content types"), and instances.
  *   Modules use this API, often in hook_install(), to create
- *   custom data structures. The Content Construction Kit
- *   user-interface module uses this API for its major functionality.
+ *   custom data structures.
  *
  * - @link field_attach Field Attach API @endlink. Connects object
  *   types to the Field API. Field Attach API functions load, store,
@@ -135,7 +134,6 @@
   switch ($path) {
     case 'admin/help#field':
       $output = '<p>' . t('The Field API allows custom data fields to be attached to Drupal objects and takes care of storing, loading, editing, and rendering field data. Any object type (node, user, etc.) can use the Field API to make itself "fieldable" and thus allow fields to be attached to it.') . '</p>';
-      $output .= '<p>' . t('The Field API provides no user interface on its own. Use the Content Construction Kit (CCK) contrib module to manage custom fields via a web browser.') . '</p>';
       return $output;
   }
 }
@@ -391,7 +389,7 @@
  *
  * TODO D7 : do we still need field_format ?
  * - backwards compatibility of templates - check what fallbacks we can propose...
- * - used by Views integration in CCK D6
+ * - was used by Views integration in CCK in D6 - do we need now?
  * At least needs a little rehaul/update...
  *
  * Used to display a field's values outside the context of the $node, as
Index: CHANGELOG.txt
===================================================================
RCS file: /cvs/drupal/drupal/CHANGELOG.txt,v
retrieving revision 1.327
diff -u -r1.327 CHANGELOG.txt
--- CHANGELOG.txt	14 Aug 2009 05:44:20 -0000	1.327
+++ CHANGELOG.txt	18 Aug 2009 17:07:04 -0000
@@ -131,7 +131,7 @@
       being a hard-coded property of node objects.
     * In addition, any other object type may register with Field API
       and allow custom data fields to be attached to itself.
-    * Provides a subset of the features of the Content Construction
+    * Provides most of the features of the former Content Construction
       Kit (CCK) module.
     * Taxonomy terms are now Field API fields that can be added to any fieldable
       object.