diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-07-31 11:55:24 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-07-31 11:55:24 +0200 |
| commit | 3d7099891f07395ed889e7da9e13b3ff9244d539 (patch) | |
| tree | 6a988362ec4a6b58c90a12e6b715cd6926a111ce /railties/guides/source | |
| parent | 0e20e3ebc20250174867f33e0ad3972f7e7c76d0 (diff) | |
| parent | d3819daaac0d2f730f2b34af31700c914e697375 (diff) | |
| download | rails-3d7099891f07395ed889e7da9e13b3ff9244d539.tar.gz rails-3d7099891f07395ed889e7da9e13b3ff9244d539.tar.bz2 rails-3d7099891f07395ed889e7da9e13b3ff9244d539.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'railties/guides/source')
| -rw-r--r-- | railties/guides/source/contributing_to_rails.textile | 2 | ||||
| -rw-r--r-- | railties/guides/source/initialization.textile | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/railties/guides/source/contributing_to_rails.textile b/railties/guides/source/contributing_to_rails.textile index 094a4ef1a9..fb81bab98d 100644 --- a/railties/guides/source/contributing_to_rails.textile +++ b/railties/guides/source/contributing_to_rails.textile @@ -69,7 +69,7 @@ All of the Rails tests must pass with any code you submit, otherwise you have no NOTE: Ensure you install bundler v1.0 <shell> -gem install -v=1.0.0.rc.1 bundler +gem install -v=1.0.0.rc.2 bundler bundle install --without db </shell> diff --git a/railties/guides/source/initialization.textile b/railties/guides/source/initialization.textile index 28afdb3bd0..f80c00b280 100644 --- a/railties/guides/source/initialization.textile +++ b/railties/guides/source/initialization.textile @@ -118,7 +118,7 @@ Now with Rails 3 we have a Gemfile which defines the basics our application need # Bundle the extra gems: # gem 'bj' - # gem 'nokogiri', '1.4.1' + # gem 'nokogiri' # gem 'sqlite3-ruby', :require => 'sqlite3' # gem 'aws-s3', :require => 'aws/s3' @@ -141,13 +141,13 @@ Here the only two gems we need are +rails+ and +sqlite3-ruby+, so it seems. This * activesupport-3.0.0.beta4.gem * arel-0.4.0.gem * builder-2.1.2.gem -* bundler-1.0.0.beta.5.gem +* bundler-1.0.0.rc.2.gem * erubis-2.6.6.gem * i18n-0.4.1.gem * mail-2.2.5.gem * memcache-client-1.8.5.gem * mime-types-1.16.gem -* nokogiri-1.4.2.gem +* nokogiri-1.4.3.1.gem * polyglot-0.3.1.gem * rack-1.2.1.gem * rack-mount-0.6.9.gem |