From cbacc9700e68d1ea3e6cc83b08226c3ddb104537 Mon Sep 17 00:00:00 2001
From: Trevor Turk <trevorturk@gmail.com>
Date: Tue, 24 Aug 2010 00:13:33 -0500
Subject: Note about how to exit the console in the Getting Started guide

---
 railties/guides/source/getting_started.textile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'railties/guides/source')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index e68a82e9db..c292daa915 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -488,6 +488,8 @@ After the console loads, you can use it to work with your application's models:
 
 This code shows creating a new +Post+ instance, attempting to save it and getting +false+ for a return value (indicating that the save failed), and inspecting the +errors+ of the post.
 
+When you're finished, type +exit+ and hit +return+ to exit the console.
+
 TIP: Unlike the development web server, the console does not automatically load your code afresh for each line. If you make changes to your models while the console is open, type +reload!+ at the console prompt to load them.
 
 h4. Listing All Posts
-- 
cgit v1.2.3


From 02aabbd19e59720d2d5819978d2f712c2279bf34 Mon Sep 17 00:00:00 2001
From: Andrew White <andyw@pixeltrix.co.uk>
Date: Tue, 24 Aug 2010 07:06:53 +0100
Subject: Use symbols when specifying custom resource actions

---
 railties/guides/source/routing.textile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'railties/guides/source')

diff --git a/railties/guides/source/routing.textile b/railties/guides/source/routing.textile
index 7e1b0c2e32..457b6804b1 100644
--- a/railties/guides/source/routing.textile
+++ b/railties/guides/source/routing.textile
@@ -313,7 +313,7 @@ To add a member route, just add a +member+ block into the resource block:
 <ruby>
 resources :photos do
   member do
-    get 'preview'
+    get :preview
   end
 end
 </ruby>
@@ -324,7 +324,7 @@ Within the block of member routes, each route name specifies the HTTP verb that
 
 <ruby>
 resources :photos do
-  get 'preview', :on => :member
+  get :preview, :on => :member
 end
 </ruby>
 
@@ -335,7 +335,7 @@ To add a route to the collection:
 <ruby>
 resources :photos do
   collection do
-    get 'search'
+    get :search
   end
 end
 </ruby>
@@ -346,7 +346,7 @@ Just as with member routes, you can pass +:on+ to a route:
 
 <ruby>
 resources :photos do
-  get 'search', :on => :collection
+  get :search, :on => :collection
 end
 </ruby>
 
-- 
cgit v1.2.3


From 1a6c81c4f9076885aee593b4aa3704b5cdbeb879 Mon Sep 17 00:00:00 2001
From: Andrew White <andyw@pixeltrix.co.uk>
Date: Tue, 24 Aug 2010 17:12:02 +0100
Subject: Revert "Use symbols when specifying custom resource actions"

This reverts commit 02aabbd19e59720d2d5819978d2f712c2279bf34.
---
 railties/guides/source/routing.textile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'railties/guides/source')

diff --git a/railties/guides/source/routing.textile b/railties/guides/source/routing.textile
index 457b6804b1..7e1b0c2e32 100644
--- a/railties/guides/source/routing.textile
+++ b/railties/guides/source/routing.textile
@@ -313,7 +313,7 @@ To add a member route, just add a +member+ block into the resource block:
 <ruby>
 resources :photos do
   member do
-    get :preview
+    get 'preview'
   end
 end
 </ruby>
@@ -324,7 +324,7 @@ Within the block of member routes, each route name specifies the HTTP verb that
 
 <ruby>
 resources :photos do
-  get :preview, :on => :member
+  get 'preview', :on => :member
 end
 </ruby>
 
@@ -335,7 +335,7 @@ To add a route to the collection:
 <ruby>
 resources :photos do
   collection do
-    get :search
+    get 'search'
   end
 end
 </ruby>
@@ -346,7 +346,7 @@ Just as with member routes, you can pass +:on+ to a route:
 
 <ruby>
 resources :photos do
-  get :search, :on => :collection
+  get 'search', :on => :collection
 end
 </ruby>
 
-- 
cgit v1.2.3