diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/documentation.rake | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 7e36909749..347b987ecb 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that rake doc:app should use UTF-8 #8906 [farzy] + * Fixes rake annotations to search erb and builder files as well #9150 [m.langenberg] * Removed web_service generator [Koz] diff --git a/railties/lib/tasks/documentation.rake b/railties/lib/tasks/documentation.rake index ec17ea2483..dd6254582e 100644 --- a/railties/lib/tasks/documentation.rake +++ b/railties/lib/tasks/documentation.rake @@ -4,6 +4,7 @@ namespace :doc do rdoc.rdoc_dir = 'doc/app' rdoc.title = "Rails Application Documentation" rdoc.options << '--line-numbers' << '--inline-source' + rdoc.options << '--charset' << 'utf-8' rdoc.rdoc_files.include('doc/README_FOR_APP') rdoc.rdoc_files.include('app/**/*.rb') rdoc.rdoc_files.include('lib/**/*.rb') @@ -69,4 +70,4 @@ namespace :doc do end end end -end
\ No newline at end of file +end |