aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/command_line.textile
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2010-10-19 18:16:52 +0100
committerJon Leighton <j@jonathanleighton.com>2010-10-19 18:16:52 +0100
commit8345a141d12d75418613395259ef5a1112373b06 (patch)
tree1b86f1f0334e5132f46260bb9f43b525a5037be2 /railties/guides/source/command_line.textile
parent2c7183c0260ca105c6440b31f60ac010891b69a9 (diff)
parent1856e975c380920b5d4a67e903ed7c96624fd27b (diff)
downloadrails-8345a141d12d75418613395259ef5a1112373b06.tar.gz
rails-8345a141d12d75418613395259ef5a1112373b06.tar.bz2
rails-8345a141d12d75418613395259ef5a1112373b06.zip
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'railties/guides/source/command_line.textile')
-rw-r--r--railties/guides/source/command_line.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/command_line.textile b/railties/guides/source/command_line.textile
index cbdfda9215..752b5926f7 100644
--- a/railties/guides/source/command_line.textile
+++ b/railties/guides/source/command_line.textile
@@ -145,7 +145,7 @@ $ rails generate controller Greetings hello
What all did this generate? It made sure a bunch of directories were in our application, and created a controller file, a functional test file, a helper for the view, and a view file.
-Check out the controller and modify it a little (in +app/controllers/greetings_controller.rb+):ma
+Check out the controller and modify it a little (in +app/controllers/greetings_controller.rb+):
<ruby>
class GreetingsController < ApplicationController