aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-08-13 10:52:12 -0700
committerXavier Noria <fxn@hashref.com>2011-08-13 10:52:12 -0700
commitacfdb18d92c3ab6b80023b643f89f3ce3cab6840 (patch)
tree1596ed9ac11a28cb8fc66894f6141c4301f8366f
parent9ecc4433bbda255cbcb4a2be442c8ee985692d06 (diff)
parentc3bd6bb75fdbeb8f5d92b12ed2a9f5d4958d2f9c (diff)
downloadrails-acfdb18d92c3ab6b80023b643f89f3ce3cab6840.tar.gz
rails-acfdb18d92c3ab6b80023b643f89f3ce3cab6840.tar.bz2
rails-acfdb18d92c3ab6b80023b643f89f3ce3cab6840.zip
Merge pull request #2519 from vijaydev/readme_fixes
Fixes the README links in README.rdoc on GitHub
-rw-r--r--README.rdoc4
-rwxr-xr-xRakefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/README.rdoc b/README.rdoc
index 5d1e3f5c5d..1e78799e83 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -18,7 +18,7 @@ you to present the data from database rows as objects and embellish these data o
with business logic methods. Although most Rails models are backed by a database, models
can also be ordinary Ruby classes, or Ruby classes that implement a set of interfaces as
provided by the ActiveModel module. You can read more about Active Record in its
-{README}[link:blob/master/activerecord/README.rdoc].
+{README}[link:/rails/rails/blob/master/activerecord/README.rdoc].
The Controller layer is responsible for handling incoming HTTP requests and providing a
suitable response. Usually this means returning HTML, but Rails controllers can also
@@ -29,7 +29,7 @@ In Rails, the Controller and View layers are handled together by Action Pack.
These two layers are bundled in a single package due to their heavy interdependence.
This is unlike the relationship between Active Record and Action Pack which are
independent. Each of these packages can be used independently outside of Rails. You
-can read more about Action Pack in its {README}[link:blob/master/actionpack/README.rdoc].
+can read more about Action Pack in its {README}[link:/rails/rails/blob/master/actionpack/README.rdoc].
== Getting Started
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)