Skip to content

Commit a17fc20

Browse files
committed
Fix a typo
1 parent f8079b8 commit a17fc20

File tree

2 files changed

+35
-35
lines changed

2 files changed

+35
-35
lines changed

railties/doc/guides/html/2_2_release_notes.html

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ <h2>Chapters</h2>
230230
<li><a href="#_new_dynamic_finders">New Dynamic Finders</a></li>
231231

232232
<li><a href="#_associations_respect_private_protected_scope">Associations Respect Private/Protected Scope</a></li>
233-
233+
234234
<li><a href="#_other_activerecord_changes">Other ActiveRecord Changes</a></li>
235235

236236
</ul>
@@ -504,11 +504,11 @@ <h2 id="_thread_safety">4. Thread Safety</h2>
504504
<div class="ilist"><ul>
505505
<li>
506506
<p>
507-
<a href="http://m.onkey.org/2008/10/23/thread-safety-for-your-rails">Thread safety for your Rails</a>
508-
</p>
509-
</li>
510-
<li>
511-
<p>
507+
<a href="http://m.onkey.org/2008/10/23/thread-safety-for-your-rails">Thread safety for your Rails</a>
508+
</p>
509+
</li>
510+
<li>
511+
<p>
512512
<a href="http://weblog.rubyonrails.org/2008/8/16/josh-peek-officially-joins-the-rails-core">Thread safety project announcement</a>
513513
</p>
514514
</li>
@@ -647,16 +647,16 @@ <h4 id="_find_by_lt_attributes_gt">5.4.2. find_by_&lt;attributes&gt;!</h4>
647647
</p>
648648
</li>
649649
</ul></div>
650-
<h3 id="_associations_respect_private_protected_scope">5.5. Associations Respect Private/Protected Scope</h3>
651-
<div class="para"><p>Active Record association proxies now respect the scope of methods on the proxied object. Previously (given User has_one :account) <tt>@user.account.private_method</tt> would call the private method on the associated Account object. That fails in Rails 2.2; if you need this functionality, you should use <tt>@user.account.send(:private_method)</tt> (or make the method public instead of private or protected). Please note that if you're overriding <tt>method_missing</tt>, you should also override <tt>respond_to</tt> to match the behavior in order for associations to function normally.</p></div>
652-
<div class="ilist"><ul>
653-
<li>
654-
<p>
655-
Lead Contributor: Adam Milligan
656-
</p>
657-
</li>
658-
</ul></div>
659-
<h3 id="_other_activerecord_changes">5.6. Other ActiveRecord Changes</h3>
650+
<h3 id="_associations_respect_private_protected_scope">5.5. Associations Respect Private/Protected Scope</h3>
651+
<div class="para"><p>Active Record association proxies now respect the scope of methods on the proxied object. Previously (given User has_one :account) <tt>@user.account.private_method</tt> would call the private method on the associated Account object. That fails in Rails 2.2; if you need this functionality, you should use <tt>@user.account.send(:private_method)</tt> (or make the method public instead of private or protected). Please note that if you're overriding <tt>method_missing</tt>, you should also override <tt>respond_to</tt> to match the behavior in order for associations to function normally.</p></div>
652+
<div class="ilist"><ul>
653+
<li>
654+
<p>
655+
Lead Contributor: Adam Milligan
656+
</p>
657+
</li>
658+
</ul></div>
659+
<h3 id="_other_activerecord_changes">5.6. Other ActiveRecord Changes</h3>
660660
<div class="ilist"><ul>
661661
<li>
662662
<p>
@@ -1061,24 +1061,24 @@ <h2 id="_deprecated">11. Deprecated</h2>
10611061
</li>
10621062
<li>
10631063
<p>
1064-
Implicit local assignments when rendering partials has been deprecated.
1065-
</p>
1066-
</li>
1067-
</ul></div>
1068-
<div class="listingblock">
1069-
<div class="content"><!-- Generator: GNU source-highlight 2.9
1070-
by Lorenzo Bettini
1071-
http://www.lorenzobettini.it
1072-
http://www.gnu.org/software/src-highlite -->
1073-
<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> partial_with_implicit_local_assignment
1074-
<span style="color: #009900">@customer</span> <span style="color: #990000">=</span> Customer<span style="color: #990000">.</span>new<span style="color: #990000">(</span><span style="color: #FF0000">"Marcel"</span><span style="color: #990000">)</span>
1075-
render <span style="color: #990000">:</span>partial <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"customer"</span>
1076-
<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
1077-
</tt></pre></div></div>
1078-
<div class="para"><p>Previously the above code made available a local variable called <tt>customer</tt> available inside the partial <em>customer</em>. You should explicitly pass all the variables via :locals hash now.</p></div>
1079-
<div class="ilist"><ul>
1080-
<li>
1081-
<p>
1064+
Implicit local assignments when rendering partials has been deprecated.
1065+
</p>
1066+
</li>
1067+
</ul></div>
1068+
<div class="listingblock">
1069+
<div class="content"><!-- Generator: GNU source-highlight 2.9
1070+
by Lorenzo Bettini
1071+
http://www.lorenzobettini.it
1072+
http://www.gnu.org/software/src-highlite -->
1073+
<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> partial_with_implicit_local_assignment
1074+
<span style="color: #009900">@customer</span> <span style="color: #990000">=</span> Customer<span style="color: #990000">.</span>new<span style="color: #990000">(</span><span style="color: #FF0000">"Marcel"</span><span style="color: #990000">)</span>
1075+
render <span style="color: #990000">:</span>partial <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"customer"</span>
1076+
<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
1077+
</tt></pre></div></div>
1078+
<div class="para"><p>Previously the above code made available a local variable called <tt>customer</tt> inside the partial <em>customer</em>. You should explicitly pass all the variables via :locals hash now.</p></div>
1079+
<div class="ilist"><ul>
1080+
<li>
1081+
<p>
10821082
<tt>country_select</tt> has been removed. See the <a href="http://www.rubyonrails.org/deprecation/list-of-countries">deprecation page</a> for more information and a plugin replacement.
10831083
</p>
10841084
</li>

railties/doc/guides/source/2_2_release_notes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ def partial_with_implicit_local_assignment
401401
end
402402
-------------------------------------------------------
403403

404-
Previously the above code made available a local variable called +customer+ available inside the partial 'customer'. You should explicitly pass all the variables via :locals hash now.
404+
Previously the above code made available a local variable called +customer+ inside the partial 'customer'. You should explicitly pass all the variables via :locals hash now.
405405

406406
* +country_select+ has been removed. See the link:http://www.rubyonrails.org/deprecation/list-of-countries[deprecation page] for more information and a plugin replacement.
407407
* +ActiveRecord::Base.allow_concurrency+ no longer has any effect.

0 commit comments

Comments
 (0)