rails 4.1.4 → 4.2.11.3

data/guides/source/development_dependencies_install.md

@@ -45,36 +45,14 @@ $ cd rails
 
 The test suite must pass with any submitted code. No matter whether you are writing a new patch, or evaluating someone else's, you need to be able to run the tests.
 
-Install first libxml2 and libxslt together with their development files for Nokogiri. In Ubuntu that's
+Install first SQLite3 and its development files for the `sqlite3` gem. Mac OS X
+users are done with:
 
 ```bash
-$ sudo apt-get install libxml2 libxml2-dev libxslt1-dev
+$ brew install sqlite3
 ```
 
-If you are on Fedora or CentOS, you can run
-
-```bash
-$ sudo yum install libxml2 libxml2-devel libxslt libxslt-devel
-```
-
-If you are running Arch Linux, you're done with:
-
-```bash
-$ sudo pacman -S libxml2 libxslt
-```
-
-On FreeBSD, you just have to run:
-
-```bash
-# pkg_add -r libxml2 libxslt
-```
-
-Alternatively, you can install the `textproc/libxml2` and `textproc/libxslt`
-ports.
-
-If you have any problems with these libraries, you can install them manually by compiling the source code. Just follow the instructions at the [Red Hat/CentOS section of the Nokogiri tutorials](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
+In Ubuntu you're done with just:
 
 ```bash
 $ sudo apt-get install sqlite3 libsqlite3-dev
@@ -95,12 +73,12 @@ $ sudo pacman -S sqlite
 For FreeBSD users, you're done with:
 
 ```bash
-# pkg_add -r sqlite3
+# pkg install sqlite3
 ```
 
 Or compile the `databases/sqlite3` port.
 
-Get a recent version of [Bundler](http://gembundler.com/)
+Get a recent version of [Bundler](http://bundler.io/)
 
 ```bash
 $ gem install bundler
@@ -117,7 +95,7 @@ This command will install all dependencies except the MySQL and PostgreSQL Ruby
 
 NOTE: If you would like to run the tests that use memcached, you need to ensure that you have it installed and running.
 
-You can use homebrew to install memcached on OSX:
+You can use [Homebrew](http://brew.sh/) to install memcached on OS X:
 
 ```bash
 $ brew install memcached
@@ -135,6 +113,20 @@ Or use yum on Fedora or CentOS:
 $ sudo yum install memcached
 ```
 
+If you are running on Arch Linux:
+
+```bash
+$ sudo pacman -S memcached
+```
+
+For FreeBSD users, you're done with:
+
+```bash
+# pkg install memcached
+```
+
+Alternatively, you can compile the `databases/memcached` port.
+
 With the dependencies now installed, you can run the test suite with:
 
 ```bash
@@ -181,7 +173,19 @@ The Active Record test suite requires a custom config file: `activerecord/test/c
 
 #### MySQL and PostgreSQL
 
-To be able to run the suite for MySQL and PostgreSQL we need their gems. Install first the servers, their client libraries, and their development files. In Ubuntu just run
+To be able to run the suite for MySQL and PostgreSQL we need their gems. Install
+first the servers, their client libraries, and their development files.
+
+On OS X, you can run:
+
+```bash
+$ brew install mysql
+$ brew install postgresql
+```
+
+Follow the instructions given by Homebrew to start these.
+
+In Ubuntu just run:
 
 ```bash
 $ sudo apt-get install mysql-server libmysqlclient15-dev
@@ -206,8 +210,8 @@ $ sudo pacman -S postgresql postgresql-libs
 FreeBSD users will have to run the following:
 
 ```bash
-# pkg_add -r mysql56-client mysql56-server
-# pkg_add -r postgresql92-client postgresql92-server
+# pkg install mysql56-client mysql56-server
+# pkg install postgresql93-client postgresql93-server
 ```
 
 Or install them through ports (they are located under the `databases` folder).
@@ -241,20 +245,27 @@ and create the test databases:
 
 ```bash
 $ cd activerecord
-$ bundle exec rake mysql:build_databases
+$ bundle exec rake db:mysql:build
 ```
 
-PostgreSQL's authentication works differently. A simple way to set up the development environment for example is to run with your development account
+PostgreSQL's authentication works differently. To setup the development environment
+with your development account, on Linux or BSD, you just have to run:
 
 ```bash
 $ sudo -u postgres createuser --superuser $USER
 ```
 
-and then create the test databases with
+and for OS X:
+
+```bash
+$ createuser --superuser $USER
+```
+
+Then you need to create the test databases with
 
 ```bash
 $ cd activerecord
-$ bundle exec rake postgresql:build_databases
+$ bundle exec rake db:postgresql:build
 ```
 
 It is possible to build databases for both PostgreSQL and MySQL with

data/guides/source/documents.yaml

@@ -13,8 +13,8 @@
       url: active_record_basics.html
       description: This guide will get you started with models, persistence to database and the Active Record pattern and library.
     -
-      name: Rails Database Migrations
-      url: migrations.html
+      name: Active Record Migrations
+      url: active_record_migrations.html
       description: This guide covers how you can use Active Record migrations to alter your database in a structured and organized manner.
     -
       name: Active Record Validations
@@ -32,6 +32,11 @@
       name: Active Record Query Interface
       url: active_record_querying.html
       description: This guide covers the database query interface provided by Active Record.
+    -
+      name: Active Model basics
+      url: active_model_basics.html
+      description: This guide covers the use of model classes without Active Record.
+      work_in_progress: true
 -
   name: Views
   documents:
@@ -74,6 +79,10 @@
       name: Action Mailer Basics
       url: action_mailer_basics.html
       description: This guide describes how to use Action Mailer to send and receive emails.
+    -
+      name: Active Job Basics
+      url: active_job_basics.html
+      description: This guide provides you with all you need to get started in creating, enqueueing and executing background jobs.
     -
       name: Testing Rails Applications
       url: testing.html
@@ -95,11 +104,6 @@
       name: Rails Command Line Tools and Rake Tasks
       url: command_line.html
       description: This guide covers the command line tools and rake tasks provided by Rails.
-    -
-      name: Caching with Rails
-      work_in_progress: true
-      url: caching_with_rails.html
-      description: Various caching techniques provided by Rails.
     -
       name: Asset Pipeline
       url: asset_pipeline.html
@@ -118,6 +122,10 @@
       work_in_progress: true
       url: initialization.html
       description: This guide explains the internals of the Rails initialization process as of Rails 4
+    -
+      name: Autoloading and Reloading Constants
+      url: autoloading_and_reloading_constants.html
+      description: This guide documents how autoloading and reloading constants work.
 -
   name: Extending Rails
   documents:
@@ -163,6 +171,10 @@
       name: Upgrading Ruby on Rails
       url: upgrading_ruby_on_rails.html
       description: This guide helps in upgrading applications to latest Ruby on Rails versions.
+    -
+      name: Ruby on Rails 4.2 Release Notes
+      url: 4_2_release_notes.html
+      description: Release notes for Rails 4.2.
     -
       name: Ruby on Rails 4.1 Release Notes
       url: 4_1_release_notes.html