From 8e8c13ab1ed1140f708c8af74f386a3f6dec6e0a Mon Sep 17 00:00:00 2001
From: Karel Minarik <karmi@karmi.cz>
Date: Tue, 28 Dec 2010 08:45:09 +0100
Subject: Fixed incorrect command for displaying options for new application
 Generator in Getting Started guide

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

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 4466c291bb..43525d7a57 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -163,7 +163,7 @@ $ rails new blog
 
 This will create a Rails application called Blog in a directory called blog.
 
-TIP: You can see all of the switches that the Rails application builder accepts by running <tt>rails -h</tt>.
+TIP: You can see all of the switches that the Rails application builder accepts by running <tt>rails new -h</tt>.
 
 After you create the blog application, switch to its folder to continue work directly in that application:
 
-- 
cgit v1.2.3


From e2c2c2983a83ed53e2287a936a0ab59080be16f6 Mon Sep 17 00:00:00 2001
From: Karel Minarik <karmi@karmi.cz>
Date: Tue, 28 Dec 2010 09:24:49 +0100
Subject: Added TIP box with information about the `--database` switch for the
 application generator in the "Getting Started" guide

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

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 43525d7a57..97c050ded3 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -258,6 +258,8 @@ development:
 
 Change the username and password in the +development+ section as appropriate.
 
+TIP: You don't have to update the database configurations manually. If you had a look at the options of application generator, you have seen that one of them is named <tt>--database</tt>. It lets you choose an adapter for couple of most used relational databases. You can even run the generator repeatedly: <tt>cd .. && rails new blog --database=mysql</tt>. When you confirm the overwriting of the +config/database.yml+ file, your application will be configured for MySQL instead of SQLite.
+
 h4. Creating the Database
 
 Now that you have your database configured, it's time to have Rails create an empty database for you. You can do this by running a rake command:
-- 
cgit v1.2.3


From 8031b7e42ba1b4d3e671e6ed52ffca890da160b0 Mon Sep 17 00:00:00 2001
From: Karel Minarik <karmi@karmi.cz>
Date: Tue, 28 Dec 2010 10:25:55 +0100
Subject: Fixed incorrect instructions for calling the `rails` command
 explicitely in the "Getting Started" guide

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

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 97c050ded3..6a5a2b2d3b 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -300,7 +300,7 @@ To get Rails saying "Hello", you need to create at minimum a controller and a vi
 $ rails generate controller home index
 </shell>
 
-TIP: If you're on Windows, or your Ruby is set up in some non-standard fashion, you may need to explicitly pass Rails +rails+ commands to Ruby: +ruby \path\to\rails controller home index+.
+TIP: If you're on Windows, or your Ruby is set up in some non-standard fashion, you may need to explicitly pass Rails +rails+ commands to Ruby: <tt>ruby \path\to\your\application\script\rails generate controller home index</tt>.
 
 Rails will create several files for you, including +app/views/home/index.html.erb+. This is the template that will be used to display the results of the +index+ action (method) in the +home+ controller. Open this file in your text editor and edit it to contain a single line of code:
 
-- 
cgit v1.2.3


From cb4b5c8ad39e9e7a44ec13ded88083fe76cf8405 Mon Sep 17 00:00:00 2001
From: Karel Minarik <karmi@karmi.cz>
Date: Tue, 28 Dec 2010 16:37:11 +0100
Subject: Adding information and link to guide on customizing generators into
 "Getting Started" guide.

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

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 6a5a2b2d3b..f45e6cab11 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -349,7 +349,7 @@ In the case of the blog application, you can start by generating a scaffolded Po
 $ rails generate scaffold Post name:string title:string content:text
 </shell>
 
-NOTE. While scaffolding will get you up and running quickly, the "one size fits all" code that it generates is unlikely to be a perfect fit for your application. In most cases, you'll need to customize the generated code. Many experienced Rails developers avoid scaffolding entirely, preferring to write all or most of their source code from scratch.
+NOTE. While scaffolding will get you up and running quickly, the code it generates is unlikely to be a perfect fit for your application. You'll most probably want to customize the generated code. Many experienced Rails developers avoid scaffolding entirely, preferring to write all or most of their source code from scratch. Rails, however, makes it really simple to customize templates for generated models, controllers, views and other source files. You'll find more information in the "Creating and Customizing Rails Generators & Templates":generators.html guide.
 
 The scaffold generator will build 15 files in your application, along with some folders, and edit one more. Here's a quick overview of what it creates:
 
-- 
cgit v1.2.3


From 9f75545e5d0aded71f973edd0e5ff4daf3e7c580 Mon Sep 17 00:00:00 2001
From: Karel Minarik <karmi@karmi.cz>
Date: Tue, 28 Dec 2010 17:30:13 +0100
Subject: Added information about invoking migrations in non-default
 environments to NOTE box in the "Getting Started" guide

Reason: When the guide already mentions "default environment", I think it is more then appropriate to tell the whole story.
---
 railties/guides/source/getting_started.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index f45e6cab11..82700532c0 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -411,7 +411,7 @@ Rails will execute this migration command and tell you it created the Posts tabl
 ==  CreatePosts: migrated (0.0020s) ===========================================
 </shell>
 
-NOTE. Because you're working in the development environment by default, this command will apply to the database defined in the +development+ section of your +config/database.yml+ file.
+NOTE. Because you're working in the development environment by default, this command will apply to the database defined in the +development+ section of your +config/database.yml+ file. If you would like to execute migrations in other environment, for instance in production, you must explicitely pass it when invoking the command: <tt>rake db:migrate RAILS_ENV=production</tt>.
 
 h4. Adding a Link
 
-- 
cgit v1.2.3

