? .DS_Store
? node-content_type_overview-302120-16.patch
? node-content_type_overview-302120-19.patch
? vertical-tabs-323112-10.patch
? vertical-tabs-323112-8.patch
? vertical-tabs.patch
? modules/book/book.js
? sites/default/files
? sites/default/settings.php
Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.58
diff -u -p -r1.58 content_types.inc
--- modules/node/content_types.inc	8 Oct 2008 03:27:56 -0000	1.58
+++ modules/node/content_types.inc	1 Nov 2008 02:26:19 -0000
@@ -12,18 +12,14 @@
 function node_overview_types() {
   $types = node_get_types();
   $names = node_get_types('names');
-  $header = array(t('Name'), t('Type'), t('Description'), array('data' => t('Operations'), 'colspan' => '2'));
+  $header = array(t('Name'), array('data' => t('Operations'), 'colspan' => '2'));
   $rows = array();
 
   foreach ($names as $key => $name) {
     $type = $types[$key];
     if (node_hook($type, 'form')) {
       $type_url_str = str_replace('_', '-', $type->type);
-      $row = array(
-        check_plain($name),
-        check_plain($type->type),
-        filter_xss_admin($type->description),
-      );
+      $row = array(theme('node_admin_overview', $name, $type));
       // Set the edit column.
       $row[] = array('data' => l(t('edit'), 'admin/build/node-type/' . $type_url_str));
 
@@ -45,6 +41,13 @@ function node_overview_types() {
   return theme('table', $header, $rows);
 }
 
+function theme_node_admin_overview($name, $type) {
+  $output = check_plain($name);
+  $output .= ' <small> (Machine name: ' . check_plain($type->type) . ')</small>';
+  $output .= '<div class="description">' . filter_xss_admin($type->description) . '</div>';
+  return $output;
+}
+
 /**
  * Generates the node type editing form.
  */
@@ -71,7 +74,7 @@ function node_type_form(&$form_state, $t
 
   if (!$type->locked) {
     $form['identity']['type'] = array(
-      '#title' => t('Type'),
+      '#title' => t('Machine name'),
       '#type' => 'textfield',
       '#default_value' => $type->type,
       '#maxlength' => 32,
@@ -85,7 +88,7 @@ function node_type_form(&$form_state, $t
       '#value' => $type->type,
     );
     $form['identity']['type_display'] = array(
-      '#title' => t('Type'),
+      '#title' => t('Machine name'),
       '#type' => 'item',
       '#markup' => theme('placeholder', $type->type),
       '#description' => t('The machine-readable name of this content type. This field cannot be modified for system-defined content types.'),
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.990
diff -u -p -r1.990 node.module
--- modules/node/node.module	29 Oct 2008 10:08:52 -0000	1.990
+++ modules/node/node.module	1 Nov 2008 02:26:19 -0000
@@ -135,6 +135,9 @@ function node_theme() {
     'node_submitted' => array(
       'arguments' => array('node' => NULL),
     ),
+    'node_admin_overview' => array(
+      'arguments' => array('name' => NULL, 'type' => NULL),
+    ),
   );
 }