diff --git a/merb-cache/lib/merb-cache/merb-cache.rb b/merb-cache/lib/merb-cache/merb-cache.rb
index 77dc70e..16e9ab6 100644
--- a/merb-cache/lib/merb-cache/merb-cache.rb
+++ b/merb-cache/lib/merb-cache/merb-cache.rb
@@ -146,13 +146,13 @@ class Merb::Cache
   end
 end
 
-module Merb #:nodoc:
-  class Controller #:nodoc:
+module Merb
+  class Controller
     cattr_reader :_cache
     @@_cache = Merb::Cache.new
     # extends Merb::Controller with new instance methods
     include Merb::Cache::ControllerInstanceMethods
-    class << self #:nodoc:
+    class << self
       # extends Merb::Controller with new class methods
       include Merb::Cache::ControllerClassMethods
     end
diff --git a/merb-parts/lib/merb-parts.rb b/merb-parts/lib/merb-parts.rb
index 3172db6..d2dc4f2 100644
--- a/merb-parts/lib/merb-parts.rb
+++ b/merb-parts/lib/merb-parts.rb
@@ -41,4 +41,4 @@ module Merb
     
     
   end
-end
\ No newline at end of file
+end
diff --git a/merb-parts/lib/merb-parts/mixins/web_controller.rb b/merb-parts/lib/merb-parts/mixins/web_controller.rb
index 26caabc..e37bc72 100644
--- a/merb-parts/lib/merb-parts/mixins/web_controller.rb
+++ b/merb-parts/lib/merb-parts/mixins/web_controller.rb
@@ -1,5 +1,5 @@
 # Includes files into the class to allow it to minimally delegates to a web controller
-module Merb #:nodoc:
+module Merb
   module Mixins
     module WebController
       
@@ -64,4 +64,4 @@ module Merb #:nodoc:
       
     end # WebController
   end # Mixins
-end # Merb
\ No newline at end of file
+end # Merb