fixes doc generation

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>

4 files changed, 18 insertions, 15 deletions

diff --git a/Rakefile b/Rakefile
index 96d69bd33e..d9d24fc1ab 100644
--- a/Rakefile
+++ b/Rakefile
@@ -104,6 +104,10 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('activesupport/CHANGELOG')
   rdoc.rdoc_files.include('activesupport/lib/active_support/**/*.rb')
   rdoc.rdoc_files.exclude('activesupport/lib/active_support/vendor/*')
+
+  rdoc.rdoc_files.include('activemodel/README')
+  rdoc.rdoc_files.include('activemodel/CHANGELOG')
+  rdoc.rdoc_files.include('activemodel/lib/active_model/**/*.rb')
 end
 
 # Enhance rdoc task to copy referenced images also
diff --git a/activemodel/CHANGELOG b/activemodel/CHANGELOG
index 7489c0daa5..eae337e737 100644
--- a/activemodel/CHANGELOG
+++ b/activemodel/CHANGELOG
@@ -1,5 +1,16 @@
 *Edge*
 
+* ActiveModel::Observer#add_observer!
+
+  It has a custom hook to define after_find that should really be in a
+  ActiveRecord::Observer subclass:
+
+	  def add_observer!(klass)
+	    klass.add_observer(self)
+	    klass.class_eval 'def after_find() end' unless
+				klass.respond_to?(:after_find)
+	  end
+
 * Change the ActiveModel::Base.include_root_in_json default to true for Rails 3 [DHH]
 
 * Add validates_format_of :without => /regexp/ option. #430 [Elliot Winkler, Peer Allan]
diff --git a/activemodel/CHANGES b/activemodel/CHANGES
deleted file mode 100644
index 217a6d6bf7..0000000000
--- a/activemodel/CHANGES
+++ /dev/null
@@ -1,12 +0,0 @@
-Changes from extracting bits to ActiveModel
-
-* ActiveModel::Observer#add_observer!
-
-  It has a custom hook to define after_find that should really be in a
-  ActiveRecord::Observer subclass:
-
-	  def add_observer!(klass)
-	    klass.add_observer(self)
-	    klass.class_eval 'def after_find() end' unless 
-				klass.respond_to?(:after_find)
-	  end
diff --git a/activemodel/Rakefile b/activemodel/Rakefile
index 5ea7b373fc..14c02f183f 100755
--- a/activemodel/Rakefile
+++ b/activemodel/Rakefile
@@ -32,13 +32,13 @@ require 'rake/rdoctask'
 
 # Generate the RDoc documentation
 Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = "#{dir}/doc"
+  rdoc.rdoc_dir = "doc"
   rdoc.title    = "Active Model"
   rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
   rdoc.options << '--charset' << 'utf-8'
   rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
-  rdoc.rdoc_files.include("#{dir}/README", "#{dir}/CHANGES")
-  rdoc.rdoc_files.include("#{dir}/lib/**/*.rb")
+  rdoc.rdoc_files.include("README", "CHANGELOG")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end