From 3979812999023e3c11ade95ca5442374ab5f95b8 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Fri, 13 Jan 2012 10:51:53 -0500
Subject: Getting Started Guide: Update reference about JavaScript runtimes

---
 railties/guides/source/getting_started.textile | 8 +++++++-
 1 file changed, 7 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 a36f84e9fd..63e0173e3f 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -447,7 +447,13 @@ start a web server on your development machine. You can do this by running:
 $ rails server
 </shell>
 
-TIP: Compiling CoffeeScript to JavaScript requires a JavaScript runtime and the absence of a runtime will give you an +execjs+ error. Usually Mac OS X and Windows come with a JavaScript runtime installed. +therubyracer+ and +therubyrhino+ are the commonly used runtimes for Ruby and JRuby respectively. You can also investigate a list of runtimes at "ExecJS":https://github.com/sstephenson/execjs.
+TIP: Compiling CoffeeScript to JavaScript requires a JavaScript runtime and 
+the absence of a runtime will give you an +execjs+ error. Usually Mac OS X 
+and Windows come with a JavaScript runtime installed. +therubyracer+ gem is
+added commented to Gemfile for new apps and you can uncomment if you need it.
++therubyrhino+ is the recommended runtime for JRuby users and is added by default 
+to Gemfile in apps generated under JRuby. You can investigate about all the
+supported runtimes at "ExecJS":https://github.com/sstephenson/execjs#readme.
 
 This will fire up an instance of the WEBrick web server by default (Rails can
 also use several other web servers). To see your application in action, open a
-- 
cgit v1.2.3


From 04a05e58995b3c7c2949fbbd31a2cb669b8edc87 Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Fri, 13 Jan 2012 23:14:10 -0700
Subject: Fix styling of example layout.  Fixes #4461

---
 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 63e0173e3f..d2031027c8 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -844,7 +844,7 @@ below:
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
 </head>
-<body style="background: #EEEEEE;">
+<body style="background-color: #EEEEEE;">
 
 <%= yield %>
 
-- 
cgit v1.2.3


From 2d76d1f4752c18cd6c72c42fedb07219d68a88c4 Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Sun, 15 Jan 2012 14:30:23 -0200
Subject: Improve description of :allow_destroy option for nested attributes in
 getting started guide

---
 railties/guides/source/getting_started.textile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 d2031027c8..4a0b6959fb 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -447,11 +447,11 @@ start a web server on your development machine. You can do this by running:
 $ rails server
 </shell>
 
-TIP: Compiling CoffeeScript to JavaScript requires a JavaScript runtime and 
-the absence of a runtime will give you an +execjs+ error. Usually Mac OS X 
+TIP: Compiling CoffeeScript to JavaScript requires a JavaScript runtime and
+the absence of a runtime will give you an +execjs+ error. Usually Mac OS X
 and Windows come with a JavaScript runtime installed. +therubyracer+ gem is
 added commented to Gemfile for new apps and you can uncomment if you need it.
-+therubyrhino+ is the recommended runtime for JRuby users and is added by default 
++therubyrhino+ is the recommended runtime for JRuby users and is added by default
 to Gemfile in apps generated under JRuby. You can investigate about all the
 supported runtimes at "ExecJS":https://github.com/sstephenson/execjs#readme.
 
@@ -1695,10 +1695,10 @@ class Post < ActiveRecord::Base
 end
 </ruby>
 
-The +:allow_destroy+ option on the nested attribute declaration tells Rails to
-display a "remove" checkbox on the view that you'll build shortly. The
-+:reject_if+ option prevents saving new tags that do not have any attributes
-filled in.
+The +:allow_destroy+ option tells Rails to enable destroying tags through the
+nested attributes (you'll handle that by displaying a "remove" checkbox on the
+view that you'll build shortly). The +:reject_if+ option prevents saving new
+tags that do not have any attributes filled in.
 
 We will modify +views/posts/_form.html.erb+ to render a partial to make a tag:
 
-- 
cgit v1.2.3


From 3cf22c8ab5294a332c6f4e20174c50165265f1d1 Mon Sep 17 00:00:00 2001
From: Dan Pickett <dpickett@enlightsolutions.com>
Date: Sun, 15 Jan 2012 15:08:01 -0500
Subject: change class to id per scaffold change

#4472
---
 railties/guides/source/getting_started.textile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 4a0b6959fb..084ea6780d 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -1014,7 +1014,7 @@ by its id value. After finding the record, Rails displays it by using
 +app/views/posts/show.html.erb+:
 
 <erb>
-<p class="notice"><%= notice %></p>
+<p id="notice"><%= notice %></p>
 
 <p>
   <b>Name:</b>
@@ -1281,7 +1281,7 @@ So first, we'll wire up the Post show template
 (+/app/views/posts/show.html.erb+) to let us make a new comment:
 
 <erb>
-<p class="notice"><%= notice %></p>
+<p id="notice"><%= notice %></p>
 
 <p>
   <b>Name:</b>
@@ -1347,7 +1347,7 @@ template. This is where we want the comment to show, so let's add that to the
 +app/views/posts/show.html.erb+.
 
 <erb>
-<p class="notice"><%= notice %></p>
+<p id="notice"><%= notice %></p>
 
 <p>
   <b>Name:</b>
@@ -1429,7 +1429,7 @@ Then you can change +app/views/posts/show.html.erb+ to look like the
 following:
 
 <erb>
-<p class="notice"><%= notice %></p>
+<p id="notice"><%= notice %></p>
 
 <p>
   <b>Name:</b>
@@ -1500,7 +1500,7 @@ create a file +app/views/comments/_form.html.erb+ containing:
 Then you make the +app/views/posts/show.html.erb+ look like the following:
 
 <erb>
-<p class="notice"><%= notice %></p>
+<p id="notice"><%= notice %></p>
 
 <p>
   <b>Name:</b>
@@ -1771,7 +1771,7 @@ Finally, we will edit the <tt>app/views/posts/show.html.erb</tt> template to
 show our tags.
 
 <erb>
-<p class="notice"><%= notice %></p>
+<p id="notice"><%= notice %></p>
 
 <p>
   <b>Name:</b>
@@ -1831,7 +1831,7 @@ Now you can edit the view in <tt>app/views/posts/show.html.erb</tt> to look like
 this:
 
 <erb>
-<p class="notice"><%= notice %></p>
+<p id="notice"><%= notice %></p>
 
 <p>
   <b>Name:</b>
-- 
cgit v1.2.3


From 7af8ee7658cfcade1fb9949830ca78a98a97a367 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Mon, 16 Jan 2012 22:04:25 +0530
Subject: minor edits in getting started guide

---
 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 084ea6780d..c77bc93cfb 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -449,8 +449,8 @@ $ rails server
 
 TIP: Compiling CoffeeScript to JavaScript requires a JavaScript runtime and
 the absence of a runtime will give you an +execjs+ error. Usually Mac OS X
-and Windows come with a JavaScript runtime installed. +therubyracer+ gem is
-added commented to Gemfile for new apps and you can uncomment if you need it.
+and Windows come with a JavaScript runtime installed. Rails adds the +therubyracer+ gem
+to Gemfile in a commented line for new apps and you can uncomment if you need it.
 +therubyrhino+ is the recommended runtime for JRuby users and is added by default
 to Gemfile in apps generated under JRuby. You can investigate about all the
 supported runtimes at "ExecJS":https://github.com/sstephenson/execjs#readme.
-- 
cgit v1.2.3

