aboutsummaryrefslogtreecommitdiffstats
path: root/railties/doc/guides/index.txt
diff options
context:
space:
mode:
authorRyan Bigg <radarlistener@gmail.com>2008-10-18 17:43:38 +1030
committerRyan Bigg <radarlistener@gmail.com>2008-10-18 17:43:38 +1030
commit2139a1b6812be7ca86de2df52e9776a2be4a2bf7 (patch)
tree3131e29d3582b8aa1ba1c68710f327ce2f22aa1d /railties/doc/guides/index.txt
parent09b7e351316cb87a815678241fc90af549327cf3 (diff)
parent095cafbcd7fbae3baa845b23b93c8dca93b442f8 (diff)
downloadrails-2139a1b6812be7ca86de2df52e9776a2be4a2bf7.tar.gz
rails-2139a1b6812be7ca86de2df52e9776a2be4a2bf7.tar.bz2
rails-2139a1b6812be7ca86de2df52e9776a2be4a2bf7.zip
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'railties/doc/guides/index.txt')
-rw-r--r--railties/doc/guides/index.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/railties/doc/guides/index.txt b/railties/doc/guides/index.txt
index ad82aea3ec..dfbb3d2799 100644
--- a/railties/doc/guides/index.txt
+++ b/railties/doc/guides/index.txt
@@ -43,8 +43,6 @@ This guide covers the find method defined in ActiveRecord::Base, as well as name
.link:actionview/layouts_and_rendering.html[Layouts and Rendering in Rails]
***********************************************************
-CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/15[Lighthouse Ticket]
-
This guide covers the basic layout features of Action Controller and Action View,
including rendering and redirecting, using +content_for_ blocks, and working
with partials.
@@ -111,7 +109,7 @@ ways of achieving this and how to understand what is happening "behind the scene
of your code.
***********************************************************
-.link:benchmarking_and_profiling/preamble.html[Benchmarking and Profiling Rails Applications]
+.link:benchmarking_and_profiling/index.html[Benchmarking and Profiling Rails Applications]
***********************************************************
CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/4[Lighthouse Ticket]