Merged [5004] from jmh@joelhalpern.com:

Moe Replaced By: line i docent headers up to main header with Replaces:
 - Legacy-Id: 5018
Note: SVN reference [5004] has been migrated to Git commit 801dfc3

Author: levkowetz

ietf/idrfc/idrfc_wrapper.py

@@ -223,12 +223,6 @@ def draft_name_and_revision(self):
     def friendly_state(self):
         if self.draft_status == "RFC":
             return "<a href=\"%s\">RFC %d</a>" % (reverse('doc_view', args=['rfc%d' % self.rfc_number]), self.rfc_number)
-        elif self.draft_status == "Replaced":
-            rs = self.replaced_by()
-            if rs:
-                return "Replaced by <a href=\"%s\">%s</a>" % (reverse('doc_view', args=[rs[0]]),rs[0], ) 
-            else:
-                return "Replaced"
         elif self.draft_status == "Active":
             if self.in_ietf_process():
                 if self.ietf_process.main_state == "Dead":

ietf/templates/idrfc/doc_tab_document_id.html

@@ -52,6 +52,7 @@
 <tr><td>Last updated:</td><td> {{ doc.publication_date|default:"(data missing)" }}</td></tr>
 
 {% with doc.replaces as r %}{% if r %}<tr><td>Replaces:</td><td> {% filter urlize_ietf_docs %}{{ r|join:", "}}{% endfilter %}</td></tr>{% endif %}{% endwith %}
+{% with doc.replaced_by as r %}{% if r %}<tr><td>Replaced by:</td><td> {% filter urlize_ietf_docs %}{{ r|join:", "}}{% endfilter %}</td></tr>{% endif %}{% endwith %}
 
 {% with info.conflict_reviews as r %}{% if r %}<tr><td>IETF Conflict Review:</td><td> {% filter urlize_ietf_docs %}{{ r|join:","}}{% endfilter %}</td></tr>{% endif %} {% endwith %}