Merge branch 'master' of git@github.com:lifo/docrails

5 files changed, 139 insertions, 41 deletions

diff --git a/railties/doc/guides/html/2_2_release_notes.html b/railties/doc/guides/html/2_2_release_notes.html
index 59e862a3cb..e79f7ec511 100644
--- a/railties/doc/guides/html/2_2_release_notes.html
+++ b/railties/doc/guides/html/2_2_release_notes.html
@@ -243,6 +243,8 @@ ul#navMain {
 						
 							<li><a href="#_method_arrays_for_member_or_collection_routes">Method Arrays for Member or Collection Routes</a></li>
 						
+							<li><a href="#_resources_with_specific_actions">Resources With Specific Actions</a></li>
+						
 							<li><a href="#_other_action_controller_changes">Other Action Controller Changes</a></li>
 						
 						</ul>
@@ -698,7 +700,7 @@ Counter cache columns (for associations declared with <tt>:counter_cache &#8658;
 </div>

 <h2 id="_action_controller">6. Action Controller</h2>

 <div class="sectionbody">

-<div class="para"><p>On the controller side, there are a couple of changes that will help tidy up your routes.</p></div>

+<div class="para"><p>On the controller side, there are several changes that will help tidy up your routes. There are also some internal changes in the routing engine to lower memory usage on complex applications.</p></div>

 <h3 id="_shallow_route_nesting">6.1. Shallow Route Nesting</h3>

 <div class="para"><p>Shallow route nesting provides a solution to the well-known difficulty of using deeply-nested resources. With shallow nesting, you need only supply enough information to uniquely identify the resource that you want to work with.</p></div>

 <div class="listingblock">

@@ -761,8 +763,24 @@ Lead Contributor: <a href="http://brennandunn.com/">Brennan Dunn</a>
 </p>

 </li>

 </ul></div>

-<div class="para"><p>Action Controller now offers good support for HTTP conditional GET requests, as well as some other additions.</p></div>

-<h3 id="_other_action_controller_changes">6.3. Other Action Controller Changes</h3>

+<h3 id="_resources_with_specific_actions">6.3. Resources With Specific Actions</h3>

+<div class="para"><p>By default, when you use <tt>map.resources</tt> to create a route, Rails generates routes for seven default actions (index, show, create, new, edit, update, and destroy). But each of these routes takes up memory in your application, and causes Rails to generate additional routing logic. Now you can use the <tt>:only</tt> and <tt>:except</tt> options to fine-tune the routes that Rails will generate for resources. You can supply a single action, an array of actions, or the special <tt>:all</tt> or <tt>:none</tt> options. These options are inherited by nested resources.</p></div>

+<div class="listingblock">

+<div class="content"><!-- Generator: GNU source-highlight 2.9

+by Lorenzo Bettini

+http://www.lorenzobettini.it

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

+<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">[:</span>index<span style="color: #990000">,</span> <span style="color: #990000">:</span>show<span style="color: #990000">]</span>

+map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>products<span style="color: #990000">,</span> <span style="color: #990000">:</span>except <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>destroy

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

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

+<li>

+<p>

+Lead Contributor: <a href="http://experthuman.com/">Tom Stuart</a>

+</p>

+</li>

+</ul></div>

+<h3 id="_other_action_controller_changes">6.4. Other Action Controller Changes</h3>

 <div class="ilist"><ul>

 <li>

 <p>

diff --git a/railties/doc/guides/html/actioncontroller_basics.html b/railties/doc/guides/html/actioncontroller_basics.html
index 19d7e9e502..66563bf1a3 100644
--- a/railties/doc/guides/html/actioncontroller_basics.html
+++ b/railties/doc/guides/html/actioncontroller_basics.html
@@ -925,7 +925,7 @@ http://www.gnu.org/software/src-highlite -->
 <div class="sectionbody">

 <div class="para"><p>In every controller there are two accessor methods pointing to the request and the response objects associated with the request cycle that is currently in execution. The <tt>request</tt> method contains an instance of AbstractRequest and the <tt>response</tt> method returns a <tt>response</tt> object representing what is going to be sent back to the client.</p></div>

 <h3 id="_the_tt_request_tt_object">9.1. The <tt>request</tt> Object</h3>

-<div class="para"><p>The request object contains a lot of useful information about the request coming in from the client. To get a full list of the available methods, refer to the <a href="http://api.rubyonrails.org/classes/ActionController/AbstractRequest.html">API documentation</a>. Among the properties that you can access on this object:</p></div>

+<div class="para"><p>The request object contains a lot of useful information about the request coming in from the client. To get a full list of the available methods, refer to the <a href="http://api.rubyonrails.org/classes/ActionController/AbstractRequest.html">API documentation</a>. Among the properties that you can access on this object are:</p></div>

 <div class="ilist"><ul>

 <li>

 <p>

@@ -1039,7 +1039,7 @@ 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> AdminController <span style="color: #990000">&lt;</span> ApplicationController

 

-  USERNAME<span style="color: #990000">,</span> PASSWORD <span style="color: #990000">=</span> <span style="color: #FF0000">"humbaba"</span><span style="color: #990000">,</span> <span style="color: #FF0000">"f59a4805511bf4bb61978445a5380c6c"</span>

+  USERNAME<span style="color: #990000">,</span> PASSWORD <span style="color: #990000">=</span> <span style="color: #FF0000">"humbaba"</span><span style="color: #990000">,</span> <span style="color: #FF0000">"5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8"</span>

 

   before_filter <span style="color: #990000">:</span>authenticate

 

@@ -1047,7 +1047,7 @@ private
 

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

     authenticate_or_request_with_http_basic <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>username<span style="color: #990000">,</span> password<span style="color: #990000">|</span>

-      username <span style="color: #990000">==</span> USERNAME <span style="color: #990000">&amp;&amp;</span> Digest<span style="color: #990000">::</span>MD5<span style="color: #990000">.</span>hexdigest<span style="color: #990000">(</span>password<span style="color: #990000">)</span> <span style="color: #990000">==</span> PASSWORD

+      username <span style="color: #990000">==</span> USERNAME <span style="color: #990000">&amp;&amp;</span> Digest<span style="color: #990000">::</span>SHA1<span style="color: #990000">.</span>hexdigest<span style="color: #990000">(</span>password<span style="color: #990000">)</span> <span style="color: #990000">==</span> PASSWORD

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

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

 

@@ -1104,7 +1104,7 @@ http://www.gnu.org/software/src-highlite -->
 

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

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

-<div class="para"><p>This will read and stream the file 4Kb at the time, avoiding loading the entire file into memory at once. You can turn off streaming with the <tt>stream</tt> option or adjust the block size with the <tt>buffer_size</tt> option.</p></div>

+<div class="para"><p>This will read and stream the file 4Kb at the time, avoiding loading the entire file into memory at once. You can turn off streaming with the <tt>:stream</tt> option or adjust the block size with the <tt>:buffer_size</tt> option.</p></div>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

diff --git a/railties/doc/guides/html/activerecord_validations_callbacks.html b/railties/doc/guides/html/activerecord_validations_callbacks.html
index 209722e9e0..45eec6ffa1 100644
--- a/railties/doc/guides/html/activerecord_validations_callbacks.html
+++ b/railties/doc/guides/html/activerecord_validations_callbacks.html
@@ -264,6 +264,9 @@ ul#navMain {
 						</ul>
 					</li>
 					<li>
+					<a href="#_writing_your_own_validation_methods">Writing your own validation methods</a>
+					</li>
+					<li>
 					<a href="#_changelog">Changelog</a>
 					</li>
 			</ol>
@@ -702,7 +705,40 @@ http://www.gnu.org/software/src-highlite -->
 <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>

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

 </div>

-<h2 id="_changelog">6. Changelog</h2>

+<h2 id="_writing_your_own_validation_methods">6. Writing your own validation methods</h2>

+<div class="sectionbody">

+<div class="para"><p>When the built-in validation helpers are not enough for your needs, you can write your own validation methods, by implementing one or more of the <tt>validate</tt>, <tt>validate_on_create</tt> or <tt>validate_on_update</tt> methods. As the names of the methods states, the right method to implement depends on when you want the validations to be ran. The meaning of valid is still the same: to make an object invalid you just need to add a message to it's <tt>errors</tt> collection.</p></div>

+<div class="listingblock">

+<div class="content"><!-- Generator: GNU source-highlight 2.9

+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> Invoice <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base

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

+    errors<span style="color: #990000">.</span>add<span style="color: #990000">(:</span>expiration_date<span style="color: #990000">,</span> <span style="color: #FF0000">"can't be in the past"</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #990000">!</span>expiration_date<span style="color: #990000">.</span>blank? <span style="font-weight: bold"><span style="color: #0000FF">and</span></span> expiration_date <span style="color: #990000">&lt;</span> Date<span style="color: #990000">.</span>today

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

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

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

+<div class="para"><p>If your validation rules are too complicated and you want to break it in small methods, you can implement all of them and call one of <tt>validate</tt>, <tt>validate_on_create</tt> or <tt>validate_on_update</tt> methods, passing it the symbols for the methods' names.</p></div>

+<div class="listingblock">

+<div class="content"><!-- Generator: GNU source-highlight 2.9

+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> Invoice <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base

+  validate <span style="color: #990000">:</span>expiration_date_cannot_be_in_the_past<span style="color: #990000">,</span> <span style="color: #990000">:</span>discount_cannot_be_be_more_than_total_value

+

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

+    errors<span style="color: #990000">.</span>add<span style="color: #990000">(:</span>expiration_date<span style="color: #990000">,</span> <span style="color: #FF0000">"can't be in the past"</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #990000">!</span>expiration_date<span style="color: #990000">.</span>blank? <span style="font-weight: bold"><span style="color: #0000FF">and</span></span> expiration_date <span style="color: #990000">&lt;</span> Date<span style="color: #990000">.</span>today

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

+

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

+    errors<span style="color: #990000">.</span>add<span style="color: #990000">(:</span>discount<span style="color: #990000">,</span> <span style="color: #FF0000">"can't be greater than total value"</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">unless</span></span> discount <span style="color: #990000">&lt;=</span> total_value

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

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

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

+</div>

+<h2 id="_changelog">7. Changelog</h2>

 <div class="sectionbody">

 <div class="para"><p><a href="http://rails.lighthouseapp.com/projects/16213/tickets/26-active-record-validations-and-callbacks">http://rails.lighthouseapp.com/projects/16213/tickets/26-active-record-validations-and-callbacks</a></p></div>

 </div>

diff --git a/railties/doc/guides/html/caching_with_rails.html b/railties/doc/guides/html/caching_with_rails.html
index df30c46c35..7aa5999e1a 100644
--- a/railties/doc/guides/html/caching_with_rails.html
+++ b/railties/doc/guides/html/caching_with_rails.html
@@ -235,48 +235,54 @@ need to return to those hungry web clients in the shortest time possible.</p></d
 <div class="sectionbody">

 <div class="para"><p>This is an introduction to the three types of caching techniques that Rails

 provides by default without the use of any third party plugins.</p></div>

-<div class="para"><p>To get started make sure Base.perform_caching is set to true for your

-environment.</p></div>

+<div class="para"><p>To get started make sure config.action_controller.perform_caching is set

+to true for your environment. This flag is normally set in the

+corresponding config/environments/*.rb and caching is disabled by default

+there for development and test, and enabled for production.</p></div>

 <div class="listingblock">

 <div class="content"><!-- Generator: GNU source-highlight 2.9

 by Lorenzo Bettini

 http://www.lorenzobettini.it

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

-<pre><tt>Base<span style="color: #990000">.</span>perform_caching <span style="color: #990000">=</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>

+<pre><tt>config<span style="color: #990000">.</span>action_controller<span style="color: #990000">.</span>perform_caching <span style="color: #990000">=</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>

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

 <h3 id="_page_caching">1.1. Page Caching</h3>

 <div class="para"><p>Page caching is a Rails mechanism which allows the request for a generated

 page to be fulfilled by the webserver, without ever having to go through the

-Rails stack at all. Obviously, this is super fast. Unfortunately, it can't be

+Rails stack at all. Obviously, this is super-fast. Unfortunately, it can't be

 applied to every situation (such as pages that need authentication) and since

 the webserver is literally just serving a file from the filesystem, cache

 expiration is an issue that needs to be dealt with.</p></div>

 <div class="para"><p>So, how do you enable this super-fast cache behavior?  Simple, let's say you

-have a controller called ProductController and a <em>list</em> action that lists all

+have a controller called ProductsController and a <em>list</em> action that lists all

 the products</p></div>

 <div class="listingblock">

 <div class="content"><!-- Generator: GNU source-highlight 2.9

 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> ProductController <span style="color: #990000">&lt;</span> ActionController

+<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ProductsController <span style="color: #990000">&lt;</span> ActionController

 

-  cache_page <span style="color: #990000">:</span>list

+  caches_page <span style="color: #990000">:</span>index

 

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

+  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> index<span style="color: #990000">;</span> <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>

 

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

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

-<div class="para"><p>The first time anyone requestsion products/list, Rails will generate a file

-called list.html and the webserver will then look for that file before it

-passes the next request for products/list to your Rails application.</p></div>

+<div class="para"><p>The first time anyone requests products/index, Rails will generate a file

+called index.html and the webserver will then look for that file before it

+passes the next request for products/index to your Rails application.</p></div>

 <div class="para"><p>By default, the page cache directory is set to Rails.public_path (which is

-usually set to RAILS_ROOT + "/public") and this can be configured by changing

-the configuration setting Base.cache_public_directory</p></div>

-<div class="para"><p>The page caching mechanism will automatically add a .html exxtension to

+usually set to RAILS_ROOT + "/public") and this can be configured by

+changing the configuration setting ActionController::Base.page_cache_directory. Changing the

+default from /public helps avoid naming conflicts, since you may want to

+put other static html in /public, but changing this will require web

+server reconfiguration to let the web server know where to serve the

+cached files from.</p></div>

+<div class="para"><p>The Page Caching mechanism will automatically add a .html exxtension to

 requests for pages that do not have an extension to make it easy for the

 webserver to find those pages and this can be configured by changing the

-configuration setting Base.page_cache_extension</p></div>

+configuration setting ActionController::Base.page_cache_extension.</p></div>

 <div class="para"><p>In order to expire this page when a new product is added we could extend our

 example controler like this:</p></div>

 <div class="listingblock">

@@ -284,9 +290,9 @@ example controler like this:</p></div>
 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> ProductController <span style="color: #990000">&lt;</span> ActionController

+<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ProductsController <span style="color: #990000">&lt;</span> ActionController

 

-  cache_page <span style="color: #990000">:</span>list

+  caches_page <span style="color: #990000">:</span>list

 

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

 

@@ -299,11 +305,11 @@ http://www.gnu.org/software/src-highlite -->
 <div class="para"><p>If you want a more complicated expiration scheme, you can use cache sweepers

 to expire cached objects when things change. This is covered in the section on Sweepers.</p></div>

 <h3 id="_action_caching">1.2. Action Caching</h3>

-<div class="para"><p>One of the issues with page caching is that you cannot use it for pages that

+<div class="para"><p>One of the issues with Page Caching is that you cannot use it for pages that

 require to restrict access somehow. This is where Action Caching comes in.

 Action Caching works like Page Caching except for the fact that the incoming

 web request does go from the webserver to the Rails stack and Action Pack so

-that before_filters can be run on it before the cache is served, so that

+that before filters can be run on it before the cache is served, so that

 authentication and other restrictions can be used while still serving the

 result of the output from a cached copy.</p></div>

 <div class="para"><p>Clearing the cache works in the exact same way as with Page Caching.</p></div>

@@ -314,10 +320,10 @@ object, but still cache those pages:</p></div>
 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> ProductController <span style="color: #990000">&lt;</span> ActionController

+<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ProductsController <span style="color: #990000">&lt;</span> ActionController

 

   before_filter <span style="color: #990000">:</span>authenticate<span style="color: #990000">,</span> <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span> <span style="color: #990000">:</span>edit<span style="color: #990000">,</span> <span style="color: #990000">:</span>create <span style="color: #990000">]</span>

-  cache_page <span style="color: #990000">:</span>list

+  caches_page <span style="color: #990000">:</span>list

   caches_action <span style="color: #990000">:</span>edit

 

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

@@ -336,7 +342,7 @@ action should be cached. Also, you can use :layout &#8658; false to cache withou
 layout so that dynamic information in the layout such as logged in user info

 or the number of items in the cart can be left uncached. This feature is

 available as of Rails 2.2.</p></div>

-<div class="para"><p>[More: more examples? Walk-through of action caching from request to response?

+<div class="para"><p>[More: more examples? Walk-through of Action Caching from request to response?

        Description of Rake tasks to clear cached files? Show example of

        subdomain caching? Talk about :cache_path, :if and assing blocks/Procs

        to expire_action?]</p></div>

@@ -346,13 +352,13 @@ a page or action and serving it out to the world. Unfortunately, dynamic web
 applications usually build pages with a variety of components not all of which

 have the same caching characteristics. In order to address such a dynamically

 created page where different parts of the page need to be cached and expired

-differently Rails provides a mechanism called Fragment caching.</p></div>

-<div class="para"><p>Fragment caching allows a fragment of view logic to be wrapped in a cache

+differently Rails provides a mechanism called Fragment Caching.</p></div>

+<div class="para"><p>Fragment Caching allows a fragment of view logic to be wrapped in a cache

 block and served out of the cache store when the next request comes in.</p></div>

-<div class="para"><p>As an example, if you wanted to show all the orders placed on your website in

-real time and didn't want to cache that part  of the page, but did want to

-cache the part of the page which lists all products available, you could use

-this piece of code:</p></div>

+<div class="para"><p>As an example, if you wanted to show all the orders placed on your website

+in real time and didn't want to cache that part  of the page, but did want

+to cache the part of the page which lists all products available, you

+could use this piece of code:</p></div>

 <div class="listingblock">

 <div class="content"><!-- Generator: GNU source-highlight 2.9

 by Lorenzo Bettini

@@ -371,7 +377,7 @@ http://www.gnu.org/software/src-highlite -->
 </tt></pre></div></div>

 <div class="para"><p>The cache block in our example will bind to the action that called it and is

 written out to the same place as the Action Cache, which means that if you

-want to cache multiple fragments per action, you should provide an action_path to the cache call:</p></div>

+want to cache multiple fragments per action, you should provide an action_suffix to the cache call:</p></div>

 <div class="listingblock">

 <div class="content"><!-- Generator: GNU source-highlight 2.9

 by Lorenzo Bettini

@@ -439,10 +445,10 @@ following:</p></div>
 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> ProductController <span style="color: #990000">&lt;</span> ActionController

+<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ProductsController <span style="color: #990000">&lt;</span> ActionController

 

   before_filter <span style="color: #990000">:</span>authenticate<span style="color: #990000">,</span> <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span> <span style="color: #990000">:</span>edit<span style="color: #990000">,</span> <span style="color: #990000">:</span>create <span style="color: #990000">]</span>

-  cache_page <span style="color: #990000">:</span>list

+  caches_page <span style="color: #990000">:</span>list

   caches_action <span style="color: #990000">:</span>edit

   cache_sweeper <span style="color: #990000">:</span>store_sweeper<span style="color: #990000">,</span> <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span> <span style="color: #990000">:</span>create <span style="color: #990000">]</span>

 

@@ -468,10 +474,10 @@ database again.</p></div>
 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> ProductController <span style="color: #990000">&lt;</span> ActionController

+<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ProductsController <span style="color: #990000">&lt;</span> ActionController

 

   before_filter <span style="color: #990000">:</span>authenticate<span style="color: #990000">,</span> <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span> <span style="color: #990000">:</span>edit<span style="color: #990000">,</span> <span style="color: #990000">:</span>create <span style="color: #990000">]</span>

-  cache_page <span style="color: #990000">:</span>list

+  caches_page <span style="color: #990000">:</span>list

   caches_action <span style="color: #990000">:</span>edit

   cache_sweeper <span style="color: #990000">:</span>store_sweeper<span style="color: #990000">,</span> <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span> <span style="color: #990000">:</span>create <span style="color: #990000">]</span>

 

diff --git a/railties/doc/guides/html/routing_outside_in.html b/railties/doc/guides/html/routing_outside_in.html
index bf9992ff4e..8add4e7789 100644
--- a/railties/doc/guides/html/routing_outside_in.html
+++ b/railties/doc/guides/html/routing_outside_in.html
@@ -925,6 +925,16 @@ cellspacing="0" cellpadding="4">
 <tt>:name_prefix</tt>

 </p>

 </li>

+<li>

+<p>

+<tt>:only</tt>

+</p>

+</li>

+<li>

+<p>

+<tt>:except</tt>

+</p>

+</li>

 </ul></div>

 <div class="para"><p>You can also add additional routes via the <tt>:member</tt> and <tt>:collection</tt> options, which are discussed later in this guide.</p></div>

 <h4 id="_using_controller">3.6.1. Using :controller</h4>

@@ -1419,6 +1429,34 @@ map<span style="color: #990000">.</span>resources <span style="color: #990000">:
 <td class="content">You can also use <tt>:name_prefix</tt> with non-RESTful routes.</td>

 </tr></table>

 </div>

+<h4 id="_using_only_and_except">3.7.8. Using :only and :except</h4>

+<div class="para"><p>By default, Rails creates routes for all seven of the default actions (index, show, new, create, edit, update, and destroy) for every RESTful route in your application. You can use the <tt>:only</tt> and <tt>:except</tt> options to fine-tune this behavior. The <tt>:only</tt> option specifies that only certain routes should be generated:</p></div>

+<div class="listingblock">

+<div class="content"><!-- Generator: GNU source-highlight 2.9

+by Lorenzo Bettini

+http://www.lorenzobettini.it

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

+<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">[:</span>index<span style="color: #990000">,</span> <span style="color: #990000">:</span>show<span style="color: #990000">]</span>

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

+<div class="para"><p>With this declaration, a <tt>GET</tt> request to <tt>/photos</tt> would succeed, but a <tt>POST</tt> request to <tt>/photos</tt> (which would ordinarily be routed to the create action) will fail.</p></div>

+<div class="para"><p>The <tt>:except</tt> option specifies a route or list of routes that should <em>not</em> be generated:</p></div>

+<div class="listingblock">

+<div class="content"><!-- Generator: GNU source-highlight 2.9

+by Lorenzo Bettini

+http://www.lorenzobettini.it

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

+<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>except <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>destroy

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

+<div class="para"><p>In this case, all of the normal routes except the route for <tt>destroy</tt> (a <tt>DELETE</tt> request to <tt>/photos/<em>id</em></tt>) will be generated.</p></div>

+<div class="para"><p>In addition to an action or a list of actions, you can also supply the special symbols <tt>:all</tt> or <tt>:none</tt> to the <tt>:only</tt> and <tt>:accept</tt> options.</p></div>

+<div class="admonitionblock">

+<table><tr>

+<td class="icon">

+<img src="./images/icons/tip.png" alt="Tip" />

+</td>

+<td class="content">If your application has many RESTful routes, using <tt>:only</tt> and <tt>:accept</tt> to generate only the routes that you actually need can cut down on memory use and speed up the routing process.</td>

+</tr></table>

+</div>

 <h3 id="_nested_resources">3.8. Nested Resources</h3>

 <div class="para"><p>It's common to have resources that are logically children of other resources. For example, suppose your application includes these models:</p></div>

 <div class="listingblock">