3 files changed, 82 insertions, 2 deletions
diff --git a/guides/source/4_0_release_notes.textile b/guides/source/4_0_release_notes.textile
index b7ac11999a..895372ba63 100644
--- a/guides/source/4_0_release_notes.textile
+++ b/guides/source/4_0_release_notes.textile
@@ -122,6 +122,16 @@ h3. Action Pack
 
 h4. Action Controller
 
+* Add <tt>ActionController::Flash.add_flash_types</tt> method to allow people to register their own flash types. e.g.:
+
+<ruby>
+class ApplicationController
+  add_flash_types :error, :warning
+end
+</ruby>
+
+If you add the above code, you can use <tt><%= error %></tt> in an erb, and <tt>redirect_to /foo, :error => 'message'</tt> in a controller.
+
 * Remove Active Model dependency from Action Pack.
 
 * Support unicode characters in routes. Route will be automatically escaped, so instead of manually escaping:
@@ -186,6 +196,8 @@ h5(#actioncontroller_deprecations). Deprecations
 
 h4. Action Dispatch
 
+* Show routes in exception page while debugging a <tt>RoutingError</tt> in development.
+
 * Include <tt>mounted_helpers</tt> (helpers for accessing mounted engines) in <tt>ActionDispatch::IntegrationTest</tt> by default.
 
 * Added <tt>ActionDispatch::SSL</tt> middleware that when included force all the requests to be under HTTPS protocol.
diff --git a/guides/source/contributing_to_ruby_on_rails.textile b/guides/source/contributing_to_ruby_on_rails.textile
index 1dadce2083..fd5e2b28c0 100644
--- a/guides/source/contributing_to_ruby_on_rails.textile
+++ b/guides/source/contributing_to_ruby_on_rails.textile
@@ -66,12 +66,26 @@ Install first libxml2 and libxslt together with their development files for Noko
 $ sudo apt-get install libxml2 libxml2-dev libxslt1-dev
 </shell>
 
+If you are on Fedora or CentOS, you can run
+
+<shell>
+$ sudo yum install libxml2 libxml2-devel libxslt libxslt-devel
+</shell>
+
+If you have any problems with these libraries, you should install them manually compiling the source code. Just follow the instructions "here":http://nokogiri.org/tutorials/installing_nokogiri.html#red_hat__centos .
+
 Also, SQLite3 and its development files for the +sqlite3-ruby+ gem -- in Ubuntu you're done with just
 
 <shell>
 $ sudo apt-get install sqlite3 libsqlite3-dev
 </shell>
 
+And if you are on Fedora or CentOS, you're done with
+
+<shell>
+$ sudo yum install sqlite3 sqlite3-devel
+</shell>
+
 Get a recent version of "Bundler":http://gembundler.com/:
 
 <shell>
@@ -150,6 +164,13 @@ $ sudo apt-get install mysql-server libmysqlclient15-dev
 $ sudo apt-get install postgresql postgresql-client postgresql-contrib libpq-dev
 </shell>
 
+On Fedora or CentOS, just run:
+
+<shell>
+$ sudo yum install mysql-server mysql-devel
+$ sudo yum install postgresql-server postgresql-devel
+</shell>
+
 After that run:
 
 <shell>
@@ -172,7 +193,7 @@ and create the test databases:
 
 <shell>
 $ cd activerecord
-$ rake mysql:build_databases
+$ bundle exec rake mysql:build_databases
 </shell>
 
 PostgreSQL's authentication works differently. A simple way to set up the development environment for example is to run with your development account
@@ -185,7 +206,7 @@ and then create the test databases with
 
 <shell>
 $ cd activerecord
-$ rake postgresql:build_databases
+$ bundle exec rake postgresql:build_databases
 </shell>
 
 NOTE: Using the rake task to create the test databases ensures they have the correct character set and collation.
diff --git a/guides/source/migrations.textile b/guides/source/migrations.textile
index 342b5a4d57..06e85e5914 100644
--- a/guides/source/migrations.textile
+++ b/guides/source/migrations.textile
@@ -111,6 +111,7 @@ Active Record provides methods that perform common data definition tasks in a
 database independent way (you'll read about them in detail later):
 
 * +add_column+
+* +add_reference+
 * +add_index+
 * +change_column+
 * +change_table+
@@ -120,6 +121,7 @@ database independent way (you'll read about them in detail later):
 * +remove_column+
 * +remove_index+
 * +rename_column+
+* +remove_reference+
 
 If you need to perform tasks specific to your database (for example create a
 "foreign key":#active-record-and-referential-integrity constraint) then the
@@ -332,6 +334,51 @@ NOTE: The generated migration file for destructive migrations will still be
 old-style using the +up+ and +down+ methods. This is because Rails needs to know
 the original data types defined when you made the original changes.
 
+Also the generator accepts column type as +references+(also available as +belongs_to+), for instance
+
+<shell>
+$ rails generate migration AddUserRefToProducts user:references
+</shell>
+
+generates
+
+<ruby>
+class AddUserRefToProducts < ActiveRecord::Migration
+  def change
+    add_reference :products, :user, :index => true
+  end
+end
+</ruby>
+
+This migration will create a user_id column and appropriate index.
+
+h4. Supported type modifiers
+
+You can also specify some options just after the field type between curly braces. You can use the
+following modifiers:
+
+* +limit+        Sets the maximum size of the +string/text/binary/integer+ fields
+* +precision+    Defines the precision for the +decimal+ fields
+* +scale+        Defines the scale for the +decimal+ fields
+* +polymorphic+  Adds a +type+ column for +belongs_to+ associations
+
+For instance running
+
+<shell>
+$ rails generate migration AddDetailsToProducts price:decimal{5,2} supplier:references{polymorphic}
+</shell>
+
+will produce a migration that looks like this
+
+<ruby>
+class AddDetailsToProducts < ActiveRecord::Migration
+  def change
+		add_column :products, :price, :precision => 5, :scale => 2
+    add_reference :products, :user, :polymorphic => true, :index => true
+  end
+end
+</ruby>
+
 h3. Writing a Migration
 
 Once you have created your migration using one of the generators it's time to