Index: /anches/release-30/default_templates/atom.mtml
===================================================================
--- /branches/release-30/default_templates/atom.mtml (revision 1098)
+++  (revision )
@@ -1,35 +1,0 @@
-<$MTHTTPContentType type="application/atom+xml"$><?xml version="1.0" encoding="<$MTPublishCharset$>"?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-    <title><$MTBlogName remove_html="1" encode_xml="1"$></title>
-    <link rel="alternate" type="text/html" href="<$MTBlogURL encode_xml="1"$>" />
-    <link rel="self" type="application/atom+xml" href="<$MTLink template="atom"$>" />
-    <id>tag:<$MTBlogHost exclude_port="1" encode_xml="1"$>,<$MTTemplateCreatedOn format="%Y-%m-%d"$>:<$MTBlogRelativeURL encode_xml="1"$>/<$MTBlogID$></id>
-    <updated><MTEntries lastn="1"><$MTEntryModifiedDate utc="1" format="%Y-%m-%dT%H:%M:%SZ"$></MTEntries></updated>
-    <MTIfNonEmpty tag="MTBlogDescription"><subtitle><$MTBlogDescription remove_html="1" encode_xml="1"$></subtitle></MTIfNonEmpty>
-    <generator uri="http://www.sixapart.com/movabletype/"><$MTProductName version="1"$></generator>
-<MTEntries lastn="15">
-<entry>
-    <title><$MTEntryTitle remove_html="1" encode_xml="1"$></title>
-    <link rel="alternate" type="text/html" href="<$MTEntryPermalink encode_xml="1"$>" />
-    <id><$MTEntryAtomID$></id>
-
-    <published><$MTEntryDate utc="1" format="%Y-%m-%dT%H:%M:%SZ"$></published>
-    <updated><$MTEntryModifiedDate utc="1" format="%Y-%m-%dT%H:%M:%SZ"$></updated>
-
-    <summary><$MTEntryExcerpt remove_html="1" encode_xml="1"$></summary>
-    <author>
-        <name><$MTEntryAuthorDisplayName encode_xml="1"$></name>
-        <MTIfNonEmpty tag="MTEntryAuthorURL"><uri><$MTEntryAuthorURL encode_xml="1"$></uri></MTIfNonEmpty>
-    </author>
-    <MTEntryCategories>
-        <category term="<$MTCategoryLabel encode_xml="1"$>" scheme="http://www.sixapart.com/ns/types#category" />
-    </MTEntryCategories>
-    <MTEntryIfTagged><MTEntryTags><category term="<$MTTagName normalize="1" encode_xml="1"$>" label="<$MTTagName encode_xml="1"$>" scheme="http://www.sixapart.com/ns/types#tag" />
-    </MTEntryTags></MTEntryIfTagged>
-    <content type="html" xml:lang="<$MTBlogLanguage ietf="1"$>" xml:base="<$MTBlogURL encode_xml="1"$>">
-        <$MTEntryBody encode_xml="1"$>
-        <$MTEntryMore encode_xml="1"$>
-    </content>
-</entry>
-</MTEntries>
-</feed>
Index: /branches/release-30/lib/MT/DefaultTemplates.pm
===================================================================
--- /branches/release-30/lib/MT/DefaultTemplates.pm (revision 1174)
+++ /branches/release-30/lib/MT/DefaultTemplates.pm (revision 1429)
@@ -53,12 +53,7 @@
                 rebuild_me => 1,
             },
-            'atom' => {
-                label => 'Atom',
+            'feed_recent' => {
+                label => 'Feed - Recent Entries',
                 outfile => 'atom.xml',
-                rebuild_me => 1,
-            },
-            'rss' => {
-                label => 'RSS',
-                outfile => 'rss.xml',
                 rebuild_me => 1,
             },