Merge remote branch 'rails/master' into pg_schema_fu

1 files changed, 21 insertions, 2 deletions

diff --git a/Rakefile b/Rakefile
index 92b2e77963..b3bde156d1 100755
--- a/Rakefile
+++ b/Rakefile
@@ -51,9 +51,28 @@ desc "Generate documentation for the Rails framework"
 RDoc::Task.new do |rdoc|
   RDOC_MAIN = 'RDOC_MAIN.rdoc'
 
+  # This is a hack.
+  #
+  # Backslashes are needed to prevent RDoc from autolinking "Rails" to the
+  # documentation of the Rails module. On the other hand, as of this
+  # writing README.rdoc is displayed in the front page of the project in
+  # GitHub, where backslashes are shown and look weird.
+  #
+  # The temporary solution is to have a README.rdoc without backslashes for
+  # GitHub, and gsub it to generate the main page of the API.
+  #
+  # The idea for the future is to have totally different files, since the
+  # API is no longer a generic entry point to Rails and deserves a
+  # dedicated main page specifically thought as an API entry point.
   rdoc.before_running_rdoc do
     rdoc_main = File.read('README.rdoc')
-    rdoc_main.gsub!(/\b(?=Rails)\b/) { '\\' }
+
+    # The ^(?=\S) assertion prevents code blocks from being processed,
+    # since no autolinking happens there and RDoc displays the backslash
+    # otherwise.
+    rdoc_main.gsub!(/^(?=\S).*?\b(?=Rails)\b/) { "#$&\\" }
+    rdoc_main.gsub!(/link:blob\/master\/(\w+)\/README.rdoc/, "link:files/\\1/README_rdoc.html")
+
     File.open(RDOC_MAIN, 'w') do |f|
       f.write(rdoc_main)
     end
@@ -72,7 +91,7 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.include('railties/MIT-LICENSE')
   rdoc.rdoc_files.include('railties/README.rdoc')
   rdoc.rdoc_files.include('railties/lib/**/*.rb')
-  rdoc.rdoc_files.exclude('railties/lib/rails/generators/**/templates/*')
+  rdoc.rdoc_files.exclude('railties/lib/rails/generators/**/templates/**/*.rb')
 
   rdoc.rdoc_files.include('activerecord/README.rdoc')
   rdoc.rdoc_files.include('activerecord/CHANGELOG')