Update guides and release notes

1 files changed, 15 insertions, 4 deletions

diff --git a/railties/doc/guides/html/2_2_release_notes.html b/railties/doc/guides/html/2_2_release_notes.html
index c657be20b4..d21905f715 100644
--- a/railties/doc/guides/html/2_2_release_notes.html
+++ b/railties/doc/guides/html/2_2_release_notes.html
@@ -586,16 +586,15 @@ by Lorenzo Bettini
 http://www.lorenzobettini.it

 http://www.gnu.org/software/src-highlite -->

 <pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Photo <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base

-  belongs_to <span style="color: #990000">:</span>Product

+  belongs_to <span style="color: #990000">:</span>product

 <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>

 

 <span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Product <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base

-  has_many <span style="color: #990000">:</span>products

+  has_many <span style="color: #990000">:</span>photos

 <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>

 

 <span style="font-style: italic"><span style="color: #9A1900"># Get all products with copyright-free photos:</span></span>

-Product<span style="color: #990000">.</span>find<span style="color: #990000">(:</span>all<span style="color: #990000">,</span> <span style="color: #990000">:</span>joins <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>photo<span style="color: #990000">,</span>

-  <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>photos <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>copyright <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">false</span></span> <span style="color: #FF0000">}}</span><span style="color: #990000">)</span>

+Product<span style="color: #990000">.</span>all<span style="color: #990000">(:</span>joins <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>photos <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>copyright <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">false</span></span> <span style="color: #FF0000">}}</span><span style="color: #990000">)</span>

 </tt></pre></div></div>

 <div class="ilist"><ul>

 <li>

@@ -655,6 +654,18 @@ Lead Contributor: <a href="http://blog.hasmanythrough.com">Josh Susser</a>
 Lead Contributor: Adam Milligan

 </p>

 </li>

+<li>

+<p>

+More information:

+</p>

+<div class="ilist"><ul>

+<li>

+<p>

+<a href="http://afreshcup.com/2008/10/24/rails-22-change-private-methods-on-association-proxies-are-private/">Rails 2.2 Change: Private Methods on Association Proxies are Private</a>

+</p>

+</li>

+</ul></div>

+</li>

 </ul></div>

 <h3 id="_other_activerecord_changes">5.6. Other ActiveRecord Changes</h3>

 <div class="ilist"><ul>