diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-07-31 16:21:07 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-07-31 16:21:07 -0300 |
| commit | 3de59e916d6a3d4eab202cf0c99b1f88905a3b43 (patch) | |
| tree | def6d6a808ebe187be1f37f8a739fd786cc11f02 /railties/lib/tasks/documentation.rake | |
| parent | c1cbf02e3170f1004daf4a146cbc41176c2458d3 (diff) | |
| parent | 62fd1d3716b4b5fd1d91cdcc77003efe80fc5a7e (diff) | |
| download | rails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.tar.gz rails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.tar.bz2 rails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'railties/lib/tasks/documentation.rake')
| -rw-r--r-- | railties/lib/tasks/documentation.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/tasks/documentation.rake b/railties/lib/tasks/documentation.rake index 8b41478a93..db1939c45f 100644 --- a/railties/lib/tasks/documentation.rake +++ b/railties/lib/tasks/documentation.rake @@ -21,7 +21,7 @@ namespace :doc do rdoc.rdoc_files.include('vendor/rails/railties/CHANGELOG') rdoc.rdoc_files.include('vendor/rails/railties/MIT-LICENSE') rdoc.rdoc_files.include('vendor/rails/railties/README') - rdoc.rdoc_files.include('vendor/rails/railties/lib/{*.rb,commands/*.rb,rails_generator/*.rb}') + rdoc.rdoc_files.include('vendor/rails/railties/lib/{*.rb,commands/*.rb,generators/*.rb}') rdoc.rdoc_files.include('vendor/rails/activerecord/README') rdoc.rdoc_files.include('vendor/rails/activerecord/CHANGELOG') rdoc.rdoc_files.include('vendor/rails/activerecord/lib/active_record/**/*.rb') |