aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/assertions
diff options
context:
space:
mode:
authorJoshua French <jfrench@osake-2.local>2008-05-21 15:39:34 -0500
committerJoshua French <jfrench@osake-2.local>2008-05-21 15:39:34 -0500
commit981bb9bcccf744bd1515b716865b645dd5110948 (patch)
treea5358feb3b928dea279f74612855cf09e27fb01a /actionpack/lib/action_controller/assertions
parent066b56149c56b2ea0ebec4c92c9d825edbfb6607 (diff)
parent49738f000b9c7e2902cf17e5e13943e5015f91b8 (diff)
downloadrails-981bb9bcccf744bd1515b716865b645dd5110948.tar.gz
rails-981bb9bcccf744bd1515b716865b645dd5110948.tar.bz2
rails-981bb9bcccf744bd1515b716865b645dd5110948.zip
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/assertions')
-rw-r--r--actionpack/lib/action_controller/assertions/model_assertions.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/assertions/model_assertions.rb b/actionpack/lib/action_controller/assertions/model_assertions.rb
index 0b4313055a..d25214bb66 100644
--- a/actionpack/lib/action_controller/assertions/model_assertions.rb
+++ b/actionpack/lib/action_controller/assertions/model_assertions.rb
@@ -1,7 +1,8 @@
module ActionController
module Assertions
module ModelAssertions
- # Ensures that the passed record is valid by ActiveRecord standards and returns any error messages if it is not.
+ # Ensures that the passed record is valid by Active Record standards and
+ # returns any error messages if it is not.
#
# ==== Examples
#