aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2016-05-10 01:30:44 +0530
committerVipul A M <vipulnsward@gmail.com>2016-05-10 01:30:44 +0530
commitd7e4083437a94e22389499076b87dd9110302861 (patch)
treeb909be87d41de1853523d7ed11770620ae92afbe
parenteff5784274725ad1e1a406b9c182d317ee3ed243 (diff)
parent95f7629b2b3e1111c64263d3efce3be072dd5101 (diff)
downloadrails-d7e4083437a94e22389499076b87dd9110302861.tar.gz
rails-d7e4083437a94e22389499076b87dd9110302861.tar.bz2
rails-d7e4083437a94e22389499076b87dd9110302861.zip
Merge pull request #24942 from bvsatyaram/feature-getting-started-guide
Feature getting started guide [ci skip]
-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 13b4763b6f..af168fdfc6 100644
--- a/guides/source/getting_started.md
+++ b/guides/source/getting_started.md
@@ -390,7 +390,7 @@ create and read. The form for doing this will look like this:
It will look a little basic for now, but that's ok. We'll look at improving the
styling for it afterwards.
-### Laying down the ground work
+### Laying down the groundwork
Firstly, you need a place within the application to create a new article. A
great place for that would be at `/articles/new`. With the route already
@@ -474,7 +474,7 @@ one here because the `ArticlesController` inherits from `ApplicationController`.
The next part of the message contains a hash. The `:locale` key in this hash
simply indicates which spoken language template should be retrieved. By default,
this is the English - or "en" - template. The next key, `:formats` specifies the
-format of template to be served in response. The default format is `:html`, and
+format of the template to be served in response. The default format is `:html`, and
so Rails is looking for an HTML template. The final key, `:handlers`, is telling
us what _template handlers_ could be used to render our template. `:erb` is most
commonly used for HTML templates, `:builder` is used for XML templates, and