Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.514
diff -u -r1.514 node.module
--- modules/node.module	1 Aug 2005 05:14:05 -0000	1.514
+++ modules/node.module	1 Aug 2005 12:57:19 -0000
@@ -464,7 +464,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.31
diff -u -r1.31 chameleon.theme
--- themes/chameleon/chameleon.theme	1 Aug 2005 05:14:05 -0000	1.31
+++ themes/chameleon/chameleon.theme	1 Aug 2005 12:57:19 -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.11
diff -u -r1.11 phptemplate.engine
--- themes/engines/phptemplate/phptemplate.engine	1 Aug 2005 05:14:05 -0000	1.11
+++ themes/engines/phptemplate/phptemplate.engine	1 Aug 2005 12:57:19 -0000
@@ -193,7 +193,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);
   }
@@ -202,15 +202,15 @@
   }
 
   $variables = array(
-    'content'        => ($main && $node->teaser) ? $node->teaser : $node->body,
+    'content'        => ($teaser && $node->teaser) ? $node->teaser : $node->body,
     'date'           => format_date($node->created),
     'links'          => $node->links ? theme('links', $node->links) : '',
-    'main'           => $main,
     'name'           => theme('username', $node),
     'node'           => $node,  // we pass the actual node to allow more customization
     'node_url'       => url('node/'. $node->nid),
     'page'           => $page,
     'taxonomy'       => $taxonomy,
+    'teaser'           => $teaser,    
     'terms'          => theme('links', $taxonomy),
     'title'          => check_plain($node->title)
   );