Index: modules/node/node.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.js,v
retrieving revision 1.4
diff -u -r1.4 node.js
--- modules/node/node.js	27 Apr 2009 20:19:37 -0000	1.4
+++ modules/node/node.js	9 Apr 2010 11:31:13 -0000
@@ -4,20 +4,20 @@
 
 Drupal.behaviors.nodeFieldsetSummaries = {
   attach: function (context) {
-    $('fieldset#edit-revision-information', context).setSummary(function (context) {
+    $('fieldset#edit-revision-information', context).drupalSetSummary(function (context) {
       return $('#edit-revision', context).is(':checked') ?
         Drupal.t('New revision') :
         Drupal.t('No revision');
     });
 
-    $('fieldset#edit-author', context).setSummary(function (context) {
+    $('fieldset#edit-author', context).drupalSetSummary(function (context) {
       var name = $('#edit-name').val(), date = $('#edit-date').val();
       return date ?
         Drupal.t('By @name on @date', { '@name': name, '@date': date }) :
         Drupal.t('By @name', { '@name': name });
     });
 
-    $('fieldset#edit-options', context).setSummary(function (context) {
+    $('fieldset#edit-options', context).drupalSetSummary(function (context) {
       var vals = [];
 
       $('input:checked', context).parent().each(function () {
Index: modules/node/content_types.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.js,v
retrieving revision 1.8
diff -u -r1.8 content_types.js
--- modules/node/content_types.js	2 Dec 2009 15:09:16 -0000	1.8
+++ modules/node/content_types.js	9 Apr 2010 11:31:13 -0000
@@ -4,13 +4,13 @@
 Drupal.behaviors.contentTypes = {
   attach: function (context) {
     // Provide the vertical tab summaries.
-    $('fieldset#edit-submission', context).setSummary(function(context) {
+    $('fieldset#edit-submission', context).drupalSetSummary(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'));
       return vals.join(', ');
     });
-    $('fieldset#edit-workflow', context).setSummary(function(context) {
+    $('fieldset#edit-workflow', context).drupalSetSummary(function(context) {
       var vals = [];
       $("input[name^='node_options']:checked", context).parent().each(function() {
         vals.push(Drupal.checkPlain($(this).text()));
@@ -20,7 +20,7 @@
       }
       return vals.join(', ');
     });
-    $('fieldset#edit-display', context).setSummary(function(context) {
+    $('fieldset#edit-display', context).drupalSetSummary(function(context) {
       var vals = [];
       $('input:checked', context).next('label').each(function() {
         vals.push(Drupal.checkPlain($(this).text()));
Index: modules/block/block.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.js,v
retrieving revision 1.14
diff -u -r1.14 block.js
--- modules/block/block.js	15 Feb 2010 19:06:21 -0000	1.14
+++ modules/block/block.js	9 Apr 2010 11:31:12 -0000
@@ -6,14 +6,14 @@
  */
 Drupal.behaviors.blockSettingsSummary = {
   attach: function (context) {
-    // The setSummary method required for this behavior is not available
+    // The drupalSetSummary method required for this behavior is not available
     // on the Blocks administration page, so we need to make sure this
-    // behavior is processed only if setSummary is defined.
-    if (typeof jQuery.fn.setSummary == 'undefined') {
+    // behavior is processed only if drupalSetSummary is defined.
+    if (typeof jQuery.fn.drupalSetSummary == 'undefined') {
       return;
     }
 
-    $('fieldset#edit-path', context).setSummary(function (context) {
+    $('fieldset#edit-path', context).drupalSetSummary(function (context) {
       if (!$('textarea[name="pages"]', context).val()) {
         return Drupal.t('Not restricted');
       }
@@ -22,7 +22,7 @@
       }
     });
 
-    $('fieldset#edit-node-type', context).setSummary(function (context) {
+    $('fieldset#edit-node-type', context).drupalSetSummary(function (context) {
       var vals = [];
       $('input[type="checkbox"]:checked', context).each(function () {
         vals.push($.trim($(this).next('label').text()));
@@ -33,7 +33,7 @@
       return vals.join(', ');
     });
 
-    $('fieldset#edit-role', context).setSummary(function (context) {
+    $('fieldset#edit-role', context).drupalSetSummary(function (context) {
       var vals = [];
       $('input[type="checkbox"]:checked', context).each(function () {
         vals.push($.trim($(this).next('label').text()));
@@ -44,7 +44,7 @@
       return vals.join(', ');
     });
 
-    $('fieldset#edit-user', context).setSummary(function (context) {
+    $('fieldset#edit-user', context).drupalSetSummary(function (context) {
       var $radio = $('input[name="custom"]:checked', context);
       if ($radio.val() == 0) {
         return Drupal.t('Not customizable');
Index: misc/vertical-tabs.js
===================================================================
RCS file: /cvs/drupal/drupal/misc/vertical-tabs.js,v
retrieving revision 1.11
diff -u -r1.11 vertical-tabs.js
--- misc/vertical-tabs.js	30 Mar 2010 07:05:58 -0000	1.11
+++ misc/vertical-tabs.js	9 Apr 2010 11:31:12 -0000
@@ -129,7 +129,7 @@
    * Updates the tab's summary.
    */
   updateSummary: function () {
-    this.summary.html(this.fieldset.getSummary());
+	  this.summary.html(this.fieldset.drupalGetSummary());
   },
 
   /**
Index: misc/form.js
===================================================================
RCS file: /cvs/drupal/drupal/misc/form.js,v
retrieving revision 1.14
diff -u -r1.14 form.js
--- misc/form.js	7 Mar 2010 23:14:20 -0000	1.14
+++ misc/form.js	9 Apr 2010 11:31:12 -0000
@@ -4,7 +4,7 @@
 /**
  * Retrieves the summary for the first element.
  */
-$.fn.getSummary = function () {
+$.fn.drupalGetSummary = function () {
   var callback = this.data('summaryCallback');
   return (this[0] && callback) ? $.trim(callback(this[0])) : '';
 };
@@ -16,7 +16,7 @@
  *   Either a function that will be called each time the summary is
  *   retrieved or a string (which is returned each time).
  */
-$.fn.setSummary = function (callback) {
+$.fn.drupalSetSummary = function (callback) {
   var self = this;
 
   // To facilitate things, the callback should always be a function. If it's
Index: misc/collapse.js
===================================================================
RCS file: /cvs/drupal/drupal/misc/collapse.js,v
retrieving revision 1.29
diff -u -r1.29 collapse.js
--- misc/collapse.js	31 Mar 2010 13:45:31 -0000	1.29
+++ misc/collapse.js	9 Apr 2010 11:31:12 -0000
@@ -66,7 +66,7 @@
       var summary = $('<span class="summary"></span>');
       $fieldset.
         bind('summaryUpdated', function () {
-          var text = $.trim($fieldset.getSummary());
+          var text = $.trim($fieldset.drupalGetSummary());
           summary.html(text ? ' (' + text + ')' : '');
         })
         .trigger('summaryUpdated');
Index: modules/path/path.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.js,v
retrieving revision 1.3
diff -u -r1.3 path.js
--- modules/path/path.js	20 Oct 2009 01:24:34 -0000	1.3
+++ modules/path/path.js	9 Apr 2010 11:31:13 -0000
@@ -4,7 +4,7 @@
 
 Drupal.behaviors.pathFieldsetSummaries = {
   attach: function (context) {
-    $('fieldset#edit-path', context).setSummary(function (context) {
+    $('fieldset#edit-path', context).drupalSetSummary(function (context) {
       var path = $('#edit-path-alias').val();
 
       return path ?
Index: modules/menu/menu.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.js,v
retrieving revision 1.5
diff -u -r1.5 menu.js
--- modules/menu/menu.js	14 Feb 2010 09:39:45 -0000	1.5
+++ modules/menu/menu.js	9 Apr 2010 11:31:13 -0000
@@ -4,7 +4,7 @@
 
 Drupal.behaviors.menuFieldsetSummaries = {
   attach: function (context) {
-    $('fieldset.menu-link-form', context).setSummary(function (context) {
+    $('fieldset.menu-link-form', context).drupalSetSummary(function (context) {
       if ($('#edit-menu-enabled', context).attr('checked')) {
         return Drupal.checkPlain($('#edit-menu-link-title', context).val());
       }