From 70d2d2ced44941162e13cb66125482ebf9097ff4 Mon Sep 17 00:00:00 2001
From: "Aldo \"xoen\" Giambelluca" <xoen@xoen.org>
Date: Sun, 2 Sep 2012 13:59:45 +0200
Subject: Fixed validation issue in Upgrading Ruby on Rails guide [ci skip]

In chapter 2.4 there was an underscore at the start of the attr_readonly method name,
this underscore was interpreted as the opening of the <em> tag but it wasn't closed.

Worst, the underscore in self.class.serialized_attributes (end of paragraph)
was interpreted as the closing of the <em> tag and not as the name of a method.
---
 guides/source/upgrading_ruby_on_rails.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'guides/source/upgrading_ruby_on_rails.textile')

diff --git a/guides/source/upgrading_ruby_on_rails.textile b/guides/source/upgrading_ruby_on_rails.textile
index cdf7306264..d66e6a155b 100644
--- a/guides/source/upgrading_ruby_on_rails.textile
+++ b/guides/source/upgrading_ruby_on_rails.textile
@@ -44,7 +44,7 @@ The <tt>delete</tt> method in collection associations can now receive <tt>Fixnum
 
 Rails 4.0 has changed how orders get stacked in +ActiveRecord::Relation+. In previous versions of rails new order was applied after previous defined order. But this is no long true. Check "ActiveRecord Query guide":active_record_querying.html#ordering for more information.
 
-Rails 4.0 has changed <tt>serialized_attributes</tt> and <tt>_attr_readonly</tt> to class methods only. Now you shouldn't use instance methods, it's deprecated. You must change them, e.g. <tt>self.serialized_attributes</tt> to <tt>self.class.serialized_attributes</tt>.
+Rails 4.0 has changed <tt>serialized_attributes</tt> and <tt>attr_readonly</tt> to class methods only. Now you shouldn't use instance methods, it's deprecated. You must change them, e.g. <tt>self.serialized_attributes</tt> to <tt>self.class.serialized_attributes</tt>.
 
 h4(#active_model4_0). Active Model
 
-- 
cgit v1.2.3


From c38fe906c06993a641a9ec989e2bd9140b0c88c3 Mon Sep 17 00:00:00 2001
From: "Aldo \"xoen\" Giambelluca" <xoen@xoen.org>
Date: Sun, 2 Sep 2012 18:42:29 +0200
Subject: Underscore in _attr_readonly method name is back (Upgrading RoR
 guide) [ci skip]

---
 guides/source/upgrading_ruby_on_rails.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'guides/source/upgrading_ruby_on_rails.textile')

diff --git a/guides/source/upgrading_ruby_on_rails.textile b/guides/source/upgrading_ruby_on_rails.textile
index d66e6a155b..52c582ffbc 100644
--- a/guides/source/upgrading_ruby_on_rails.textile
+++ b/guides/source/upgrading_ruby_on_rails.textile
@@ -44,7 +44,7 @@ The <tt>delete</tt> method in collection associations can now receive <tt>Fixnum
 
 Rails 4.0 has changed how orders get stacked in +ActiveRecord::Relation+. In previous versions of rails new order was applied after previous defined order. But this is no long true. Check "ActiveRecord Query guide":active_record_querying.html#ordering for more information.
 
-Rails 4.0 has changed <tt>serialized_attributes</tt> and <tt>attr_readonly</tt> to class methods only. Now you shouldn't use instance methods, it's deprecated. You must change them, e.g. <tt>self.serialized_attributes</tt> to <tt>self.class.serialized_attributes</tt>.
+Rails 4.0 has changed <tt>serialized_attributes</tt> and <tt>&#95;attr_readonly</tt> to class methods only. Now you shouldn't use instance methods, it's deprecated. You must change them, e.g. <tt>self.serialized_attributes</tt> to <tt>self.class.serialized_attributes</tt>.
 
 h4(#active_model4_0). Active Model
 
-- 
cgit v1.2.3

