diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb
index 082fcc7e81..48a625c6cd 100644
--- a/lib/rdoc/ri/driver.rb
+++ b/lib/rdoc/ri/driver.rb
@@ -14,10 +14,8 @@ end
 
 require_relative '../../rdoc'
 
-##
-# For RubyGems backwards compatibility
-
-require_relative 'formatter'
+require_relative 'formatter' # For RubyGems backwards compatibility
+# TODO: Fix wierd documentation with `require_relative`
 
 ##
 # The RI driver implements the command-line ri tool.
diff --git a/lib/rdoc/task.rb b/lib/rdoc/task.rb
index 8890419db2..8ea2d0588c 100644
--- a/lib/rdoc/task.rb
+++ b/lib/rdoc/task.rb
@@ -323,7 +323,7 @@ module Rake
   ##
   # For backwards compatibility
 
-  RDocTask = RDoc::Task
+  RDocTask = RDoc::Task # :nodoc:
 
 end
 # :startdoc: