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

8 files changed, 320 insertions, 320 deletions

diff --git a/railties/guides/files/javascripts/code_highlighter.js b/railties/guides/files/javascripts/code_highlighter.js
index 4ed72e1692..ce983dad52 100755
--- a/railties/guides/files/javascripts/code_highlighter.js
+++ b/railties/guides/files/javascripts/code_highlighter.js
@@ -1,188 +1,188 @@
-/* Unobtrustive Code Highlighter By Dan Webb 11/2005

-   Version: 0.4

-	

-	Usage:

-		Add a script tag for this script and any stylesets you need to use

-		to the page in question, add correct class names to CODE elements, 

-		define CSS styles for elements. That's it! 

-	

-	Known to work on:

-		IE 5.5+ PC

-		Firefox/Mozilla PC/Mac

-		Opera 7.23 + PC

-		Safari 2

-		

-	Known to degrade gracefully on:

-		IE5.0 PC

-	

-	Note: IE5.0 fails due to the use of lookahead in some stylesets.  To avoid script errors

-	in older browsers use expressions that use lookahead in string format when defining stylesets.

-	

-	This script is inspired by star-light by entirely cunning Dean Edwards

-	http://dean.edwards.name/star-light/.  

-*/

-

-// replace callback support for safari.

-if ("a".replace(/a/, function() {return "b"}) != "b") (function(){

-  var default_replace = String.prototype.replace;

-  String.prototype.replace = function(search,replace){

-	// replace is not function

-	if(typeof replace != "function"){

-		return default_replace.apply(this,arguments)

-	}

-	var str = "" + this;

-	var callback = replace;

-	// search string is not RegExp

-	if(!(search instanceof RegExp)){

-		var idx = str.indexOf(search);

-		return (

-			idx == -1 ? str :

-			default_replace.apply(str,[search,callback(search, idx, str)])

-		)

-	}

-	var reg = search;

-	var result = [];

-	var lastidx = reg.lastIndex;

-	var re;

-	while((re = reg.exec(str)) != null){

-		var idx  = re.index;

-		var args = re.concat(idx, str);

-		result.push(

-			str.slice(lastidx,idx),

-			callback.apply(null,args).toString()

-		);

-		if(!reg.global){

-			lastidx += RegExp.lastMatch.length;

-			break

-		}else{

-			lastidx = reg.lastIndex;

-		}

-	}

-	result.push(str.slice(lastidx));

-	return result.join("")

-  }

-})();

-

-var CodeHighlighter = { styleSets : new Array };

-

-CodeHighlighter.addStyle = function(name, rules) {

-	// using push test to disallow older browsers from adding styleSets

-	if ([].push) this.styleSets.push({

-		name : name, 

-		rules : rules,

-		ignoreCase : arguments[2] || false

-	})

-	

-	function setEvent() {

-		// set highlighter to run on load (use LowPro if present)

-		if (typeof Event != 'undefined' && typeof Event.onReady == 'function') 

-		  return Event.onReady(CodeHighlighter.init.bind(CodeHighlighter));

-		

-		var old = window.onload;

-		

-		if (typeof window.onload != 'function') {

-			window.onload = function() { CodeHighlighter.init() };

-		} else {

-			window.onload = function() {

-				old();

-				CodeHighlighter.init();

-			}

-		}

-	}

-	

-	// only set the event when the first style is added

-	if (this.styleSets.length==1) setEvent();

-}

-

-CodeHighlighter.init = function() {

-	if (!document.getElementsByTagName) return; 

-	if ("a".replace(/a/, function() {return "b"}) != "b") return; // throw out Safari versions that don't support replace function

-	// throw out older browsers

-	

-	var codeEls = document.getElementsByTagName("CODE");

-	// collect array of all pre elements

-	codeEls.filter = function(f) {

-		var a =  new Array;

-		for (var i = 0; i < this.length; i++) if (f(this[i])) a[a.length] = this[i];

-		return a;

-	} 

-	

-	var rules = new Array;

-	rules.toString = function() {

-		// joins regexes into one big parallel regex

-		var exps = new Array;

-		for (var i = 0; i < this.length; i++) exps.push(this[i].exp);

-		return exps.join("|");

-	}

-	

-	function addRule(className, rule) {

-		// add a replace rule

-		var exp = (typeof rule.exp != "string")?String(rule.exp).substr(1, String(rule.exp).length-2):rule.exp;

-		// converts regex rules to strings and chops of the slashes

-		rules.push({

-			className : className,

-			exp : "(" + exp + ")",

-			length : (exp.match(/(^|[^\\])\([^?]/g) || "").length + 1, // number of subexps in rule

-			replacement : rule.replacement || null 

-		});

-	}

-	

-	function parse(text, ignoreCase) {

-		// main text parsing and replacement

-		return text.replace(new RegExp(rules, (ignoreCase)?"gi":"g"), function() {

-			var i = 0, j = 1, rule;

-			while (rule = rules[i++]) {

-				if (arguments[j]) {

-					// if no custom replacement defined do the simple replacement

-					if (!rule.replacement) return "<span class=\"" + rule.className + "\">" + arguments[0] + "</span>";

-					else {

-						// replace $0 with the className then do normal replaces

-						var str = rule.replacement.replace("$0", rule.className);

-						for (var k = 1; k <= rule.length - 1; k++) str = str.replace("$" + k, arguments[j + k]);

-						return str;

-					}

-				} else j+= rule.length;

-			}

-		});

-	}

-	

-	function highlightCode(styleSet) {

-		// clear rules array

-		var parsed, clsRx = new RegExp("(\\s|^)" + styleSet.name + "(\\s|$)");

-		rules.length = 0;

-		

-		// get stylable elements by filtering out all code elements without the correct className	

-		var stylableEls = codeEls.filter(function(item) { return clsRx.test(item.className) });

-		

-		// add style rules to parser

-		for (var className in styleSet.rules) addRule(className, styleSet.rules[className]);

-		

-			

-		// replace for all elements

-		for (var i = 0; i < stylableEls.length; i++) {

-			// EVIL hack to fix IE whitespace badness if it's inside a <pre>

-			if (/MSIE/.test(navigator.appVersion) && stylableEls[i].parentNode.nodeName == 'PRE') {

-				stylableEls[i] = stylableEls[i].parentNode;

-				

-				parsed = stylableEls[i].innerHTML.replace(/(<code[^>]*>)([^<]*)<\/code>/i, function() {

-					return arguments[1] + parse(arguments[2], styleSet.ignoreCase) + "</code>"

-				});

-				parsed = parsed.replace(/\n( *)/g, function() { 

-					var spaces = "";

-					for (var i = 0; i < arguments[1].length; i++) spaces+= "&nbsp;";

-					return "\n" + spaces;  

-				});

-				parsed = parsed.replace(/\t/g, "&nbsp;&nbsp;&nbsp;&nbsp;");

-				parsed = parsed.replace(/\n(<\/\w+>)?/g, "<br />$1").replace(/<br \/>[\n\r\s]*<br \/>/g, "<p><br></p>");

-				

-			} else parsed = parse(stylableEls[i].innerHTML, styleSet.ignoreCase);

-			

-			stylableEls[i].innerHTML = parsed;

-		}

-	}

-	

-	// run highlighter on all stylesets

-	for (var i=0; i < this.styleSets.length; i++) {

-		highlightCode(this.styleSets[i]);  

-	}

-}
\ No newline at end of file
+/* Unobtrustive Code Highlighter By Dan Webb 11/2005
+   Version: 0.4
+
+	Usage:
+		Add a script tag for this script and any stylesets you need to use
+		to the page in question, add correct class names to CODE elements,
+		define CSS styles for elements. That's it!
+
+	Known to work on:
+		IE 5.5+ PC
+		Firefox/Mozilla PC/Mac
+		Opera 7.23 + PC
+		Safari 2
+
+	Known to degrade gracefully on:
+		IE5.0 PC
+
+	Note: IE5.0 fails due to the use of lookahead in some stylesets.  To avoid script errors
+	in older browsers use expressions that use lookahead in string format when defining stylesets.
+
+	This script is inspired by star-light by entirely cunning Dean Edwards
+	http://dean.edwards.name/star-light/.
+*/
+
+// replace callback support for safari.
+if ("a".replace(/a/, function() {return "b"}) != "b") (function(){
+  var default_replace = String.prototype.replace;
+  String.prototype.replace = function(search,replace){
+	// replace is not function
+	if(typeof replace != "function"){
+		return default_replace.apply(this,arguments)
+	}
+	var str = "" + this;
+	var callback = replace;
+	// search string is not RegExp
+	if(!(search instanceof RegExp)){
+		var idx = str.indexOf(search);
+		return (
+			idx == -1 ? str :
+			default_replace.apply(str,[search,callback(search, idx, str)])
+		)
+	}
+	var reg = search;
+	var result = [];
+	var lastidx = reg.lastIndex;
+	var re;
+	while((re = reg.exec(str)) != null){
+		var idx  = re.index;
+		var args = re.concat(idx, str);
+		result.push(
+			str.slice(lastidx,idx),
+			callback.apply(null,args).toString()
+		);
+		if(!reg.global){
+			lastidx += RegExp.lastMatch.length;
+			break
+		}else{
+			lastidx = reg.lastIndex;
+		}
+	}
+	result.push(str.slice(lastidx));
+	return result.join("")
+  }
+})();
+
+var CodeHighlighter = { styleSets : new Array };
+
+CodeHighlighter.addStyle = function(name, rules) {
+	// using push test to disallow older browsers from adding styleSets
+	if ([].push) this.styleSets.push({
+		name : name,
+		rules : rules,
+		ignoreCase : arguments[2] || false
+	})
+
+	function setEvent() {
+		// set highlighter to run on load (use LowPro if present)
+		if (typeof Event != 'undefined' && typeof Event.onReady == 'function')
+		  return Event.onReady(CodeHighlighter.init.bind(CodeHighlighter));
+
+		var old = window.onload;
+
+		if (typeof window.onload != 'function') {
+			window.onload = function() { CodeHighlighter.init() };
+		} else {
+			window.onload = function() {
+				old();
+				CodeHighlighter.init();
+			}
+		}
+	}
+
+	// only set the event when the first style is added
+	if (this.styleSets.length==1) setEvent();
+}
+
+CodeHighlighter.init = function() {
+	if (!document.getElementsByTagName) return;
+	if ("a".replace(/a/, function() {return "b"}) != "b") return; // throw out Safari versions that don't support replace function
+	// throw out older browsers
+
+	var codeEls = document.getElementsByTagName("CODE");
+	// collect array of all pre elements
+	codeEls.filter = function(f) {
+		var a =  new Array;
+		for (var i = 0; i < this.length; i++) if (f(this[i])) a[a.length] = this[i];
+		return a;
+	}
+
+	var rules = new Array;
+	rules.toString = function() {
+		// joins regexes into one big parallel regex
+		var exps = new Array;
+		for (var i = 0; i < this.length; i++) exps.push(this[i].exp);
+		return exps.join("|");
+	}
+
+	function addRule(className, rule) {
+		// add a replace rule
+		var exp = (typeof rule.exp != "string")?String(rule.exp).substr(1, String(rule.exp).length-2):rule.exp;
+		// converts regex rules to strings and chops of the slashes
+		rules.push({
+			className : className,
+			exp : "(" + exp + ")",
+			length : (exp.match(/(^|[^\\])\([^?]/g) || "").length + 1, // number of subexps in rule
+			replacement : rule.replacement || null
+		});
+	}
+
+	function parse(text, ignoreCase) {
+		// main text parsing and replacement
+		return text.replace(new RegExp(rules, (ignoreCase)?"gi":"g"), function() {
+			var i = 0, j = 1, rule;
+			while (rule = rules[i++]) {
+				if (arguments[j]) {
+					// if no custom replacement defined do the simple replacement
+					if (!rule.replacement) return "<span class=\"" + rule.className + "\">" + arguments[0] + "</span>";
+					else {
+						// replace $0 with the className then do normal replaces
+						var str = rule.replacement.replace("$0", rule.className);
+						for (var k = 1; k <= rule.length - 1; k++) str = str.replace("$" + k, arguments[j + k]);
+						return str;
+					}
+				} else j+= rule.length;
+			}
+		});
+	}
+
+	function highlightCode(styleSet) {
+		// clear rules array
+		var parsed, clsRx = new RegExp("(\\s|^)" + styleSet.name + "(\\s|$)");
+		rules.length = 0;
+
+		// get stylable elements by filtering out all code elements without the correct className
+		var stylableEls = codeEls.filter(function(item) { return clsRx.test(item.className) });
+
+		// add style rules to parser
+		for (var className in styleSet.rules) addRule(className, styleSet.rules[className]);
+
+
+		// replace for all elements
+		for (var i = 0; i < stylableEls.length; i++) {
+			// EVIL hack to fix IE whitespace badness if it's inside a <pre>
+			if (/MSIE/.test(navigator.appVersion) && stylableEls[i].parentNode.nodeName == 'PRE') {
+				stylableEls[i] = stylableEls[i].parentNode;
+
+				parsed = stylableEls[i].innerHTML.replace(/(<code[^>]*>)([^<]*)<\/code>/i, function() {
+					return arguments[1] + parse(arguments[2], styleSet.ignoreCase) + "</code>"
+				});
+				parsed = parsed.replace(/\n( *)/g, function() {
+					var spaces = "";
+					for (var i = 0; i < arguments[1].length; i++) spaces+= "&nbsp;";
+					return "\n" + spaces;
+				});
+				parsed = parsed.replace(/\t/g, "&nbsp;&nbsp;&nbsp;&nbsp;");
+				parsed = parsed.replace(/\n(<\/\w+>)?/g, "<br />$1").replace(/<br \/>[\n\r\s]*<br \/>/g, "<p><br></p>");
+
+			} else parsed = parse(stylableEls[i].innerHTML, styleSet.ignoreCase);
+
+			stylableEls[i].innerHTML = parsed;
+		}
+	}
+
+	// run highlighter on all stylesets
+	for (var i=0; i < this.styleSets.length; i++) {
+		highlightCode(this.styleSets[i]);
+	}
+}
diff --git a/railties/guides/files/javascripts/guides.js b/railties/guides/files/javascripts/guides.js
index 63c127d04a..81fc07e799 100755
--- a/railties/guides/files/javascripts/guides.js
+++ b/railties/guides/files/javascripts/guides.js
@@ -1,8 +1,8 @@
-function guideMenu(){

-  

-  if (document.getElementById('guides').style.display == "none") {

-    document.getElementById('guides').style.display = "block";

-  } else {

-    document.getElementById('guides').style.display = "none";

-  }

-}

+function guideMenu(){
+
+  if (document.getElementById('guides').style.display == "none") {
+    document.getElementById('guides').style.display = "block";
+  } else {
+    document.getElementById('guides').style.display = "none";
+  }
+}
diff --git a/railties/guides/files/javascripts/highlighters.js b/railties/guides/files/javascripts/highlighters.js
index bf46367dfe..4f5f0779d7 100644
--- a/railties/guides/files/javascripts/highlighters.js
+++ b/railties/guides/files/javascripts/highlighters.js
@@ -47,14 +47,14 @@ CodeHighlighter.addStyle("html", {
 		exp: /&lt;!\s*(--([^-]|[\r\n]|-[^-])*--\s*)&gt;/
 	},
 	tag : {
-		exp: /(&lt;\/?)([a-zA-Z1-9]+\s?)/, 
+		exp: /(&lt;\/?)([a-zA-Z1-9]+\s?)/,
 		replacement: "$1<span class=\"$0\">$2</span>"
 	},
 	string : {
 		exp  : /'[^']*'|"[^"]*"/
 	},
 	attribute : {
-		exp: /\b([a-zA-Z-:]+)(=)/, 
+		exp: /\b([a-zA-Z-:]+)(=)/,
 		replacement: "<span class=\"$0\">$1</span>$2"
 	},
 	doctype : {
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;
+}