From 203626867934a2772a5a3f096521b56d59273407 Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Thu, 4 Feb 2010 01:44:54 -0500
Subject: Link to main Arel repository

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 railties/guides/source/3_0_release_notes.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/guides/source/3_0_release_notes.textile')

diff --git a/railties/guides/source/3_0_release_notes.textile b/railties/guides/source/3_0_release_notes.textile
index 5e96f8cf06..7679302ff9 100644
--- a/railties/guides/source/3_0_release_notes.textile
+++ b/railties/guides/source/3_0_release_notes.textile
@@ -8,7 +8,7 @@ Even if you don't give a hoot about any of our internal cleanups, Rails 3.0 is g
 
 * Brand new router with an emphasis on RESTful declarations
 * New Action Mailer API modelled after Action Controller (now without the agonizing pain of sending multipart messages!)
-* New Active Record chainable query language built on top of relational algebra
+* New Active Record chainable query language built on top of "Arel":http://github.com/brynary/arel, a relational algebra engine
 * Unobtrusive JavaScript helpers with drivers for Prototype, jQuery, and more coming (end of inline JS)
 * Explicit dependency management with Bundler
 
@@ -131,7 +131,7 @@ More Information: - "Rails Edge Architecture":http://yehudakatz.com/2009/06/11/r
 
 h4. Arel Integration
 
-"Arel":http://github.com/rails/arel (or Active Relation) has been taken on as the underpinnings of Active Record and is now required for Rails.  Arel provides an SQL abstraction that simplifies out Active Record and provides the underpinnings for the relation functionality in Active Record.
+"Arel":http://github.com/brynary/arel (or Active Relation) has been taken on as the underpinnings of Active Record and is now required for Rails.  Arel provides an SQL abstraction that simplifies out Active Record and provides the underpinnings for the relation functionality in Active Record.
 
 More information: - "Why I wrote Arel":http://magicscalingsprinkles.wordpress.com/2010/01/28/why-i-wrote-arel/.
 
-- 
cgit v1.2.3


From f1e5642fb7e99ed5c26e863596bc2ea1e7176fba Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 5 Feb 2010 09:12:35 -0800
Subject: Revert "Link to main Arel repository"

This reverts commit 203626867934a2772a5a3f096521b56d59273407.
---
 railties/guides/source/3_0_release_notes.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/guides/source/3_0_release_notes.textile')

diff --git a/railties/guides/source/3_0_release_notes.textile b/railties/guides/source/3_0_release_notes.textile
index 7679302ff9..5e96f8cf06 100644
--- a/railties/guides/source/3_0_release_notes.textile
+++ b/railties/guides/source/3_0_release_notes.textile
@@ -8,7 +8,7 @@ Even if you don't give a hoot about any of our internal cleanups, Rails 3.0 is g
 
 * Brand new router with an emphasis on RESTful declarations
 * New Action Mailer API modelled after Action Controller (now without the agonizing pain of sending multipart messages!)
-* New Active Record chainable query language built on top of "Arel":http://github.com/brynary/arel, a relational algebra engine
+* New Active Record chainable query language built on top of relational algebra
 * Unobtrusive JavaScript helpers with drivers for Prototype, jQuery, and more coming (end of inline JS)
 * Explicit dependency management with Bundler
 
@@ -131,7 +131,7 @@ More Information: - "Rails Edge Architecture":http://yehudakatz.com/2009/06/11/r
 
 h4. Arel Integration
 
-"Arel":http://github.com/brynary/arel (or Active Relation) has been taken on as the underpinnings of Active Record and is now required for Rails.  Arel provides an SQL abstraction that simplifies out Active Record and provides the underpinnings for the relation functionality in Active Record.
+"Arel":http://github.com/rails/arel (or Active Relation) has been taken on as the underpinnings of Active Record and is now required for Rails.  Arel provides an SQL abstraction that simplifies out Active Record and provides the underpinnings for the relation functionality in Active Record.
 
 More information: - "Why I wrote Arel":http://magicscalingsprinkles.wordpress.com/2010/01/28/why-i-wrote-arel/.
 
-- 
cgit v1.2.3


From f44a0b1d524064a2e919cd10d3013db680af9b17 Mon Sep 17 00:00:00 2001
From: RomD <romd86@gmail.com>
Date: Sat, 6 Feb 2010 17:18:10 +0100
Subject: fix usage examples and more to use new invocations

Signed-off-by: Carl Lerche <carllerche@mac.com>
---
 railties/guides/source/3_0_release_notes.textile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties/guides/source/3_0_release_notes.textile')

diff --git a/railties/guides/source/3_0_release_notes.textile b/railties/guides/source/3_0_release_notes.textile
index 5e96f8cf06..1624172176 100644
--- a/railties/guides/source/3_0_release_notes.textile
+++ b/railties/guides/source/3_0_release_notes.textile
@@ -39,8 +39,8 @@ h4. script/* replaced by script/rails
 The new <tt>script/rails</tt> replaces all the scripts that used to be in the <tt>script</tt> directory. You do not run <tt>script/rails</tt> directly though, the +rails+ command detects it is being invoked in the root of a Rails application and runs the script for you. Intended usage is:
 
 <shell>
-rails console                      # => ./script/console
-rails g scaffold post title:string # => ./script/generate scaffold post title:string
+rails console                      # => ./script/rails console
+rails g scaffold post title:string # => ./script/rails generate scaffold post title:string
 </shell>
 
 Run rails --help for a list of all the options.
@@ -557,4 +557,4 @@ h3. Credits
 
 See the "full list of contributors to Rails":http://contributors.rubyonrails.org/ for the many people who spent many hours making Rails 3.  Kudos to all of them.
 
-Rails 3.0 Release Notes were compiled by "Mikel Lindsaar":http://lindsaar.net.
\ No newline at end of file
+Rails 3.0 Release Notes were compiled by "Mikel Lindsaar":http://lindsaar.net.
-- 
cgit v1.2.3


From d6ae930c9cfacf50d65b2880ac21efe80801a33d Mon Sep 17 00:00:00 2001
From: RomD <romd86@gmail.com>
Date: Sun, 7 Feb 2010 04:56:19 +0100
Subject: fix ambiguous example for new invocation method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 railties/guides/source/3_0_release_notes.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/guides/source/3_0_release_notes.textile')

diff --git a/railties/guides/source/3_0_release_notes.textile b/railties/guides/source/3_0_release_notes.textile
index 1624172176..639e775bf5 100644
--- a/railties/guides/source/3_0_release_notes.textile
+++ b/railties/guides/source/3_0_release_notes.textile
@@ -39,8 +39,8 @@ h4. script/* replaced by script/rails
 The new <tt>script/rails</tt> replaces all the scripts that used to be in the <tt>script</tt> directory. You do not run <tt>script/rails</tt> directly though, the +rails+ command detects it is being invoked in the root of a Rails application and runs the script for you. Intended usage is:
 
 <shell>
-rails console                      # => ./script/rails console
-rails g scaffold post title:string # => ./script/rails generate scaffold post title:string
+rails console                      # instead of script/console
+rails g scaffold post title:string # instead of script/generate scaffold post title:string
 </shell>
 
 Run rails --help for a list of all the options.
-- 
cgit v1.2.3

