aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorArthur Nogueira Neves <github@arthurnn.com>2016-02-02 15:44:33 -0500
committerArthur Nogueira Neves <github@arthurnn.com>2016-02-02 15:44:33 -0500
commit6704a9be7e1df9dc8458eae332b40f23959e0d7b (patch)
tree4eba5b0d850b0a5a84dd095c4a5eacfaffb41e7f /guides
parentd34db3d7e695cad08963f3979aa39492b1f433c4 (diff)
parent789fabf01f13fa30dd5791baf77cd51e6199eeab (diff)
downloadrails-6704a9be7e1df9dc8458eae332b40f23959e0d7b.tar.gz
rails-6704a9be7e1df9dc8458eae332b40f23959e0d7b.tar.bz2
rails-6704a9be7e1df9dc8458eae332b40f23959e0d7b.zip
Merge pull request #23433 from BillyZac/master
Fix typo.
Diffstat (limited to 'guides')
-rw-r--r--guides/source/getting_started.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/getting_started.md b/guides/source/getting_started.md
index 3392dad897..2cbc591629 100644
--- a/guides/source/getting_started.md
+++ b/guides/source/getting_started.md
@@ -767,7 +767,7 @@ Why do you have to bother? The ability to grab and automatically assign all
controller parameters to your model in one shot makes the programmer's job
easier, but this convenience also allows malicious use. What if a request to
the server was crafted to look like a new article form submit but also included
-extra fields with values that violated your applications integrity? They would
+extra fields with values that violated your application's integrity? They would
be 'mass assigned' into your model and then into the database along with the
good stuff - potentially breaking your application or worse.
@@ -1540,7 +1540,7 @@ This is very similar to the `Article` model that you saw earlier. The difference
is the line `belongs_to :article`, which sets up an Active Record _association_.
You'll learn a little about associations in the next section of this guide.
-The (`:references`) keyword used in the bash command is a special data type for models.
+The (`:references`) keyword used in the bash command is a special data type for models.
It creates a new column on your database table with the provided model name appended with an `_id`
that can hold integer values. You can get a better understanding after analyzing the
`db/schema.rb` file below.