? .DS_Store
? .htaccess
? sites/.DS_Store
? sites/all/modules/devel
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.538
diff -u -p -r1.538 taxonomy.module
--- modules/taxonomy/taxonomy.module	13 Nov 2009 09:24:06 -0000	1.538
+++ modules/taxonomy/taxonomy.module	18 Nov 2009 14:07:19 -0000
@@ -220,7 +220,7 @@ function taxonomy_menu() {
     'page arguments' => array(2),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
-    'file' => 'taxonomy.feeds.inc',
+    'file' => 'taxonomy.pages.inc',
   );
   $items['taxonomy/autocomplete'] = array(
     'title' => 'Autocomplete taxonomy',
Index: modules/taxonomy/taxonomy.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.test,v
retrieving revision 1.58
diff -u -p -r1.58 taxonomy.test
--- modules/taxonomy/taxonomy.test	11 Nov 2009 17:10:49 -0000	1.58
+++ modules/taxonomy/taxonomy.test	18 Nov 2009 14:07:20 -0000
@@ -452,7 +452,6 @@ class TaxonomyTermTestCase extends Taxon
     // the first edit link found on the listing page is to our term.
     $this->clickLink(t('edit'));
 
-    // This failed inexplicably with assertText, so used assertRaw. @TODO: Why?
     $this->assertText($edit['name'], t('The randomly generated term name is present.'));
     $this->assertText($edit['description'], t('The randomly generated term description is present.'));
 
@@ -469,6 +468,9 @@ class TaxonomyTermTestCase extends Taxon
     $this->assertText($edit['name'], t('The randomly generated term name is present.'));
     $this->assertText($edit['description'], t('The randomly generated term description is present.'));
 
+    // Check that term feed page is working
+    $this->drupalGet('taxonomy/term/' . $term->tid . '/feed');
+
     // Delete the term.
     $this->drupalPost('taxonomy/term/' . $term->tid . '/edit', array(), t('Delete'));
     $this->drupalPost(NULL, NULL, t('Delete'));
