Index: modules/field_ui/field_ui.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/field_ui/field_ui.test,v
retrieving revision 1.2
diff -u -r1.2 field_ui.test
--- modules/field_ui/field_ui.test	2 Nov 2009 15:59:28 -0000	1.2
+++ modules/field_ui/field_ui.test	8 Nov 2009 04:45:58 -0000
@@ -13,7 +13,7 @@
     public static function getInfo() {
     return array(
       'name' => 'Field UI tests',
-      'description' => 'Test the filed UI functionality.',
+      'description' => 'Test the field UI functionality.',
       'group' => 'Field UI',
     );
   }
@@ -87,7 +87,7 @@
     $edit['_add_new_field[widget_type]'] = 'test_field_widget';
     $this->drupalPost('admin/structure/types/manage/' . $this->hyphen_type . '/fields',  $edit, t('Save'));
 
-    $this->assertText(t('@label field settings', array('@label' => $this->field_label)), t('Field settings page was displayed.'));
+    $this->assertRaw(t('These settings apply to the %label field everywhere it is used.', array('%label' => $this->field_label)), t('Field settings page was displayed.'));
 
     $this->drupalPost(NULL, array(), t('Save field settings'));
 
Index: modules/field_ui/field_ui.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field_ui/field_ui.admin.inc,v
retrieving revision 1.27
diff -u -r1.27 field_ui.admin.inc
--- modules/field_ui/field_ui.admin.inc	3 Nov 2009 05:27:18 -0000	1.27
+++ modules/field_ui/field_ui.admin.inc	8 Nov 2009 04:45:57 -0000
@@ -812,20 +812,14 @@
     $field = field_read_field($field['field_name']);
   }
 
-  $field_type = field_info_field_types($field['type']);
-
-  $info_function = $field['module'] . '_field_info';
-  $info = $info_function();
-  $description = '<p><strong>' . $info[$field['type']]['label'] . ':</strong> ';
-  $description .= $info[$field['type']]['description'] . '</p>';
-  $form['#prefix'] = '<div class="description">' . $description . '</div>';
+  drupal_set_title($instance['label']);
 
   $description = '<p>' . t('These settings apply to the %field field everywhere it is used. These settings impact the way that data is stored in the database and cannot be changed once data has been created.', array('%field' => $instance['label'])) . '</p>';
 
   // Create a form structure for the field values.
   $form['field'] = array(
     '#type' => 'fieldset',
-    '#title' => t('%field field settings', array('%field' => $instance['label'])),
+    '#title' => t('Field settings'),
     '#description' => $description,
     '#tree' => TRUE,
   );
@@ -856,7 +850,7 @@
   // responsible for not returning settings that cannot be changed if
   // the field already has data.
   $form['field']['settings'] = array();
-  $additions = module_invoke($field_type['module'], 'field_settings_form', $field, $instance, $has_data);
+  $additions = module_invoke($field['module'], 'field_settings_form', $field, $instance, $has_data);
   if (is_array($additions)) {
     $form['field']['settings'] = $additions;
   }
@@ -1138,11 +1132,6 @@
     field_ui_default_value_widget($field, $instance, $form, $form_state);
   }
 
-  $info = field_info_field_types($field['type']);
-  $description = '<p><strong>' . $info['label'] . ':</strong> ';
-  $description .= $info['description'] . '</p>';
-  $form['#prefix'] = '<div class="description">' . $description . '</div>';
-
   $has_data = field_has_data($field);
   if ($has_data) {
     $description = '<p>' . t('These settings apply to the %field field everywhere it is used. Because the field already has data, some settings can no longer be changed.', array('%field' => $instance['label'])) . '</p>';