aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorAbdelkader Boudih <terminale@gmail.com>2015-02-23 15:46:09 +0000
committerAbdelkader Boudih <terminale@gmail.com>2015-02-23 15:46:09 +0000
commit12afb78b1c2bf47a054290634e70fb8a0305c846 (patch)
treec8780b47dba35e391df622a563921d26752c66ce /guides
parent069c03b2d1909b331dd8aaa3e07aaea989a2d6e6 (diff)
parent53a9c669d471abeb38836b1d785a3d5a95cc79a1 (diff)
downloadrails-12afb78b1c2bf47a054290634e70fb8a0305c846.tar.gz
rails-12afb78b1c2bf47a054290634e70fb8a0305c846.tar.bz2
rails-12afb78b1c2bf47a054290634e70fb8a0305c846.zip
Merge pull request #19046 from yui-knk/fix/orm
[ci skip] Fix `Object-Relational` to `Object Relational`
Diffstat (limited to 'guides')
-rw-r--r--guides/source/active_record_basics.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/active_record_basics.md b/guides/source/active_record_basics.md
index a5196e481e..bd8cdf62f2 100644
--- a/guides/source/active_record_basics.md
+++ b/guides/source/active_record_basics.md
@@ -38,7 +38,7 @@ object on how to write to and read from the database.
### Object Relational Mapping
-Object-Relational Mapping, commonly referred to as its abbreviation ORM, is
+Object Relational Mapping, commonly referred to as its abbreviation ORM, is
a technique that connects the rich objects of an application to tables in
a relational database management system. Using ORM, the properties and
relationships of the objects in an application can be easily stored and