From e99a0b62ec128272350060554a0f41673fcdb78d Mon Sep 17 00:00:00 2001
From: Jason Noble & Ralph Shnelvar <perlwizard@gmail.com>
Date: Sun, 24 Jul 2011 14:51:48 -0600
Subject: Add a note about the fact that the Windows prompt will look different
 than the linux/osx prompt

---
 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 aaad63523a..b3b3581147 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -217,6 +217,8 @@ If you follow this guide, you'll create a Rails project called <tt>blog</tt>, a
 (very) simple weblog. Before you can start building the application, you need to
 make sure that you have Rails itself installed.
 
+TIP: The examples below use # and $ to denote terminal prompts. If you are using Windows, your prompt will look something like c:\source_code>
+
 h4. Installing Rails
 
 In most cases, the easiest way to install Rails is to take advantage of RubyGems:
-- 
cgit v1.2.3


From 72e06dc7a01a999e786106ae410583642ff81e6d Mon Sep 17 00:00:00 2001
From: Jason Noble & Ralph Shnelvar <perlwizard@gmail.com>
Date: Sun, 24 Jul 2011 15:04:12 -0600
Subject: Fix TIP formatting issue

---
 railties/guides/source/getting_started.textile | 3 ++-
 1 file changed, 2 insertions(+), 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 b3b3581147..94778608ae 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -249,7 +249,8 @@ $ 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 new -h</tt>.
+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 715c128e6a454addbb95df17dbc14cb3780bcea6 Mon Sep 17 00:00:00 2001
From: Jason Noble & Ralph Shnelvar <perlwizard@gmail.com>
Date: Sun, 24 Jul 2011 15:33:59 -0600
Subject: Remove "bundle install" section, as rails new ______ runs bundle
 install for you

---
 railties/guides/source/getting_started.textile | 12 ------------
 1 file changed, 12 deletions(-)

(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 94778608ae..b01576b85c 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -282,18 +282,6 @@ by default:
 |tmp/|Temporary files|
 |vendor/|A place for all third-party code. In a typical Rails application, this includes Ruby Gems, the Rails source code (if you install it into your project) and plugins containing additional prepackaged functionality.|
 
-h4. Installing the Required Gems
-
-Rails applications manage gem dependencies with
-"Bundler":http://gembundler.com/v1.0/index.html by default. As we don't need any
-other gems beyond the ones in the generated +Gemfile+ we can directly run
-
-<shell>
-$ bundle install
-</shell>
-
-to have them ready.
-
 h4. Configuring a Database
 
 Just about every Rails application will interact with a database. The database
-- 
cgit v1.2.3


From fe5cb7c521d9cc452454fea4146af173cfe82c94 Mon Sep 17 00:00:00 2001
From: Jason Noble & Ralph Shnelvar <perlwizard@gmail.com>
Date: Sun, 24 Jul 2011 15:39:22 -0600
Subject: Update wording of TIP about --database option for rails new

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

(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 b01576b85c..4c61cae0cb 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -397,12 +397,12 @@ 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
+TIP: You don't have to update the database configurations manually. If you look at the
+options of the application generator, you will see that one of the options
+is named <tt>--database</tt>. This option allows you to choose an adapter from a
+list of the 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
-- 
cgit v1.2.3


From 2f7ea1907dbaae737a227977b9b645e4ae22c8a0 Mon Sep 17 00:00:00 2001
From: Jason Noble & Ralph Shnelvar <perlwizard@gmail.com>
Date: Sun, 24 Jul 2011 16:07:41 -0600
Subject: Make the rails not found tip more explanatory.

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

(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 4c61cae0cb..c2c8ee02ad 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -462,8 +462,8 @@ your terminal:
 $ 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: <tt>ruby
+TIP: If you get a command not found error when running this command, you
+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
-- 
cgit v1.2.3

