aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/doc/guides/html/2_2_release_notes.html2
-rw-r--r--railties/doc/guides/html/layouts_and_rendering.html8
-rw-r--r--railties/doc/guides/source/2_2_release_notes.txt2
-rw-r--r--railties/doc/guides/source/layouts_and_rendering.txt8
4 files changed, 10 insertions, 10 deletions
diff --git a/railties/doc/guides/html/2_2_release_notes.html b/railties/doc/guides/html/2_2_release_notes.html
index d21905f715..7e975d35a6 100644
--- a/railties/doc/guides/html/2_2_release_notes.html
+++ b/railties/doc/guides/html/2_2_release_notes.html
@@ -935,7 +935,7 @@ The addition of <tt>ActiveSupport::Rescuable</tt> allows any class to mix in the
</li>
<li>
<p>
-<tt>Enumerable#several?</tt> to encapsulate <tt>collection.size &gt; 1</tt>
+<tt>Enumerable#many?</tt> to encapsulate <tt>collection.size &gt; 1</tt>
</p>
</li>
<li>
diff --git a/railties/doc/guides/html/layouts_and_rendering.html b/railties/doc/guides/html/layouts_and_rendering.html
index aeda0c5c5e..a394da71df 100644
--- a/railties/doc/guides/html/layouts_and_rendering.html
+++ b/railties/doc/guides/html/layouts_and_rendering.html
@@ -1190,7 +1190,7 @@ http://www.gnu.org/software/src-highlite -->
by Lorenzo Bettini
http://www.lorenzobettini.it
http://www.gnu.org/software/src-highlite -->
-<pre><tt>new.rhtml.erb:
+<pre><tt>new.html.erb:
<span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>New zone<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>
&lt;%= error_messages_for :zone %&gt;
@@ -1240,7 +1240,7 @@ http://www.gnu.org/software/src-highlite -->
by Lorenzo Bettini
http://www.lorenzobettini.it
http://www.gnu.org/software/src-highlite -->
-<pre><tt>index.rhtml.erb:
+<pre><tt>index.html.erb:
<span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>Products<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>
&lt;%= render :partial =&gt; "product", :collection =&gt; @products %&gt;
@@ -1273,7 +1273,7 @@ http://www.gnu.org/software/src-highlite -->
by Lorenzo Bettini
http://www.lorenzobettini.it
http://www.gnu.org/software/src-highlite -->
-<pre><tt>index.rhtml.erb:
+<pre><tt>index.html.erb:
<span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>Products<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>
&lt;%= render :partial =&gt; @products %&gt;
@@ -1288,7 +1288,7 @@ _product.html.erb:
by Lorenzo Bettini
http://www.lorenzobettini.it
http://www.gnu.org/software/src-highlite -->
-<pre><tt>index.rhtml.erb:
+<pre><tt>index.html.erb:
<span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>Contacts<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>
&lt;%= render :partial =&gt; [customer1, employee1, customer2, employee2] %&gt;
diff --git a/railties/doc/guides/source/2_2_release_notes.txt b/railties/doc/guides/source/2_2_release_notes.txt
index 4543b5309c..8d627c9e63 100644
--- a/railties/doc/guides/source/2_2_release_notes.txt
+++ b/railties/doc/guides/source/2_2_release_notes.txt
@@ -349,7 +349,7 @@ Lead Contributor: link:http://workingwithrails.com/person/5830-daniel-schierbeck
* The addition of +ActiveSupport::Rescuable+ allows any class to mix in the +rescue_from+ syntax.
* +past?+, +today?+ and +future?+ for +Date+ and +Time+ classes to facilitate date/time comparisons.
* +Array#second+ through +Array#tenth+ as aliases for +Array#[1]+ through +Array#[9]+
-* +Enumerable#several?+ to encapsulate +collection.size > 1+
+* +Enumerable#many?+ to encapsulate +collection.size > 1+
* +Inflector#parameterize+ produces a URL-ready version of its input, for use in +to_param+.
* +Time#advance+ recognizes fractional days and weeks, so you can do +1.7.weeks.ago+, +1.5.hours.since+, and so on.
* The included TzInfo library has been upgraded to version 0.3.11.
diff --git a/railties/doc/guides/source/layouts_and_rendering.txt b/railties/doc/guides/source/layouts_and_rendering.txt
index c4bb5b0591..3d970b60ce 100644
--- a/railties/doc/guides/source/layouts_and_rendering.txt
+++ b/railties/doc/guides/source/layouts_and_rendering.txt
@@ -768,7 +768,7 @@ You can also pass local variables into partials, making them even more powerful
[source, html]
-------------------------------------------------------
-new.rhtml.erb:
+new.html.erb:
<h1>New zone</h1>
<%= error_messages_for :zone %>
@@ -819,7 +819,7 @@ Partials are very useful in rendering collections. When you pass a collection to
[source, html]
-------------------------------------------------------
-index.rhtml.erb:
+index.html.erb:
<h1>Products</h1>
<%= render :partial => "product", :collection => @products %>
@@ -851,7 +851,7 @@ There's also a shorthand syntax available for rendering collections. For example
[source, html]
-------------------------------------------------------
-index.rhtml.erb:
+index.html.erb:
<h1>Products</h1>
<%= render :partial => @products %>
@@ -865,7 +865,7 @@ Rails determines the name of the partial to use by looking at the model name in
[source, html]
-------------------------------------------------------
-index.rhtml.erb:
+index.html.erb:
<h1>Contacts</h1>
<%= render :partial => [customer1, employee1, customer2, employee2] %>