1 files changed, 16 insertions, 14 deletions
diff --git a/lib/rdoc/task.rb b/lib/rdoc/task.rb
index b4ff3e99c6..d347e4d6ab 100644
--- a/lib/rdoc/task.rb
+++ b/lib/rdoc/task.rb
@@ -25,12 +25,12 @@ require 'rubygems'
 begin
   gem 'rdoc'
 rescue Gem::LoadError
-end
+end unless defined?(RDoc)
 
 begin
   gem 'rake'
 rescue Gem::LoadError
-end
+end unless defined?(Rake)
 
 require 'rdoc'
 require 'rake'
@@ -52,7 +52,6 @@ require 'rake/tasklib'
 #
 # Simple Example:
 #
-#   gem 'rdoc'
 #   require 'rdoc/task'
 #
 #   RDoc::Task.new do |rdoc|
@@ -69,7 +68,6 @@ require 'rake/tasklib'
 # generating two sets of documentation.  For instance, if you want to have a
 # development set of documentation including private methods:
 #
-#   gem 'rdoc'
 #   require 'rdoc/task'
 #
 #   RDoc::Task.new :rdoc_dev do |rdoc|
@@ -87,7 +85,6 @@ require 'rake/tasklib'
 #
 # For example:
 #
-#   gem 'rdoc'
 #   require 'rdoc/task'
 #
 #   RDoc::Task.new(:rdoc => "rdoc", :clobber_rdoc => "rdoc:clean",
@@ -104,6 +101,12 @@ class RDoc::Task < Rake::TaskLib
   attr_accessor :name
 
   ##
+  # Comment markup format.  rdoc, rd and tomdoc are supported.  (default is
+  # 'rdoc')
+
+  attr_accessor :markup
+
+  ##
   # Name of directory to receive the html output files. (default is "html")
 
   attr_accessor :rdoc_dir
@@ -125,7 +128,8 @@ class RDoc::Task < Rake::TaskLib
   attr_accessor :template
 
   ##
-  # Name of format generator (--fmt) used by rdoc. (defaults to rdoc's default)
+  # Name of format generator (<tt>--format<tt>) used by rdoc. (defaults to
+  # rdoc's default)
 
   attr_accessor :generator
 
@@ -241,7 +245,6 @@ class RDoc::Task < Rake::TaskLib
       args = option_list + @rdoc_files
 
       $stderr.puts "rdoc #{args.join ' '}" if Rake.application.options.trace
-      require 'rdoc/rdoc'
       RDoc::RDoc.new.document args
     end
 
@@ -253,11 +256,12 @@ class RDoc::Task < Rake::TaskLib
 
   def option_list
     result = @options.dup
-    result << "-o"      << @rdoc_dir
-    result << "--main"  << main      if main
-    result << "--title" << title     if title
-    result << "-T"      << template  if template
-    result << '-f'      << generator if generator
+    result << "-o"       << @rdoc_dir
+    result << "--main"   << main      if main
+    result << "--markup" << markup    if markup
+    result << "--title"  << title     if title
+    result << "-T"       << template  if template
+    result << '-f'       << generator if generator
     result
   end
 
@@ -316,8 +320,6 @@ end
 # :stopdoc:
 module Rake
 
-  remove_const(:RDocTask) if defined?(RDocTask) # remove deprecated class
-
   ##
   # For backwards compatibility