Permalink
Browse files

Merge branch 'master' of git@github.com:lifo/docrails

  • Loading branch information...
2 parents 13307e4 + f6360ba commit 46fac72e4e79f03641e049136e7d164ecbb6e710 @FotoVerite FotoVerite committed Sep 22, 2008
Showing with 11 additions and 3 deletions.
  1. +2 −2 activerecord/lib/active_record/validations.rb
  2. +2 −1 railties/Rakefile
  3. +7 −0 railties/doc/guides/index.txt
@@ -642,7 +642,7 @@ def validates_length_of(*attrs)
#
# 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 @@ def validates_length_of(*attrs)
# 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,
View
@@ -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.
@@ -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]

0 comments on commit 46fac72

Please sign in to comment.