Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.503
diff -u -r1.503 node.module
--- modules/node.module	7 Jul 2005 13:30:50 -0000	1.503
+++ modules/node.module	13 Jul 2005 17:44:18 -0000
@@ -469,7 +469,7 @@
  * @param $node
  *   A node array or node object.
  * @param $teaser
- *   Whether to display only the teaser for the node.
+ *   Whether to display the teaser only, as on the main page.
  * @param $page
  *   Whether the node is being displayed by itself as a page.
  * @param $links
Index: themes/chameleon/chameleon.theme
===================================================================
RCS file: /cvs/drupal/drupal/themes/chameleon/chameleon.theme,v
retrieving revision 1.30
diff -u -r1.30 chameleon.theme
--- themes/chameleon/chameleon.theme	6 Jun 2005 14:07:04 -0000	1.30
+++ themes/chameleon/chameleon.theme	13 Jul 2005 17:44:18 -0000
@@ -107,17 +107,17 @@
   return $output;
 }
 
-function chameleon_node($node, $main = 0, $page = 0) {
+function chameleon_node($node, $teaser = 0, $page = 0) {
 
   $output  = "<div class=\"node\">\n";
 
   if (!$page) {
-    $output .= " <h2 class=\"title\">". ($main ? l($node->title, "node/$node->nid") : check_plain($node->title)) ."</h2>\n";
+    $output .= " <h2 class=\"title\">". ($teaser ? l($node->title, "node/$node->nid") : check_plain($node->title)) ."</h2>\n";
   }
 
   $output .= " <div class=\"content\">\n";
 
-  if ($main && $node->teaser) {
+  if ($teaser && $node->teaser) {
     $output .= $node->teaser;
   }
   else {
Index: themes/engines/phptemplate/phptemplate.engine
===================================================================
RCS file: /cvs/drupal/drupal/themes/engines/phptemplate/phptemplate.engine,v
retrieving revision 1.4
diff -u -r1.4 phptemplate.engine
--- themes/engines/phptemplate/phptemplate.engine	25 May 2005 06:03:18 -0000	1.4
+++ themes/engines/phptemplate/phptemplate.engine	13 Jul 2005 17:44:19 -0000
@@ -182,7 +182,7 @@
  * Prepare the values passed to the theme_node function to be passed
  * into a pluggable template engine.
  */
-function phptemplate_node($node, $main = 0, $page = 0) {
+function phptemplate_node($node, $teaser = 0, $page = 0) {
   if (module_exist('taxonomy')) {
     $taxonomy = taxonomy_link('taxonomy terms', $node);
   }
@@ -197,7 +197,7 @@
       'name'           => format_name($node),
       'date'           => format_date($node->created),
       'sticky'         => $node->sticky,
-      'content'        => ($main && $node->teaser) ? $node->teaser : $node->body,
+      'content'        => ($teaser && $node->teaser) ? $node->teaser : $node->body,
       'links'          => $node->links ? theme('links', $node->links) : '',
       'mission'        => $mission,
       'page'           => $page,
@@ -205,7 +205,7 @@
 
     /* Lastly , pass the actual node to allow more customization */
       'node'           => $node,
-      'main'           => $main,
+      'teaser'           => $teaser,
       'page'           => $page
     );