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, 14 insertions, 14 deletions

diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile
index 5157e62788..9c56691dc1 100644
--- a/railties/guides/source/action_mailer_basics.textile
+++ b/railties/guides/source/action_mailer_basics.textile
@@ -184,7 +184,7 @@ class UserMailer < ActionMailer::Base
     sent_on       Time.now
     body          {:user => user, :url => "http://example.com/login"}
     content_type  "text/html"
-    
+
     # change the default from welcome_email.[html, txt].erb
     template "some_other_template" # this will be in app/views/user_mailer/some_other_template.[html, txt].erb
   end
@@ -254,15 +254,15 @@ class UserMailer < ActionMailer::Base
     subject         "New account information"
     from            "system@example.com"
     content_type    "multipart/alternative"
-    
+
     part :content_type => "text/html",
       :body => "<p>html content, can also be the name of an action that you call<p>"
-    
+
     part "text/plain" do |p|
       p.body = "text content, can also be the name of an action that you call"
     end
   end
-  
+
 end
 </ruby>
 
@@ -278,15 +278,15 @@ class UserMailer < ActionMailer::Base
     subject         "New account information"
     from            "system@example.com"
     content_type    "multipart/alternative"
-    
+
     attachment :content_type => "image/jpeg",
       :body => File.read("an-image.jpg")
-    
+
     attachment "application/pdf" do |a|
       a.body = generate_your_pdf_here()
     end
   end
-  
+
 end
 </ruby>
 
@@ -307,21 +307,21 @@ class UserMailer < ActionMailer::Base
   def receive(email)
     page = Page.find_by_address(email.to.first)
     page.emails.create(
-      :subject => email.subject, 
+      :subject => email.subject,
       :body => email.body
     )
 
     if email.has_attachments?
       for attachment in email.attachments
-        page.attachments.create({ 
-          :file => attachment, 
+        page.attachments.create({
+          :file => attachment,
           :description => email.subject
         })
       end
     end
   end
-  
-  
+
+
 end
 </ruby>
 
@@ -363,8 +363,8 @@ ActionMailer::Base.sendmail_settings = {
   :location => '/usr/sbin/sendmail',
   :arguments => '-i -t'
 }
-ActionMailer::Base.perform_deliveries = true  
-ActionMailer::Base.raise_delivery_errors = true  
+ActionMailer::Base.perform_deliveries = true
+ActionMailer::Base.raise_delivery_errors = true
 ActionMailer::Base.default_charset = "iso-8859-1"
 </ruby>