summaryrefslogtreecommitdiff
path: root/lib/rdoc/ri/ri_descriptions.rb
diff options
context:
space:
mode:
authordave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-08-30 14:22:26 +0000
committerdave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-08-30 14:22:26 +0000
commit2ad8cb54289d5bf069d307272869422c429d90b3 (patch)
treeac67cd6d58dbc0b675cc6e74ab3df2002c0fd503 /lib/rdoc/ri/ri_descriptions.rb
parentbf5fde05a171e04fd4ef7354acd673192f6d1ea4 (diff)
ri now merges the documentation if it finds the same class in multiple places
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc/ri/ri_descriptions.rb')
-rw-r--r--lib/rdoc/ri/ri_descriptions.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/rdoc/ri/ri_descriptions.rb b/lib/rdoc/ri/ri_descriptions.rb
index 96041f1c7e..316fc91903 100644
--- a/lib/rdoc/ri/ri_descriptions.rb
+++ b/lib/rdoc/ri/ri_descriptions.rb
@@ -1,4 +1,5 @@
require 'yaml'
+require 'rdoc/markup/simple_markup/fragments'
# Descriptions are created by RDoc (in ri_generator) and
# written out in serialized form into the documentation
@@ -93,6 +94,9 @@ module RI
merge(@includes, old.includes)
if @comment.nil? || @comment.empty?
@comment = old.comment
+ else
+ @comment << SM::Flow::RULE.new
+ @comment.concat old.comment
end
end