From c3bd6bb75fdbeb8f5d92b12ed2a9f5d4958d2f9c Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sat, 13 Aug 2011 22:14:18 +0530
Subject: Fixes readme links better - earlier links broke when the current page
 is anything other than github.com/rails/rails/. Even github.com/rails/rails
 (without the trailing slash) broke the readme links. Also change the rakefile
 that generates the rdoc readme accordingly

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Rakefile')

diff --git a/Rakefile b/Rakefile
index d18dac0dbd..36007f6e91 100755
--- a/Rakefile
+++ b/Rakefile
@@ -74,7 +74,7 @@ RDoc::Task.new do |rdoc|
     # since no autolinking happens there and RDoc displays the backslash
     # otherwise.
     rdoc_main.gsub!(/^(?=\S).*?\b(?=Rails)\b/) { "#$&\\" }
-    rdoc_main.gsub!(%r{link:blob/master/(\w+)/README\.rdoc}, "link:files/\\1/README_rdoc.html")
+    rdoc_main.gsub!(%r{link:/rails/rails/blob/master/(\w+)/README\.rdoc}, "link:files/\\1/README_rdoc.html")
 
     File.open(RDOC_MAIN, 'w') do |f|
       f.write(rdoc_main)
-- 
cgit v1.2.3


From 71232f5d5d88d5390ff790b7b3336f5168e9f270 Mon Sep 17 00:00:00 2001
From: Anand <lucky.developer@gmail.com>
Date: Mon, 22 Aug 2011 17:07:23 +0530
Subject: Travis status image added to GitHub README, excluding API pages.

---
 Rakefile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Rakefile')

diff --git a/Rakefile b/Rakefile
index 36007f6e91..4cf01cf063 100755
--- a/Rakefile
+++ b/Rakefile
@@ -76,6 +76,9 @@ RDoc::Task.new do |rdoc|
     rdoc_main.gsub!(/^(?=\S).*?\b(?=Rails)\b/) { "#$&\\" }
     rdoc_main.gsub!(%r{link:/rails/rails/blob/master/(\w+)/README\.rdoc}, "link:files/\\1/README_rdoc.html")
 
+    # Remove Travis build status image from API pages. Only GitHub README page gets this image
+    rdoc_main.gsub!("http://travis-ci.org/rails/rails.png", "")
+
     File.open(RDOC_MAIN, 'w') do |f|
       f.write(rdoc_main)
     end
-- 
cgit v1.2.3


From 827a0fee07eff7ca35ecdf5ca650f2094ad4825a Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 27 Aug 2011 03:55:01 -0700
Subject: use sdoc to generate the API

---
 Rakefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Rakefile')

diff --git a/Rakefile b/Rakefile
index 4cf01cf063..ae857036c5 100755
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,7 @@
 #!/usr/bin/env rake
 
 require 'rdoc/task'
+require 'sdoc'
 require 'net/http'
 
 $:.unshift File.expand_path('..', __FILE__)
@@ -89,7 +90,8 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = 'doc/rdoc'
   rdoc.title    = "Ruby on Rails Documentation"
 
-  rdoc.options << '-f' << 'horo'
+  rdoc.options << '-f' << 'sdoc'
+  rdoc.options << '-T' << 'rails'
   rdoc.options << '-c' << 'utf-8'
   rdoc.options << '-m' << RDOC_MAIN
 
-- 
cgit v1.2.3


From 5aa86f793f4df75f8a5780626269abc3511c61a0 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 29 Aug 2011 15:47:56 -0700
Subject: let SDoc add a link to the source code in GitHub for each method

---
 Rakefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Rakefile')

diff --git a/Rakefile b/Rakefile
index ae857036c5..f171949961 100755
--- a/Rakefile
+++ b/Rakefile
@@ -93,6 +93,7 @@ RDoc::Task.new do |rdoc|
   rdoc.options << '-f' << 'sdoc'
   rdoc.options << '-T' << 'rails'
   rdoc.options << '-c' << 'utf-8'
+  rdoc.options << '-g' # SDoc flag, link methods to GitHub
   rdoc.options << '-m' << RDOC_MAIN
 
   rdoc.rdoc_files.include('railties/CHANGELOG')
-- 
cgit v1.2.3