Import RDoc 2.5.7. Fixes #1318 and ruby-core:29780

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

1 files changed, 5 insertions, 7 deletions

diff --git a/lib/rdoc/markup.rb b/lib/rdoc/markup.rb
index 8176e90447..32c8179e0d 100644
--- a/lib/rdoc/markup.rb
+++ b/lib/rdoc/markup.rb
@@ -107,15 +107,13 @@ class RDoc::Markup
   end
 
   ##
-  # We take a string, split it into lines, work out the type of each line,
-  # and from there deduce groups of lines (for example all lines in a
-  # paragraph).  We then invoke the output formatter using a Visitor to
-  # display the result.
+  # We take +text+, parse it then invoke the output +formatter+ using a
+  # Visitor to render the result.
 
-  def convert(str, op)
-    document = RDoc::Markup::Parser.parse str
+  def convert text, formatter
+    document = RDoc::Markup::Parser.parse text
 
-    document.accept op
+    document.accept formatter
   end
 
 end