Index: modules/aggregator/aggregator.processor.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.processor.inc,v
retrieving revision 1.9
diff -u -p -r1.9 aggregator.processor.inc
--- modules/aggregator/aggregator.processor.inc	5 Jun 2009 05:28:28 -0000	1.9
+++ modules/aggregator/aggregator.processor.inc	6 Jul 2009 21:38:51 -0000
@@ -117,7 +117,7 @@ function aggregator_form_aggregator_admi
       '#title' => t('Length of trimmed description'),
       '#default_value' => 600,
       '#options' => drupal_map_assoc(array(0, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000), '_aggregator_characters'),
-      '#description' => t("The maximum number of characters used in the trimmed version of a description. Drupal will use this setting to determine at which offset long descriptions should be trimmed. Note that this setting will only affect new or updated content and will not affect existing teasers.")
+      '#description' => t('The maximum number of characters used in the trimmed version of a post. This setting will only affect new or updated content: existing posts keep their teaser length.')
     );
 
   }
Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.79
diff -u -p -r1.79 content_types.inc
--- modules/node/content_types.inc	1 Jul 2009 12:10:32 -0000	1.79
+++ modules/node/content_types.inc	6 Jul 2009 21:36:18 -0000
@@ -187,7 +187,7 @@ function node_type_form(&$form_state, $t
     '#title' => t('Length of trimmed posts'),
     '#default_value' => variable_get('teaser_length_' . $type->type, 600),
     '#options' => drupal_map_assoc(array(0, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000), '_node_characters'),
-    '#description' => t("The maximum number of characters used in the trimmed version of a post. Drupal will use this setting to determine at which offset long posts should be trimmed. The trimmed version of a post is typically used as a teaser when displaying the post on the main page, in XML feeds, etc. To disable teasers, set to 'Unlimited'.")
+    '#description' => t('The maximum number of characters used in the trimmed version of a post. This setting will only affect new or updated content: existing posts keep their teaser length.')
   );
   $form['old_type'] = array(
     '#type' => 'value',