Merge branch 'master' into openstreetbugs2

[rails.git] / app / views / changeset / list.html.erb

diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb
index d2112ac7300c2c8cde0118581551b84bd938a360..0333be5ccde010e7bb6cc0d322598eff06832362 100644 (file)
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -1,12 +1,12 @@
-<h1><%= @title %></h1>
+<h1><%= @heading %></h1>
 <p><%= @description %></p>
 
 <%= render :partial => 'changeset_paging_nav' %>
 <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
 <%= render :partial => 'changeset_paging_nav' %>
 
-<%= rss_link_to params.merge({ :format => :rss }) %>
+<%= atom_link_to params.merge({ :page => nil, :format => :atom }) %>
 
 <% content_for :head do %>
-<%= auto_discovery_link_tag :atom, params.merge({ :format => :rss }) %>
+<%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :format => :atom }) %>
 <% end %>