Index: all/modules/commentrss/commentrss.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/commentrss/commentrss.module,v
retrieving revision 1.12.2.2
diff -u -F^f -r1.12.2.2 commentrss.module
--- all/modules/commentrss/commentrss.module	16 Jul 2007 04:19:11 -0000	1.12.2.2
+++ all/modules/commentrss/commentrss.module	23 Apr 2008 03:18:34 -0000
@@ -47,27 +47,40 @@ function commentrss_menu($may_cache) {
       'type' => MENU_CALLBACK);
   }
   else {
-    if (arg(0) == 'node' && is_numeric(arg(1)) && variable_get('commentrss_node', TRUE)) {
-      $node = node_load(arg(1));
-      if ($node->nid && $node->comment != COMMENT_NODE_DISABLED) {
-        drupal_add_feed(url('crss/node/'. $node->nid),
-          t('Comments for @title', array('@title' => $node->title)));
+    if (arg(0) == 'node') {
+      if (variable_get('commentrss_site', TRUE)) {
+        drupal_add_feed(
+          url('crss', NULL, NULL, TRUE),
+          t('@site - All Comments', array('@site' => variable_get('site_name', 'Drupal')))
+        );
+      }
+
+      if (is_numeric(arg(1)) && variable_get('commentrss_node', TRUE)) {
+        $node = node_load(arg(1));
+        if ($node->nid && $node->comment != COMMENT_NODE_DISABLED) {
+          drupal_add_feed(
+            url('crss/node/'. $node->nid, NULL, NULL, TRUE),
+            t('@site - Comments for “@title”', array('@site' => variable_get('site_name', 'Drupal'), '@title' => $node->title))
+          );
+        }
       }
-    }
-    elseif (arg(0) == 'node' && variable_get('commentrss_site', TRUE)) {
-      drupal_add_feed(url('crss'),
-        t('@site - All comments', array('@site' => variable_get('site_name', 'Drupal'))));
     }
     elseif (arg(0) == 'taxonomy' && arg(1) == 'term' && is_numeric(arg(2)) && variable_get('commentrss_term', FALSE)) {
       $term = taxonomy_get_term(arg(2));
       if ($term->tid) {
-        drupal_add_feed(url('crss/term/'. $term->tid),
-          t('Comments for category "@title"', array('@title' => $term->name)));
+        drupal_add_feed(
+          url('crss/term/'. $term->tid, NULL, NULL, TRUE),
+          t('@site - Comments from the “@title” Category', array('@site' => variable_get('site_name', 'Drupal'), '@title' => $term->name))
+        );
       }
     }
-    elseif (arg(0) == 'taxonomy' && arg(1) == 'vocabulary' && is_numeric(arg(2)) && variable_get('commentrss_node', FALSE)) {
+    elseif (arg(0) == 'taxonomy' && arg(1) == 'vocabulary' && is_numeric(arg(2)) && variable_get('commentrss_vocab', FALSE)) {
       // vocabulary_list module is serving this page
-      drupal_add_feed(url('crss/vocab/'. arg(2)), t('Comments for this vocabulary'));
+      $vocab = taxonomy_get_vocabulary(arg(2));
+      drupal_add_feed(
+        url('crss/vocab/'. arg(2), NULL, NULL, TRUE),
+        t('@site - Comments from the “@vocab” Vocabulary', array('@site' => variable_get('site_name', 'Drupal'), '@vocab' => $vocab->name))
+      );
     }
   }
   return $items;
@@ -119,10 +132,10 @@ function commentrss_feed_node() {
         }
       }
       $channel = array(
-        'title' => t('@site - Comments for "@title"', array(
+        'title' => t('@site - Comments for “@title”', array(
                        '@site' => check_plain(variable_get('site_name', 'Drupal')),
                        '@title' => check_plain($node->title))),
-        'description' => t('Comments for "@title"', array('@title' => $node->title)),
+        'description' => t('Comments for “@title”', array('@title' => $node->title)),
         'link' => url('node/'. $node->nid, NULL, NULL, TRUE),
       );
 
@@ -142,10 +155,10 @@ function commentrss_feed_term() {
     if ($term->tid) {
       $items = commentrss_format_items('DISTINCT(n.nid)', 'INNER JOIN {term_node} r ON n.nid = r.nid', 'r.tid = %d AND', $term->tid);
       $channel = array(
-        'title' => t('@site - Comments for "@term"', array(
+        'title' => t('@site - Comments from the “@term” Category', array(
                        '@site' => check_plain(variable_get('site_name', 'Drupal')),
                        '@term' => check_plain($term->name))),
-        'description' => t('Comments for the category "@term"', array('@term' => $term->name)),
+        'description' => t('Comments from the “@term” Category', array('@term' => $term->name)),
         'link' => url('taxonomy/term/'. $term->tid, NULL, NULL, TRUE),
       );
 
@@ -167,10 +180,10 @@ function commentrss_feed_vocab() {
     if ($vocab->vid) {
       $items = commentrss_format_items('DISTINCT(n.nid)', 'INNER JOIN {term_node} r ON n.nid = r.nid INNER JOIN {term_data} d ON r.tid = d.tid', 'd.vid = %d AND', $vid);
       $channel = array(
-        'title' => t('@site - Comments for "@vocab"', array(
+        'title' => t('@site - Comments from the “@vocab” Vocabulary', array(
                        '@site' => check_plain(variable_get('site_name', 'Drupal')),
                        '@vocab' => check_plain($vocab->name))),
-        'description' => t('Comments for all categories in "@vocab"', array('@vocab' => $vocab->name)),
+        'description' => t('Comments from the “@vocab” Vocabulary', array('@vocab' => $vocab->name)),
         'link' => url('taxonomy/vocabulary/'. $vocab->vid, NULL, NULL, TRUE),
       );
 
@@ -189,9 +202,9 @@ function commentrss_format_feed($items, 
   
   $channel_defaults = array(
     'version'     => '2.0',
-    'title'       => check_plain(variable_get('site_name', 'Drupal')) .' - '. t('Comments'),
+    'title'       => check_plain(variable_get('site_name', 'Drupal')) .' - '. t('All Comments'),
     'link'        => $base_url,
-    'description' => t('Comments'),
+    'description' => t('All Comments'),
     'language'    => $locale
   );
   $channel = array_merge($channel_defaults, $channel);