aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2013-01-15 03:10:05 -0800
committerXavier Noria <fxn@hashref.com>2013-01-15 03:10:05 -0800
commit210cd9b08c29c618063b8c36fe968c3ee187c145 (patch)
treecbb8b7f3cd6f17af7cf970dd4b9eefca6fd9b0d3
parent390ad458b46c0df105a0dd3381f5912b96ba8ea3 (diff)
parent86c4fe8191fc75930d2718ca9e5846a1d0657463 (diff)
downloadrails-210cd9b08c29c618063b8c36fe968c3ee187c145.tar.gz
rails-210cd9b08c29c618063b8c36fe968c3ee187c145.tar.bz2
rails-210cd9b08c29c618063b8c36fe968c3ee187c145.zip
Merge pull request #8949 from joneslee85/patch-2
ActiveRecord <-> Active Record [ci skip]
-rw-r--r--activemodel/README.rdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/README.rdoc b/activemodel/README.rdoc
index 3cc2d9ad8e..1b1fe2fa2b 100644
--- a/activemodel/README.rdoc
+++ b/activemodel/README.rdoc
@@ -1,7 +1,7 @@
= Active Model -- model interfaces for Rails
Active Model provides a known set of interfaces for usage in model classes.
-They allow for Action Pack helpers to interact with non-ActiveRecord models,
+They allow for Action Pack helpers to interact with non-Active Record models,
for example. Active Model also helps building custom ORMs for use outside of
the Rails framework.
@@ -11,7 +11,7 @@ code from Rails, or monkey patch entire helpers to make them handle objects
that did not exactly conform to the Active Record interface. This would result
in code duplication and fragile applications that broke on upgrades. Active
Model solves this by defining an explicit API. You can read more about the
-API in ActiveModel::Lint::Tests.
+API in <tt>ActiveModel::Lint::Tests</tt>.
Active Model provides a default module that implements the basic API required
to integrate with Action Pack out of the box: <tt>ActiveModel::Model</tt>.