diff options
| -rw-r--r-- | activerecord/lib/active_record/validations.rb | 4 | ||||
| -rw-r--r-- | railties/Rakefile | 3 | ||||
| -rw-r--r-- | railties/doc/guides/index.txt | 7 |
3 files changed, 11 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb index 73d9b36fc2..8481706074 100644 --- a/activerecord/lib/active_record/validations.rb +++ b/activerecord/lib/active_record/validations.rb @@ -642,7 +642,7 @@ module ActiveRecord # # Using this validation method in conjunction with ActiveRecord::Base#save # does not guarantee the absence of duplicate record insertions, because - # uniqueness checks on the application level are inherently prone to racing + # uniqueness checks on the application level are inherently prone to race # conditions. For example, suppose that two users try to post a Comment at # the same time, and a Comment's title must be unique. At the database-level, # the actions performed by these users could be interleaved in the following manner: @@ -685,7 +685,7 @@ module ActiveRecord # do that efficiently), and thus not recommended. # - Creating a unique index on the field, by using # ActiveRecord::ConnectionAdapters::SchemaStatements#add_index. In the - # rare case that a racing condition occurs, the database will guarantee + # rare case that a race condition occurs, the database will guarantee # the field's uniqueness. # # When the database catches such a duplicate insertion, diff --git a/railties/Rakefile b/railties/Rakefile index be37023a1d..e279bf922e 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -285,7 +285,8 @@ guides = [ { 'forms' =>'form_helpers' }, { 'activerecord' => 'association_basics' }, { 'debugging' => 'debugging_rails_applications' }, - { 'caching' => 'caching_with_rails' } + { 'caching' => 'caching_with_rails' }, + { 'benchmarking_and_profiling' => 'preamble' } ] guides_html_files = [] # autogenerated from the 'guides' variable. diff --git a/railties/doc/guides/index.txt b/railties/doc/guides/index.txt index 402037a7d1..78228ea4a0 100644 --- a/railties/doc/guides/index.txt +++ b/railties/doc/guides/index.txt @@ -53,6 +53,13 @@ link:http://rails.lighthouseapp.com/projects/16213/tickets/1[Lighthouse Ticket] Guide to using built in Form helpers. *********************************************************** +.link:benchmarking_and_profiling/preamble.html[Benchmarking and Profiling Rails Applications] +*********************************************************** +link:http://rails.lighthouseapp.com/projects/16213/tickets/4[Lighthouse Ticket] + +TODO: Insert some description here. +*********************************************************** + .link:testing_rails_applications/testing_rails_applications.html[Testing Rails Applications] *********************************************************** link:http://rails.lighthouseapp.com/projects/16213/tickets/8[Lighthouse Ticket] |