Index: modules/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block.module,v
retrieving revision 1.174
diff -u -r1.174 block.module
--- modules/block.module  20 Jul 2005 11:44:40 -0000  1.174
+++ modules/block.module  26 Jul 2005 21:17:50 -0000
@@ -104,7 +104,7 @@
     case 'view':
       $block = db_fetch_object(db_query('SELECT * FROM {boxes} WHERE bid = %d', $delta));
       $data['subject'] = check_plain($block->title);
-      $data['content'] = check_output($block->body, $block->format, FALSE);
+      $data['content'] = check_markup($block->body, $block->format, FALSE);
       return $data;
   }
 }
Index: modules/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment.module,v
retrieving revision 1.361
diff -u -r1.361 comment.module
--- modules/comment.module  25 Jul 2005 09:41:29 -0000  1.361
+++ modules/comment.module  26 Jul 2005 21:17:50 -0000
@@ -277,7 +277,7 @@
       $text = '';
       $comments = db_query('SELECT subject, comment, format FROM {comments} WHERE nid = %d AND status = %d', $node->nid, COMMENT_PUBLISHED);
       while ($comment = db_fetch_object($comments)) {
-        $text .= '<h2>'. check_plain($comment->subject) .'</h2>'. check_output($comment->comment, $comment->format, FALSE);
+        $text .= '<h2>'. check_plain($comment->subject) .'</h2>'. check_markup($comment->comment, $comment->format, FALSE);
       }
       return $text;

@@ -472,8 +472,8 @@
     // 1) Filter it into HTML
     // 2) Strip out all HTML tags
     // 3) Convert entities back to plain-text.
-  // Note: format is checked by check_output().
-    $edit['subject'] = truncate_utf8(decode_entities(strip_tags(check_output($edit['comment'], $edit['format']))), 29, TRUE);
+  // Note: format is checked by check_markup().
+    $edit['subject'] = truncate_utf8(decode_entities(strip_tags(check_markup($edit['comment'], $edit['format']))), 29, TRUE);
   }

   // Validate the comment's body.
@@ -1458,7 +1458,7 @@

   // Switch to folded/unfolded view of the comment
   if ($visible) {
-    $comment->comment = check_output($comment->comment, $comment->format, FALSE);
+    $comment->comment = check_markup($comment->comment, $comment->format, FALSE);
     $output .= theme('comment', $comment, $links);
   }
   else {
Index: modules/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter.module,v
retrieving revision 1.67
diff -u -r1.67 filter.module
--- modules/filter.module 29 Jun 2005 19:53:14 -0000  1.67
+++ modules/filter.module 26 Jul 2005 21:17:50 -0000
@@ -671,7 +671,7 @@
  *    showing content that is not (yet) stored in the database (eg. upon preview),
  *    set to TRUE so the user's permissions are checked.
  */
-function check_output($text, $format = FILTER_FORMAT_DEFAULT, $check = TRUE) {
+function check_markup($text, $format = FILTER_FORMAT_DEFAULT, $check = TRUE) {
   // When $check = true, do an access check on $format.
   if (isset($text) && (!$check || filter_access($format))) {
     if ($format == FILTER_FORMAT_DEFAULT) {
Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.509
diff -u -r1.509 node.module
--- modules/node.module 20 Jul 2005 10:48:20 -0000  1.509
+++ modules/node.module 26 Jul 2005 21:17:50 -0000
@@ -510,10 +510,10 @@
 function node_prepare($node, $teaser = FALSE) {
   $node->readmore = (strlen($node->teaser) < strlen($node->body));
   if ($teaser == FALSE) {
-    $node->body = check_output($node->body, $node->format, FALSE);
+    $node->body = check_markup($node->body, $node->format, FALSE);
   }
   else {
-    $node->teaser = check_output($node->teaser, $node->format, FALSE);
+    $node->teaser = check_markup($node->teaser, $node->format, FALSE);
   }
   return $node;
 }
@@ -569,7 +569,7 @@
                            'user' => format_name($node),
                            'date' => $node->changed,
                            'extra' => $extra,
-                           'snippet' => search_excerpt($keys, check_output($node->body, $node->format, FALSE)));
+                           'snippet' => search_excerpt($keys, check_markup($node->body, $node->format, FALSE)));
       }
       return $results;
   }
Index: modules/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile.module,v
retrieving revision 1.100
diff -u -r1.100 profile.module
--- modules/profile.module  27 Jun 2005 18:33:32 -0000  1.100
+++ modules/profile.module  26 Jul 2005 21:17:50 -0000
@@ -246,7 +246,7 @@
       case 'textfield':
         return check_plain($value);
       case 'textarea':
-        return check_output($value);
+        return check_markup($value);
       case 'selection':
         return $browse ? l($value, "profile/$field->name/$value") : check_plain($value);
       case 'checkbox':