Use custom templates and stuff

16 files changed, 85 insertions, 85 deletions

diff --git a/railties/doc/guides/html/actioncontroller_basics.html b/railties/doc/guides/html/actioncontroller_basics.html
index 4df3a7e9b2..98ce2b48bf 100644
--- a/railties/doc/guides/html/actioncontroller_basics.html
+++ b/railties/doc/guides/html/actioncontroller_basics.html
@@ -6,9 +6,9 @@
 	<!--[if lt IE 8]>
 	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
 	<![endif]-->
-	<link href="http://manuals.rubyonrails.org/stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
 	<style type="text/css">
 		div#container {
 	max-width: 900px;
@@ -189,7 +189,7 @@ ul#navMain {
 
 		<ul id="navMain">
 			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="http://manuals.rubyonrails.org/" title="Manuals Index">Manuals Index</a></li>
+			<li><a class="manuals" href="http://guides.rubyonrails.org/" title="Manuals Index">Guides Index</a></li>
 		</ul>
 	</div>
 
diff --git a/railties/doc/guides/html/association_basics.html b/railties/doc/guides/html/association_basics.html
index 799493e2d7..0ded42790e 100644
--- a/railties/doc/guides/html/association_basics.html
+++ b/railties/doc/guides/html/association_basics.html
@@ -6,9 +6,9 @@
 	<!--[if lt IE 8]>
 	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
 	<![endif]-->
-	<link href="http://manuals.rubyonrails.org/stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
 	<style type="text/css">
 		div#container {
 	max-width: 900px;
@@ -189,7 +189,7 @@ ul#navMain {
 
 		<ul id="navMain">
 			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="http://manuals.rubyonrails.org/" title="Manuals Index">Manuals Index</a></li>
+			<li><a class="manuals" href="http://guides.rubyonrails.org/" title="Manuals Index">Guides Index</a></li>
 		</ul>
 	</div>
 
diff --git a/railties/doc/guides/html/authors.html b/railties/doc/guides/html/authors.html
index 61a5665968..d6bb8018a9 100644
--- a/railties/doc/guides/html/authors.html
+++ b/railties/doc/guides/html/authors.html
@@ -6,9 +6,9 @@
 	<!--[if lt IE 8]>
 	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
 	<![endif]-->
-	<link href="http://manuals.rubyonrails.org/stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
 	<style type="text/css">
 		div#container {
 	max-width: 900px;
@@ -189,7 +189,7 @@ ul#navMain {
 
 		<ul id="navMain">
 			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="http://manuals.rubyonrails.org/" title="Manuals Index">Manuals Index</a></li>
+			<li><a class="manuals" href="http://guides.rubyonrails.org/" title="Manuals Index">Guides Index</a></li>
 		</ul>
 	</div>
 
diff --git a/railties/doc/guides/html/benchmarking_and_profiling.html b/railties/doc/guides/html/benchmarking_and_profiling.html
index e20197b2f0..7b6ea9fab5 100644
--- a/railties/doc/guides/html/benchmarking_and_profiling.html
+++ b/railties/doc/guides/html/benchmarking_and_profiling.html
@@ -6,9 +6,9 @@
 	<!--[if lt IE 8]>
 	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
 	<![endif]-->
-	<link href="http://manuals.rubyonrails.org/stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
 	<style type="text/css">
 		div#container {
 	max-width: 900px;
@@ -189,7 +189,7 @@ ul#navMain {
 
 		<ul id="navMain">
 			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="http://manuals.rubyonrails.org/" title="Manuals Index">Manuals Index</a></li>
+			<li><a class="manuals" href="http://guides.rubyonrails.org/" title="Manuals Index">Guides Index</a></li>
 		</ul>
 	</div>
 
diff --git a/railties/doc/guides/html/caching_with_rails.html b/railties/doc/guides/html/caching_with_rails.html
index 784fa37100..ed8513175a 100644
--- a/railties/doc/guides/html/caching_with_rails.html
+++ b/railties/doc/guides/html/caching_with_rails.html
@@ -6,9 +6,9 @@
 	<!--[if lt IE 8]>
 	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
 	<![endif]-->
-	<link href="http://manuals.rubyonrails.org/stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
 	<style type="text/css">
 		div#container {
 	max-width: 900px;
@@ -189,7 +189,7 @@ ul#navMain {
 
 		<ul id="navMain">
 			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="http://manuals.rubyonrails.org/" title="Manuals Index">Manuals Index</a></li>
+			<li><a class="manuals" href="http://guides.rubyonrails.org/" title="Manuals Index">Guides Index</a></li>
 		</ul>
 	</div>
 
diff --git a/railties/doc/guides/html/creating_plugins.html b/railties/doc/guides/html/creating_plugins.html
index 7c0419659d..929f9761e9 100644
--- a/railties/doc/guides/html/creating_plugins.html
+++ b/railties/doc/guides/html/creating_plugins.html
@@ -6,9 +6,9 @@
 	<!--[if lt IE 8]>
 	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
 	<![endif]-->
-	<link href="http://manuals.rubyonrails.org/stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
 	<style type="text/css">
 		div#container {
 	max-width: 900px;
@@ -189,7 +189,7 @@ ul#navMain {
 
 		<ul id="navMain">
 			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="http://manuals.rubyonrails.org/" title="Manuals Index">Manuals Index</a></li>
+			<li><a class="manuals" href="http://guides.rubyonrails.org/" title="Manuals Index">Guides Index</a></li>
 		</ul>
 	</div>
 
diff --git a/railties/doc/guides/html/debugging_rails_applications.html b/railties/doc/guides/html/debugging_rails_applications.html
index 9b5136e4b5..db4bb28eac 100644
--- a/railties/doc/guides/html/debugging_rails_applications.html
+++ b/railties/doc/guides/html/debugging_rails_applications.html
@@ -6,9 +6,9 @@
 	<!--[if lt IE 8]>
 	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
 	<![endif]-->
-	<link href="http://manuals.rubyonrails.org/stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
 	<style type="text/css">
 		div#container {
 	max-width: 900px;
@@ -189,7 +189,7 @@ ul#navMain {
 
 		<ul id="navMain">
 			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="http://manuals.rubyonrails.org/" title="Manuals Index">Manuals Index</a></li>
+			<li><a class="manuals" href="http://guides.rubyonrails.org/" title="Manuals Index">Guides Index</a></li>
 		</ul>
 	</div>
 
diff --git a/railties/doc/guides/html/finders.html b/railties/doc/guides/html/finders.html
index ab07ac0d09..2c82c82aa4 100644
--- a/railties/doc/guides/html/finders.html
+++ b/railties/doc/guides/html/finders.html
@@ -6,9 +6,9 @@
 	<!--[if lt IE 8]>
 	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
 	<![endif]-->
-	<link href="http://manuals.rubyonrails.org/stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
 	<style type="text/css">
 		div#container {
 	max-width: 900px;
@@ -189,7 +189,7 @@ ul#navMain {
 
 		<ul id="navMain">
 			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="http://manuals.rubyonrails.org/" title="Manuals Index">Manuals Index</a></li>
+			<li><a class="manuals" href="http://guides.rubyonrails.org/" title="Manuals Index">Guides Index</a></li>
 		</ul>
 	</div>
 
diff --git a/railties/doc/guides/html/form_helpers.html b/railties/doc/guides/html/form_helpers.html
index dcdc4e4e67..bb0e7485e5 100644
--- a/railties/doc/guides/html/form_helpers.html
+++ b/railties/doc/guides/html/form_helpers.html
@@ -6,9 +6,9 @@
 	<!--[if lt IE 8]>
 	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
 	<![endif]-->
-	<link href="http://manuals.rubyonrails.org/stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
 	<style type="text/css">
 		div#container {
 	max-width: 900px;
@@ -189,7 +189,7 @@ ul#navMain {
 
 		<ul id="navMain">
 			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="http://manuals.rubyonrails.org/" title="Manuals Index">Manuals Index</a></li>
+			<li><a class="manuals" href="http://guides.rubyonrails.org/" title="Manuals Index">Guides Index</a></li>
 		</ul>
 	</div>
 
diff --git a/railties/doc/guides/html/getting_started_with_rails.html b/railties/doc/guides/html/getting_started_with_rails.html
index 745b28cef9..4cdf73d6b1 100644
--- a/railties/doc/guides/html/getting_started_with_rails.html
+++ b/railties/doc/guides/html/getting_started_with_rails.html
@@ -6,9 +6,9 @@
 	<!--[if lt IE 8]>
 	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
 	<![endif]-->
-	<link href="http://manuals.rubyonrails.org/stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
 	<style type="text/css">
 		div#container {
 	max-width: 900px;
@@ -189,7 +189,7 @@ ul#navMain {
 
 		<ul id="navMain">
 			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="http://manuals.rubyonrails.org/" title="Manuals Index">Manuals Index</a></li>
+			<li><a class="manuals" href="http://guides.rubyonrails.org/" title="Manuals Index">Guides Index</a></li>
 		</ul>
 	</div>
 
@@ -641,7 +641,7 @@ cellspacing="0" cellpadding="4">
     <tt>test/</tt>

     </td>

     <td align="left">

-    Unit tests, fixtures, and other test apparatus. These are covered in <a href="../testing_rails_applications/testing_rails_applications.html">Testing Rails Applications</a>

+    Unit tests, fixtures, and other test apparatus. These are covered in <a href="../testing_rails_applications.html">Testing Rails Applications</a>

     </td>

   </tr>

   <tr>

@@ -819,7 +819,7 @@ http://www.gnu.org/software/src-highlite -->
 <td class="icon">

 <img src="/Users/lifo/Docs/docrails/railties/doc/guides/source/icons/note.png" alt="Note" />

 </td>

-<td class="content">For more information about routing, refer to <a href="../routing/routing_outside_in.html">Rails Routing from the Outside In</a>.</td>

+<td class="content">For more information about routing, refer to <a href="../routing_outside_in.html">Rails Routing from the Outside In</a>.</td>

 </tr></table>

 </div>

 </div>

@@ -1002,7 +1002,7 @@ http://www.gnu.org/software/src-highlite -->
   <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>

 <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>

 </tt></pre></div></div>

-<div class="para"><p>If you were to translate that into words, it says something like: when this migration is run, create a table named <tt>posts</tt> with two string columns (<tt>name</tt> and <tt>title</tt>) and a text column (<tt>content</tt>), and generate timestamp fields to track record creation and updating. You can learn the detailed syntax for migrations in the <a href="../migrations/migrations.html">Rails Database Migrations</a> guide.</p></div>

+<div class="para"><p>If you were to translate that into words, it says something like: when this migration is run, create a table named <tt>posts</tt> with two string columns (<tt>name</tt> and <tt>title</tt>) and a text column (<tt>content</tt>), and generate timestamp fields to track record creation and updating. You can learn the detailed syntax for migrations in the <a href="../migrations.html">Rails Database Migrations</a> guide.</p></div>

 <div class="para"><p>At this point, you need to do two things: create the database and run the migration. You can use rake commands at the terminal for both of those tasks:</p></div>

 <div class="listingblock">

 <div class="content"><!-- Generator: GNU source-highlight 2.9

@@ -1128,7 +1128,7 @@ http://www.gnu.org/software/src-highlite -->
 <td class="icon">

 <img src="/Users/lifo/Docs/docrails/railties/doc/guides/source/icons/tip.png" alt="Tip" />

 </td>

-<td class="content">For more information on finding records with Active Record, see <a href="../activerecord/finders.html">Active Record Finders</a>.</td>

+<td class="content">For more information on finding records with Active Record, see <a href="../finders.html">Active Record Finders</a>.</td>

 </tr></table>

 </div>

 <div class="para"><p>The <tt>respond_to</tt> block handles both HTML and XML calls to this action. If you borwse to <tt>http://localhost:3000/posts.xml</tt>, you'll see all of the posts in XML format. The HTML format looks for a view in <tt>app/views/posts/</tt> with a name that corresponds to the action name. Rails makes all of the instance variables from the action available to the view. Here's <tt>app/view/posts/index.html.erb</tt>:</p></div>

@@ -1185,7 +1185,7 @@ http://www.gnu.org/software/src-highlite -->
 <td class="icon">

 <img src="/Users/lifo/Docs/docrails/railties/doc/guides/source/icons/tip.png" alt="Tip" />

 </td>

-<td class="content">For more details on the rendering process, see <a href="../actionview/layouts_and_rendering.html">Layouts and Rendering in Rails</a>.</td>

+<td class="content">For more details on the rendering process, see <a href="../layouts_and_rendering.html">Layouts and Rendering in Rails</a>.</td>

 </tr></table>

 </div>

 <h3 id="_customizing_the_layout">6.8. Customizing the Layout</h3>

@@ -1538,7 +1538,7 @@ http://www.gnu.org/software/src-highlite -->
 <td class="icon">

 <img src="/Users/lifo/Docs/docrails/railties/doc/guides/source/icons/tip.png" alt="Tip" />

 </td>

-<td class="content">For more information on Active Record associations, see the <a href="../activerecord/association_basics.html+">Active Record Associations</a> guide.</td>

+<td class="content">For more information on Active Record associations, see the <a href="../association_basics.html+">Active Record Associations</a> guide.</td>

 </tr></table>

 </div>

 <h3 id="_adding_a_route">7.3. Adding a Route</h3>

@@ -1558,7 +1558,7 @@ http://www.gnu.org/software/src-highlite -->
 <td class="icon">

 <img src="/Users/lifo/Docs/docrails/railties/doc/guides/source/icons/tip.png" alt="Tip" />

 </td>

-<td class="content">For more information on routing, see the <a href="../routing/routing_outside_in">Rails Routing from the Outside In</a> guide.</td>

+<td class="content">For more information on routing, see the <a href="../routing_outside_in">Rails Routing from the Outside In</a> guide.</td>

 </tr></table>

 </div>

 <h3 id="_generating_a_controller">7.4. Generating a Controller</h3>

diff --git a/railties/doc/guides/html/index.html b/railties/doc/guides/html/index.html
index fcc5be2d73..81154cfd00 100644
--- a/railties/doc/guides/html/index.html
+++ b/railties/doc/guides/html/index.html
@@ -6,9 +6,9 @@
 	<!--[if lt IE 8]>
 	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
 	<![endif]-->
-	<link href="http://manuals.rubyonrails.org/stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
 	<style type="text/css">
 		div#container {
 	max-width: 900px;
@@ -189,7 +189,7 @@ ul#navMain {
 
 		<ul id="navMain">
 			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="http://manuals.rubyonrails.org/" title="Manuals Index">Manuals Index</a></li>
+			<li><a class="manuals" href="http://guides.rubyonrails.org/" title="Manuals Index">Guides Index</a></li>
 		</ul>
 	</div>
 
@@ -218,7 +218,7 @@ ul#navMain {
 <h2>Start Here</h2>

 <div class="sidebarblock">

 <div class="sidebar-content">

-<div class="sidebar-title"><a href="getting_started_with_rails/getting_started_with_rails.html">Getting Started with Rails</a></div>

+<div class="sidebar-title"><a href="getting_started_with_rails.html">Getting Started with Rails</a></div>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -232,17 +232,17 @@ ul#navMain {
 <h2>Models</h2>

 <div class="sidebarblock">

 <div class="sidebar-content">

-<div class="sidebar-title"><a href="migrations/migrations.html">Rails Database Migrations</a></div>

+<div class="sidebar-title"><a href="migrations.html">Rails Database Migrations</a></div>

 <div class="para"><p>This guide covers how you can use Active Record migrations to alter your database in a structured and organized manner.</p></div>

 </div></div>

 <div class="sidebarblock">

 <div class="sidebar-content">

-<div class="sidebar-title"><a href="activerecord/association_basics.html">Active Record Associations</a></div>

+<div class="sidebar-title"><a href="association_basics.html">Active Record Associations</a></div>

 <div class="para"><p>This guide covers all the associations provided by Active Record.</p></div>

 </div></div>

 <div class="sidebarblock">

 <div class="sidebar-content">

-<div class="sidebar-title"><a href="activerecord/finders.html">Active Record Finders</a></div>

+<div class="sidebar-title"><a href="finders.html">Active Record Finders</a></div>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -256,14 +256,14 @@ ul#navMain {
 <h2>Views</h2>

 <div class="sidebarblock">

 <div class="sidebar-content">

-<div class="sidebar-title"><a href="actionview/layouts_and_rendering.html">Layouts and Rendering in Rails</a></div>

+<div class="sidebar-title"><a href="layouts_and_rendering.html">Layouts and Rendering in Rails</a></div>

 <div class="para"><p>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.</p></div>

 </div></div>

 <div class="sidebarblock">

 <div class="sidebar-content">

-<div class="sidebar-title"><a href="forms/form_helpers.html">Action View Form Helpers</a></div>

+<div class="sidebar-title"><a href="form_helpers.html">Action View Form Helpers</a></div>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -277,13 +277,13 @@ with partials.</p></div>
 <h2>Controllers</h2>

 <div class="sidebarblock">

 <div class="sidebar-content">

-<div class="sidebar-title"><a href="routing/routing_outside_in.html">Rails Routing from the Outside In</a></div>

+<div class="sidebar-title"><a href="routing_outside_in.html">Rails Routing from the Outside In</a></div>

 <div class="para"><p>This guide covers the user-facing features of Rails routing. If you want to

 understand how to use routing in your own Rails applications, start here.</p></div>

 </div></div>

 <div class="sidebarblock">

 <div class="sidebar-content">

-<div class="sidebar-title"><a href="actioncontroller/actioncontroller.html">Basics of Action Controller</a></div>

+<div class="sidebar-title"><a href="actioncontroller_basics.html">Basics of Action Controller</a></div>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -296,7 +296,7 @@ understand how to use routing in your own Rails applications, start here.</p></d
 </div></div>

 <div class="sidebarblock">

 <div class="sidebar-content">

-<div class="sidebar-title"><a href="caching/caching_with_rails.html">Rails Caching</a></div>

+<div class="sidebar-title"><a href="caching_with_rails.html">Rails Caching</a></div>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -310,7 +310,7 @@ understand how to use routing in your own Rails applications, start here.</p></d
 <h2>Digging Deeper</h2>

 <div class="sidebarblock">

 <div class="sidebar-content">

-<div class="sidebar-title"><a href="testing_rails_applications/testing_rails_applications.html">Testing Rails Applications</a></div>

+<div class="sidebar-title"><a href="testing_rails_applications.html">Testing Rails Applications</a></div>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -325,7 +325,7 @@ Enjoy.</p></div>
 </div></div>

 <div class="sidebarblock">

 <div class="sidebar-content">

-<div class="sidebar-title"><a href="securing_rails_applications/security.html">Securing Rails Applications</a></div>

+<div class="sidebar-title"><a href="security.html">Securing Rails Applications</a></div>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -339,7 +339,7 @@ avoid them with Rails.</p></div>
 </div></div>

 <div class="sidebarblock">

 <div class="sidebar-content">

-<div class="sidebar-title"><a href="debugging/debugging_rails_applications.html">Debugging Rails Applications</a></div>

+<div class="sidebar-title"><a href="debugging_rails_applications.html">Debugging Rails Applications</a></div>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -354,7 +354,7 @@ of your code.</p></div>
 </div></div>

 <div class="sidebarblock">

 <div class="sidebar-content">

-<div class="sidebar-title"><a href="benchmarking_and_profiling/index.html">Benchmarking and Profiling Rails Applications</a></div>

+<div class="sidebar-title"><a href="benchmarking_and_profiling.html">Benchmarking and Profiling Rails Applications</a></div>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -367,7 +367,7 @@ of your code.</p></div>
 </div></div>

 <div class="sidebarblock">

 <div class="sidebar-content">

-<div class="sidebar-title"><a href="creating_plugins/creating_plugins.html">The Basics of Creating Rails Plugins</a></div>

+<div class="sidebar-title"><a href="creating_plugins.html">The Basics of Creating Rails Plugins</a></div>

 <div class="para"><p>This guide covers how to build a plugin to extend the functionality of Rails.</p></div>

 </div></div>

 <div class="para"><p>Authors who have contributed to complete guides are listed <a href="authors.html">here</a>.</p></div>

diff --git a/railties/doc/guides/html/layouts_and_rendering.html b/railties/doc/guides/html/layouts_and_rendering.html
index 35ef867420..42f4972dc9 100644
--- a/railties/doc/guides/html/layouts_and_rendering.html
+++ b/railties/doc/guides/html/layouts_and_rendering.html
@@ -6,9 +6,9 @@
 	<!--[if lt IE 8]>
 	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
 	<![endif]-->
-	<link href="http://manuals.rubyonrails.org/stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
 	<style type="text/css">
 		div#container {
 	max-width: 900px;
@@ -189,7 +189,7 @@ ul#navMain {
 
 		<ul id="navMain">
 			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="http://manuals.rubyonrails.org/" title="Manuals Index">Manuals Index</a></li>
+			<li><a class="manuals" href="http://guides.rubyonrails.org/" title="Manuals Index">Guides Index</a></li>
 		</ul>
 	</div>
 
diff --git a/railties/doc/guides/html/migrations.html b/railties/doc/guides/html/migrations.html
index 927cafda99..cb963cdbb6 100644
--- a/railties/doc/guides/html/migrations.html
+++ b/railties/doc/guides/html/migrations.html
@@ -6,9 +6,9 @@
 	<!--[if lt IE 8]>
 	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
 	<![endif]-->
-	<link href="http://manuals.rubyonrails.org/stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
 	<style type="text/css">
 		div#container {
 	max-width: 900px;
@@ -189,7 +189,7 @@ ul#navMain {
 
 		<ul id="navMain">
 			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="http://manuals.rubyonrails.org/" title="Manuals Index">Manuals Index</a></li>
+			<li><a class="manuals" href="http://guides.rubyonrails.org/" title="Manuals Index">Guides Index</a></li>
 		</ul>
 	</div>
 
diff --git a/railties/doc/guides/html/routing_outside_in.html b/railties/doc/guides/html/routing_outside_in.html
index 23b6d59590..dbb5512ae9 100644
--- a/railties/doc/guides/html/routing_outside_in.html
+++ b/railties/doc/guides/html/routing_outside_in.html
@@ -6,9 +6,9 @@
 	<!--[if lt IE 8]>
 	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
 	<![endif]-->
-	<link href="http://manuals.rubyonrails.org/stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
 	<style type="text/css">
 		div#container {
 	max-width: 900px;
@@ -189,7 +189,7 @@ ul#navMain {
 
 		<ul id="navMain">
 			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="http://manuals.rubyonrails.org/" title="Manuals Index">Manuals Index</a></li>
+			<li><a class="manuals" href="http://guides.rubyonrails.org/" title="Manuals Index">Guides Index</a></li>
 		</ul>
 	</div>
 
diff --git a/railties/doc/guides/html/security.html b/railties/doc/guides/html/security.html
index b13a8a5cd4..031e1d52db 100644
--- a/railties/doc/guides/html/security.html
+++ b/railties/doc/guides/html/security.html
@@ -6,9 +6,9 @@
 	<!--[if lt IE 8]>
 	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
 	<![endif]-->
-	<link href="http://manuals.rubyonrails.org/stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
 	<style type="text/css">
 		div#container {
 	max-width: 900px;
@@ -189,7 +189,7 @@ ul#navMain {
 
 		<ul id="navMain">
 			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="http://manuals.rubyonrails.org/" title="Manuals Index">Manuals Index</a></li>
+			<li><a class="manuals" href="http://guides.rubyonrails.org/" title="Manuals Index">Guides Index</a></li>
 		</ul>
 	</div>
 
diff --git a/railties/doc/guides/html/testing_rails_applications.html b/railties/doc/guides/html/testing_rails_applications.html
index 0e90ea8a68..e4f125ef11 100644
--- a/railties/doc/guides/html/testing_rails_applications.html
+++ b/railties/doc/guides/html/testing_rails_applications.html
@@ -6,9 +6,9 @@
 	<!--[if lt IE 8]>
 	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
 	<![endif]-->
-	<link href="http://manuals.rubyonrails.org/stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="http://manuals.rubyonrails.org/stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
+	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
 	<style type="text/css">
 		div#container {
 	max-width: 900px;
@@ -189,7 +189,7 @@ ul#navMain {
 
 		<ul id="navMain">
 			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="http://manuals.rubyonrails.org/" title="Manuals Index">Manuals Index</a></li>
+			<li><a class="manuals" href="http://guides.rubyonrails.org/" title="Manuals Index">Guides Index</a></li>
 		</ul>
 	</div>