Renamespace lib/rdoc/markup from SM::SimpleMarkup to RDoc::Markup.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15033 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 8 deletions

diff --git a/lib/rdoc/generator/html.rb b/lib/rdoc/generator/html.rb
index 32f823553..e6a6cd9ac 100644
--- a/lib/rdoc/generator/html.rb
+++ b/lib/rdoc/generator/html.rb
@@ -1,7 +1,7 @@
 require 'fileutils'
 
 require 'rdoc/generator'
-require 'rdoc/markup/simple_markup/to_html'
+require 'rdoc/markup/to_html'
 
 module RDoc::Generator
 
@@ -34,12 +34,11 @@ module RDoc::Generator
   end
 
   ##
-  # Subclass of the SM::ToHtml class that supports looking
-  # up words in the AllReferences list. Those that are
-  # found (like AllReferences in this comment) will
-  # be hyperlinked
+  # Subclass of the RDoc::Markup::ToHtml class that supports looking up words
+  # in the AllReferences list. Those that are found (like AllReferences in
+  # this comment) will be hyperlinked
 
-  class HyperlinkHtml < SM::ToHtml
+  class HyperlinkHtml < RDoc::Markup::ToHtml
 
     ##
     # We need to record the html path of our caller so we can generate
@@ -161,13 +160,13 @@ module RDoc::Generator
 
     ##
     # Convert a string in markup format into HTML. We keep a cached
-    # SimpleMarkup object lying around after the first time we're
+    # RDoc::Markup object lying around after the first time we're
     # called per object.
 
     def markup(str, remove_para=false)
       return '' unless str
       unless defined? @markup
-        @markup = SM::SimpleMarkup.new
+        @markup = RDoc::Markup.new
 
         # class names, variable names, or instance variables
         @markup.add_special(/(