Merge commit 'mainstream/master'

Conflicts:
	railties/guides/files/javascripts/code_highlighter.js
	railties/guides/files/javascripts/guides.js
	railties/guides/files/javascripts/highlighters.js
	railties/guides/files/stylesheets/main.css
	railties/guides/files/stylesheets/print.css
	railties/guides/files/stylesheets/reset.css
	railties/guides/files/stylesheets/style.css
	railties/guides/files/stylesheets/syntax.css
	railties/guides/rails_guides/indexer.rb
	railties/guides/source/2_2_release_notes.textile
	railties/guides/source/2_3_release_notes.textile
	railties/guides/source/action_controller_overview.textile
	railties/guides/source/action_mailer_basics.textile
	railties/guides/source/active_record_basics.textile
	railties/guides/source/activerecord_validations_callbacks.textile
	railties/guides/source/association_basics.textile
	railties/guides/source/caching_with_rails.textile
	railties/guides/source/command_line.textile
	railties/guides/source/debugging_rails_applications.textile
	railties/guides/source/form_helpers.textile
	railties/guides/source/getting_started.textile
	railties/guides/source/i18n.textile
	railties/guides/source/layout.html.erb
	railties/guides/source/layouts_and_rendering.textile
	railties/guides/source/migrations.textile
	railties/guides/source/performance_testing.textile
	railties/guides/source/plugins.textile
	railties/guides/source/rails_on_rack.textile
	railties/guides/source/routing.textile
	railties/guides/source/security.textile
	railties/guides/source/testing.textile

5 files changed, 122 insertions, 122 deletions

diff --git a/railties/guides/files/stylesheets/main.css b/railties/guides/files/stylesheets/main.css
index 9c9ef5151b..64243be945 100644
--- a/railties/guides/files/stylesheets/main.css
+++ b/railties/guides/files/stylesheets/main.css
@@ -22,7 +22,7 @@ ol { list-style-type: decimal; }
 dl { margin: 0 0 1.5em 0; }
 dl dt { font-weight: bold; }
 dd { margin-left: 1.5em;}
-  
+
 pre,code { margin: 1.5em 0; white-space: pre; }
 pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height: 1.5; }
 
@@ -86,7 +86,7 @@ body {
   font-family: Helvetica, Arial, sans-serif;
   font-size: 87.5%;
   line-height: 1.5em;
-  background: #222; 
+  background: #222;
   color: #999;
   }
 
@@ -124,7 +124,7 @@ body {
 #mainCol {
   width: 45em;
   margin-left: 2em;
-  } 
+  }
 
 #subCol {
   position: absolute;
@@ -137,7 +137,7 @@ body {
   font-size: 0.9285em;
   line-height: 1.3846em;
   }
-  
+
 #extraCol {display: none;}
 
 #footer {
@@ -190,7 +190,7 @@ a, a:link, a:visited {
 
 #header .nav .index a {
   background: #980905 url(../../images/nav_arrow.gif) no-repeat right top;
-  padding-right: 1em; 
+  padding-right: 1em;
   position: relative;
   z-index: 15;
   padding-bottom: 0.125em;
@@ -256,7 +256,7 @@ h3 {
   margin: 0.875em 0 0.2916em;
   font-weight: bold;
   }
-  
+
 h4 {
   font-size: 1.2857em;
   line-height: 1.2em;
@@ -271,7 +271,7 @@ h5 {
   font-weight: bold;
 }
 
-h6 {  
+h6 {
   font-size: 1em;
   line-height: 1.5em;
   margin: 1em 0 .5em;
@@ -418,15 +418,15 @@ em.highlight {
   padding-left: 1em;
   margin-left: 0;
 }
-  
+
 /* Clearing
 --------------------------------------- */
 
 .clearfix:after {
-    content: "."; 
-    display: block; 
-    height: 0; 
-    clear: both; 
+    content: ".";
+    display: block;
+    height: 0;
+    clear: both;
     visibility: hidden;
 }
 
diff --git a/railties/guides/files/stylesheets/print.css b/railties/guides/files/stylesheets/print.css
index 6aa1662c0b..628da105d4 100755
--- a/railties/guides/files/stylesheets/print.css
+++ b/railties/guides/files/stylesheets/print.css
@@ -1,52 +1,52 @@
-/* Guides.rubyonrails.org */

-/* Print.css */

-/* Created January 30, 2009 */

-/* Modified January 31, 2009

---------------------------------------- */

-

-body, .wrapper, .note, .info, code, #topNav, .L, .R, #frame, #container, #header, #navigation, #footer, #feature, #mainCol, #subCol, #extraCol, .content {position: static; text-align: left; text-indent: 0; background: White; color: Black; border-color: Black; width: auto; height: auto; display: block; float: none; min-height: 0; margin: 0; padding: 0;}

-

-body {

-  background: #FFF;

-  font-size: 10pt !important;

-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; 

-  line-height: 1.5;

-  color: #000;

-  padding: 0 3%;

-  }

-

-.hide, .nav {

-  display: none !important;

-  }

-

-a:link, a:visited {

-  background: transparent;

-  font-weight: bold;

-  text-decoration: underline;

-  }

-

-hr { 

-  background:#ccc; 

-  color:#ccc;

-  width:100%;

-  height:2px;

-  margin:2em 0;

-  padding:0;

-  border:none;

-}

-

-h1,h2,h3,h4,h5,h6 { font-family: "Helvetica Neue", Arial, "Lucida Grande", sans-serif; }

-code { font:.9em "Courier New", Monaco, Courier, monospace; } 

-

-img { float:left; margin:1.5em 1.5em 1.5em 0; }

-a img { border:none; }

-

-blockquote {

-  margin:1.5em;

-  padding:1em;

-  font-style:italic;

-  font-size:.9em;

-}

-

-.small  { font-size: .9em; }

-.large  { font-size: 1.1em; }
\ No newline at end of file
+/* Guides.rubyonrails.org */
+/* Print.css */
+/* Created January 30, 2009 */
+/* Modified January 31, 2009
+--------------------------------------- */
+
+body, .wrapper, .note, .info, code, #topNav, .L, .R, #frame, #container, #header, #navigation, #footer, #feature, #mainCol, #subCol, #extraCol, .content {position: static; text-align: left; text-indent: 0; background: White; color: Black; border-color: Black; width: auto; height: auto; display: block; float: none; min-height: 0; margin: 0; padding: 0;}
+
+body {
+  background: #FFF;
+  font-size: 10pt !important;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  line-height: 1.5;
+  color: #000;
+  padding: 0 3%;
+  }
+
+.hide, .nav {
+  display: none !important;
+  }
+
+a:link, a:visited {
+  background: transparent;
+  font-weight: bold;
+  text-decoration: underline;
+  }
+
+hr {
+  background:#ccc;
+  color:#ccc;
+  width:100%;
+  height:2px;
+  margin:2em 0;
+  padding:0;
+  border:none;
+}
+
+h1,h2,h3,h4,h5,h6 { font-family: "Helvetica Neue", Arial, "Lucida Grande", sans-serif; }
+code { font:.9em "Courier New", Monaco, Courier, monospace; }
+
+img { float:left; margin:1.5em 1.5em 1.5em 0; }
+a img { border:none; }
+
+blockquote {
+  margin:1.5em;
+  padding:1em;
+  font-style:italic;
+  font-size:.9em;
+}
+
+.small  { font-size: .9em; }
+.large  { font-size: 1.1em; }
diff --git a/railties/guides/files/stylesheets/reset.css b/railties/guides/files/stylesheets/reset.css
index 48c2451cb3..cb14fbcc55 100755
--- a/railties/guides/files/stylesheets/reset.css
+++ b/railties/guides/files/stylesheets/reset.css
@@ -1,43 +1,43 @@
-/* Guides.rubyonrails.org */

-/* Reset.css */

-/* Created January 30, 2009

---------------------------------------- */

-

-html, body, div, span, applet, object, iframe,

-h1, h2, h3, h4, h5, h6, p, blockquote, pre,

-a, abbr, acronym, address, big, cite, code,

-del, dfn, em, font, img, ins, kbd, q, s, samp,

-small, strike, strong, sub, sup, tt, var,

-b, u, i, center,

-dl, dt, dd, ol, ul, li,

-fieldset, form, label, legend,

-table, caption, tbody, tfoot, thead, tr, th, td {

-  margin: 0;

-  padding: 0;

-  border: 0;

-  outline: 0;

-  font-size: 100%;

-  background: transparent;

-}

-

-body {line-height: 1; color: black; background: white;}

-a img {border:none;}

-ins {text-decoration: none;}

-del {text-decoration: line-through;}

-

-:focus {

-  -moz-outline:0;

-  outline:0;

-  outline-offset:0;

-}

-

-/* tables still need 'cellspacing="0"' in the markup */

-table {border-collapse: collapse; border-spacing: 0;}

-caption, th, td {text-align: left; font-weight: normal;}

-

-blockquote, q {quotes: none;}

-blockquote:before, blockquote:after, 

-q:before, q:after {

-  content: '';

-  content: none;

-}
\ No newline at end of file
+/* Guides.rubyonrails.org */
+/* Reset.css */
+/* Created January 30, 2009
+--------------------------------------- */
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  font-size: 100%;
+  background: transparent;
+}
+
+body {line-height: 1; color: black; background: white;}
+a img {border:none;}
+ins {text-decoration: none;}
+del {text-decoration: line-through;}
+
+:focus {
+  -moz-outline:0;
+  outline:0;
+  outline-offset:0;
+}
+
+/* tables still need 'cellspacing="0"' in the markup */
+table {border-collapse: collapse; border-spacing: 0;}
+caption, th, td {text-align: left; font-weight: normal;}
+
+blockquote, q {quotes: none;}
+blockquote:before, blockquote:after,
+q:before, q:after {
+  content: '';
+  content: none;
+}
diff --git a/railties/guides/files/stylesheets/style.css b/railties/guides/files/stylesheets/style.css
index 0249c77e85..89b2ab885a 100755
--- a/railties/guides/files/stylesheets/style.css
+++ b/railties/guides/files/stylesheets/style.css
@@ -1,13 +1,13 @@
-/* Guides.rubyonrails.org */

-/* Style.css */

-/* Created January 30, 2009

---------------------------------------- */

-

-/*

----------------------------------------

-Import advanced style sheet

----------------------------------------

-*/

-

-@import url("reset.css");

-@import url("main.css");

+/* Guides.rubyonrails.org */
+/* Style.css */
+/* Created January 30, 2009
+--------------------------------------- */
+
+/*
+---------------------------------------
+Import advanced style sheet
+---------------------------------------
+*/
+
+@import url("reset.css");
+@import url("main.css");
diff --git a/railties/guides/files/stylesheets/syntax.css b/railties/guides/files/stylesheets/syntax.css
index 7e5b4bd8c7..55fc5b209f 100644
--- a/railties/guides/files/stylesheets/syntax.css
+++ b/railties/guides/files/stylesheets/syntax.css
@@ -27,5 +27,5 @@
 }
 
 .ruby .symbol {
- color: green; 
-}
\ No newline at end of file
+ color: green;
+}