Document lib/English. Add top-level aliases to rdoc html output

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5512 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 10 insertions, 2 deletions

diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb
index b5e8f24e43..994d74b103 100644
--- a/lib/rdoc/generators/html_generator.rb
+++ b/lib/rdoc/generators/html_generator.rb
@@ -326,13 +326,18 @@ module Generators
     end
 
 
-    # Build a list of aliases fo which we couldn't find a corresponding method
+    # Build a list of aliases for which we couldn't find a
+    # corresponding method
     def build_alias_summary_list
       @context.aliases.map do |al|
-        {
+        res = {
           'old_name' => al.old_name,
           'new_name' => al.new_name,
         }
+        if al.comment && !al.comment.empty?
+          res['desc'] = markup(al.comment, true)
+        end
+        res
       end
     end
     
@@ -750,6 +755,9 @@ module Generators
       co = build_constants_summary_list
       @values["constants"] = co unless co.empty?
 
+      al = build_alias_summary_list
+      @values["aliases"] = al unless al.empty?
+
       if @options.promiscuous
         file_context = nil
       else