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

1 files changed, 2 insertions, 2 deletions

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: /<!\s*(--([^-]|[\r\n]|-[^-])*--\s*)>/
 	},
 	tag : {
-		exp: /(<\/?)([a-zA-Z1-9]+\s?)/, 
+		exp: /(<\/?)([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 : {