diff options
| author | wycats <wycats@gmail.com> | 2010-03-26 15:10:24 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-26 15:10:24 -0700 |
| commit | 197904341f2b2f21d69c653cede3aec124e86720 (patch) | |
| tree | 83f1234e238016126860a929594db22e1862d783 /railties/Rakefile | |
| parent | 76d2c455c0607b4cd5f238cadef8f933a18567fb (diff) | |
| parent | b3a0aed028835ce4551c4a76742744a40a71b0be (diff) | |
| download | rails-197904341f2b2f21d69c653cede3aec124e86720.tar.gz rails-197904341f2b2f21d69c653cede3aec124e86720.tar.bz2 rails-197904341f2b2f21d69c653cede3aec124e86720.zip | |
Merge branch 'master' into docrails
Diffstat (limited to 'railties/Rakefile')
| -rw-r--r-- | railties/Rakefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index fe049d565f..6368456366 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -36,7 +36,7 @@ end desc "Updates application README to the latest version Railties README" task :update_readme do - readme = "lib/generators/rails/app/templates/README" + readme = "lib/rails/generators/rails/app/templates/README" rm readme cp "./README", readme end @@ -48,7 +48,7 @@ task :generate_guides do end task :update_prototype_ujs do - system "curl http://github.com/rails/prototype-ujs/raw/master/src/rails.js > lib/generators/rails/app/templates/public/javascripts/rails.js" + system "curl http://github.com/rails/prototype-ujs/raw/master/src/rails.js > lib/rails/generators/rails/app/templates/public/javascripts/rails.js" end # Generate documentation ------------------------------------------------------------------ @@ -62,8 +62,8 @@ Rake::RDocTask.new { |rdoc| rdoc.rdoc_files.include('README', 'CHANGELOG') rdoc.rdoc_files.include('lib/*.rb') rdoc.rdoc_files.include('lib/rails/*.rb') - rdoc.rdoc_files.include('lib/generators/*.rb') - rdoc.rdoc_files.include('lib/commands/**/*.rb') + rdoc.rdoc_files.include('lib/rails/generators/*.rb') + rdoc.rdoc_files.include('lib/rails/commands/**/*.rb') } # Generate GEM ---------------------------------------------------------------------------- |