diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-20 17:18:57 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-20 17:18:57 +0200 |
| commit | 0c75ec51a9b60252125534b8f9a3f6406713a957 (patch) | |
| tree | 34165e93f7dd01157f77e4e70a46ec6a5bed77c8 /railties | |
| parent | 87398e531d0bb23b30787fe26d86678dba322895 (diff) | |
| parent | 2ffa50f5a9fac08e08869687006031b70322497a (diff) | |
| download | rails-0c75ec51a9b60252125534b8f9a3f6406713a957.tar.gz rails-0c75ec51a9b60252125534b8f9a3f6406713a957.tar.bz2 rails-0c75ec51a9b60252125534b8f9a3f6406713a957.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/Rakefile | 16 | ||||
| -rw-r--r-- | railties/guides/source/initialization.textile | 4 |
2 files changed, 2 insertions, 18 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index 8e78d2ff4a..9ef6637c1e 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -1,8 +1,5 @@ -gem 'rdoc', '>= 2.5.9' -require 'rdoc' require 'rake' require 'rake/testtask' -require 'rdoc/task' require 'rake/gempackagetask' require 'date' @@ -58,19 +55,6 @@ task :validate_guides do ruby "guides/w3c_validator.rb" end -# Generate documentation ------------------------------------------------------------------ - -RDoc::Task.new { |rdoc| - rdoc.rdoc_dir = 'doc' - rdoc.title = "Railties -- Gluing the Engine to the Rails" - rdoc.options << '-f' << 'horo' - rdoc.options << '--main' << 'README.rdoc' - rdoc.options << '--charset' << 'utf-8' - rdoc.rdoc_files.include('README.rdoc', 'CHANGELOG') - rdoc.rdoc_files.include('lib/**/*.rb') - rdoc.rdoc_files.exclude('lib/rails/generators/**/templates/*') -} - # Generate GEM ---------------------------------------------------------------------------- spec = eval(File.read('railties.gemspec')) diff --git a/railties/guides/source/initialization.textile b/railties/guides/source/initialization.textile index 4e257d2e00..0a2f60c30a 100644 --- a/railties/guides/source/initialization.textile +++ b/railties/guides/source/initialization.textile @@ -150,7 +150,7 @@ Here the only two gems we need are +rails+ and +sqlite3-ruby+, so it seems. This * nokogiri-1.4.3.1.gem * polyglot-0.3.1.gem * rack-1.2.1.gem -* rack-mount-0.6.9.gem +* rack-mount-0.6.10.gem * rack-test-0.5.4.gem * rails-3.0.0.beta4.gem * railties-3.0.0.beta4.gem @@ -160,7 +160,7 @@ Here the only two gems we need are +rails+ and +sqlite3-ruby+, so it seems. This * text-hyphen-1.0.0.gem * thor-0.13.7.gem * treetop-1.4.8.gem -* tzinfo-0.3.22.gem +* tzinfo-0.3.23.gem TODO: Prettify when it becomes more stable. |