aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/active_record_basics.md
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-12-01 23:00:47 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-12-01 23:00:47 +0530
commit0181c2da977fc3de4e4c4eac602b26ff180cda2c (patch)
tree4ff327e807bc7729c5b99bf261bdbc5178faf227 /guides/source/active_record_basics.md
parentfb42520252477d83560f2e2a2550c7f377e07bc1 (diff)
parent9685019c4a15eb0222984748e7413dc5920195f4 (diff)
downloadrails-0181c2da977fc3de4e4c4eac602b26ff180cda2c.tar.gz
rails-0181c2da977fc3de4e4c4eac602b26ff180cda2c.tar.bz2
rails-0181c2da977fc3de4e4c4eac602b26ff180cda2c.zip
Merge branch 'master' of github.com:lifo/docrails
Conflicts: guides/source/active_record_validations.md
Diffstat (limited to 'guides/source/active_record_basics.md')
-rw-r--r--guides/source/active_record_basics.md14
1 files changed, 8 insertions, 6 deletions
diff --git a/guides/source/active_record_basics.md b/guides/source/active_record_basics.md
index 810a0263c0..cb64cf39f3 100644
--- a/guides/source/active_record_basics.md
+++ b/guides/source/active_record_basics.md
@@ -1,13 +1,15 @@
Active Record Basics
====================
-This guide is an introduction to Active Record. After reading this guide we hope that you'll learn:
+This guide is an introduction to Active Record.
-* What Object Relational Mapping and Active Record are and how they are used in Rails
-* How Active Record fits into the Model-View-Controller paradigm
-* How to use Active Record models to manipulate data stored in a relational database
-* Active Record schema naming conventions
-* The concepts of database migrations, validations and callbacks
+After reading this guide, you will know:
+
+* What Object Relational Mapping and Active Record are and how they are used in Rails.
+* How Active Record fits into the Model-View-Controller paradigm.
+* How to use Active Record models to manipulate data stored in a relational database.
+* Active Record schema naming conventions.
+* The concepts of database migrations, validations and callbacks.
--------------------------------------------------------------------------------