Index: modules/comment/comment-node-form.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment-node-form.js,v
retrieving revision 1.1
diff -u -r1.1 comment-node-form.js
--- modules/comment/comment-node-form.js	11 Apr 2009 22:19:44 -0000	1.1
+++ modules/comment/comment-node-form.js	26 Apr 2009 20:30:46 -0000
@@ -7,6 +7,10 @@
     $('fieldset#edit-comment-settings', context).setSummary(function(context) {
       return Drupal.checkPlain($('input:checked', context).parent().text());
     });
+    // Provide the summary for the node type form.
+    $('fieldset#edit-comment', context).setSummary(function(context) {
+      return Drupal.checkPlain(jQuery("input:checked[name='comment']", context).parent().text());
+    });
   }
 };
 
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.705
diff -u -r1.705 comment.module
--- modules/comment/comment.module	26 Apr 2009 19:44:38 -0000	1.705
+++ modules/comment/comment.module	26 Apr 2009 20:30:52 -0000
@@ -511,6 +511,8 @@
       '#title' => t('Comment settings'),
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
+      '#group' => 'additional_settings',
+      '#attached_js' => array(drupal_get_path('module', 'comment') . '/comment-node-form.js'),
     );
     $form['comment']['comment'] = array(
       '#type' => 'radios',
Index: modules/node/content_types.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.js,v
retrieving revision 1.3
diff -u -r1.3 content_types.js
--- modules/node/content_types.js	26 Apr 2009 19:18:45 -0000	1.3
+++ modules/node/content_types.js	26 Apr 2009 20:30:54 -0000
@@ -2,7 +2,39 @@
 (function($) {
 
 Drupal.behaviors.contentTypes = {
-  attach: function() {
+  attach: function(context) {
+    // Provide the vertical tab summaries.
+    $('fieldset#edit-submission', context).setSummary(function(context) {
+      var vals = [];
+      vals.push(Drupal.checkPlain($('#edit-title-label', context).val()) || Drupal.t('Requires a title'));
+      vals.push(Drupal.checkPlain($('#edit-body-label', context).val()) || Drupal.t('No body'));
+      var minWords = parseInt($('#edit-min-word-count').val());
+      if (minWords > 0) {
+        vals.push(Drupal.t('@minWords word minimum', {'@minWords': minWords}));
+      }
+      return vals.join(', ');
+    });
+    $('fieldset#edit-workflow', context).setSummary(function(context) {
+      var vals = [];
+      $("input[name^='node_options']:checked", context).parent().each(function() {
+        vals.push(Drupal.checkPlain($(this).text()));
+      });
+      if (!$('#edit-node-options-status', context).is(':checked')) {
+        vals.unshift(Drupal.t('Not published'));
+      }
+      return vals.join(', ');
+    });
+    $('fieldset#edit-display', context).setSummary(function(context) {
+      var vals = [];
+      $('input:checked', context).parent().each(function() {
+        vals.push(Drupal.checkPlain($(this).text()));
+      });
+      if (!$('#edit-node-submitted', context).is(':checked')) {
+        vals.unshift(Drupal.t("Don't display post information"));
+      }
+      return vals.join(', ');
+    });
+
     if ($('#edit-type').val() == $('#edit-name').val().toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/_+/g, '_') || $('#edit-type').val() == '') {
       $('#edit-type-wrapper').hide();
       $('#edit-name').keyup(function() {
Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.66
diff -u -r1.66 content_types.inc
--- modules/node/content_types.inc	26 Apr 2009 05:26:17 -0000	1.66
+++ modules/node/content_types.inc	26 Apr 2009 20:30:54 -0000
@@ -52,7 +52,9 @@
  * Generates the node type editing form.
  */
 function node_type_form(&$form_state, $type = NULL) {
-  drupal_add_js(drupal_get_path('module', 'node') .'/content_types.js');
+  // Provide the node type form JavaScript.
+  $form['#attached_js'] = array(drupal_get_path('module', 'node') .'/content_types.js');
+
   if (!isset($type->type)) {
     // This is a new type. Node module managed types are custom and unlocked.
     $type = node_type_set_defaults(array('custom' => 1, 'locked' => 0));
@@ -102,13 +104,18 @@
     '#type' => 'textarea',
     '#default_value' => $type->description,
     '#description' => t('A brief description of this content type. This text will be displayed as part of the list on the <em>create content</em> page.'),
-    );
+  );
+
+  $form['additional_settings'] = array(
+    '#type' => 'vertical_tabs',
+  );
 
   $form['submission'] = array(
     '#type' => 'fieldset',
     '#title' => t('Submission form settings'),
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
+    '#group' => 'additional_settings',
   );
   $form['submission']['title_label'] = array(
     '#title' => t('Title field label'),
@@ -147,6 +154,7 @@
     '#title' => t('Workflow settings'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
+    '#group' => 'additional_settings',
   );
   $form['workflow']['node_options'] = array('#type' => 'checkboxes',
     '#title' => t('Default options'),
@@ -164,6 +172,7 @@
     '#title' => t('Display settings'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
+    '#group' => 'additional_settings',
   );
   $form['display']['node_submitted'] = array(
     '#type' => 'checkbox',