aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG.md4
-rw-r--r--railties/guides/source/routing.textile4
2 files changed, 4 insertions, 4 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index f556ee210d..960b1ed8ca 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -71,7 +71,7 @@
* Remove old 'config.paths.app.controller' API in favor of 'config.paths["app/controller"]' API *Guillermo Iguaran*
-## Rails 3.1.4 (unreleased) ##
+## Rails 3.1.4 (March 1, 2012) ##
* Setting config.force_ssl also marks the session cookie as secure.
@@ -203,7 +203,7 @@
* Include all helpers from plugins and shared engines in application *Piotr Sarnacki*
-## Rails 3.0.12 (unreleased) ##
+## Rails 3.0.12 (March 1, 2012) ##
* No changes.
diff --git a/railties/guides/source/routing.textile b/railties/guides/source/routing.textile
index 24e7d09a49..42665114be 100644
--- a/railties/guides/source/routing.textile
+++ b/railties/guides/source/routing.textile
@@ -295,13 +295,13 @@ In this case, Rails will see that +@magazine+ is a +Magazine+ and +@ad+ is an +A
<%= link_to "Ad details", [@magazine, @ad] %>
</erb>
-If you wanted to link to just a magazine, you could leave out the +Array+:
+If you wanted to link to just a magazine:
<erb>
<%= link_to "Magazine details", @magazine %>
</erb>
-For other actions, you just need to insert the action name as the first element of the +Array+:
+For other actions, you just need to insert the action name as the first element of the array:
<erb>
<%= link_to "Edit Ad", [:edit, @magazine, @ad] %>