diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-07-21 13:49:36 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-07-21 13:49:36 -0700 |
| commit | bb7e35531e181439ff4a454296a78a00fe1e8723 (patch) | |
| tree | 4fbe78e45f974a063c0bea021266efd926ad6c8d /railties | |
| parent | b744c8493bb29bf3e59164ff65ca22ff17611554 (diff) | |
| download | rails-bb7e35531e181439ff4a454296a78a00fe1e8723.tar.gz rails-bb7e35531e181439ff4a454296a78a00fe1e8723.tar.bz2 rails-bb7e35531e181439ff4a454296a78a00fe1e8723.zip | |
removing inline source option from rdoc task. fixes #2169
Diffstat (limited to 'railties')
| -rwxr-xr-x | railties/lib/rails/generators/rails/plugin_new/templates/Rakefile | 2 | ||||
| -rw-r--r-- | railties/lib/rails/tasks/documentation.rake | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile index 731f98047e..6ed6adcf1b 100755 --- a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile +++ b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile @@ -15,7 +15,7 @@ end RDoc::Task.new(:rdoc) do |rdoc| rdoc.rdoc_dir = 'rdoc' rdoc.title = '<%= camelized %>' - rdoc.options << '--line-numbers' << '--inline-source' + rdoc.options << '--line-numbers' rdoc.rdoc_files.include('README.rdoc') rdoc.rdoc_files.include('lib/**/*.rb') end diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake index 79255d1f56..5d613e0698 100644 --- a/railties/lib/rails/tasks/documentation.rake +++ b/railties/lib/rails/tasks/documentation.rake @@ -47,7 +47,7 @@ namespace :doc do rdoc.rdoc_dir = 'doc/app' rdoc.template = ENV['template'] if ENV['template'] rdoc.title = ENV['title'] || "Rails Application Documentation" - rdoc.options << '--line-numbers' << '--inline-source' + rdoc.options << '--line-numbers' rdoc.options << '--charset' << 'utf-8' rdoc.rdoc_files.include('doc/README_FOR_APP') rdoc.rdoc_files.include('app/**/*.rb') @@ -60,7 +60,7 @@ namespace :doc do rdoc.rdoc_dir = 'doc/api' rdoc.template = "#{ENV['template']}.rb" if ENV['template'] rdoc.title = "Rails Framework Documentation" - rdoc.options << '--line-numbers' << '--inline-source' + rdoc.options << '--line-numbers' rdoc.rdoc_files.include('README') gem_path('actionmailer') do |actionmailer| @@ -133,7 +133,7 @@ namespace :doc do files = Rake::FileList.new options << "-o doc/plugins/#{plugin}" options << "--title '#{plugin.titlecase} Plugin Documentation'" - options << '--line-numbers' << '--inline-source' + options << '--line-numbers' options << '--charset' << 'utf-8' options << '-T html' |