aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/action_view_overview.md
diff options
context:
space:
mode:
authoraditya-kapoor <aditya.kapoor@vinsol.com>2013-12-10 11:44:07 +0530
committeraditya-kapoor <aditya.kapoor@vinsol.com>2013-12-10 11:44:07 +0530
commit0c55335074ed7baf2f165ada168f726f1f7bba68 (patch)
tree2a8428d72f6890cb0eb6c5b9b1d40b7b2ce93d8b /guides/source/action_view_overview.md
parent6b9b0767bf480d53029afeb3f8e86f66e933fb41 (diff)
parentfe077b50c9ce65c4ac1cc718c34dda45cd24c6fe (diff)
downloadrails-0c55335074ed7baf2f165ada168f726f1f7bba68.tar.gz
rails-0c55335074ed7baf2f165ada168f726f1f7bba68.tar.bz2
rails-0c55335074ed7baf2f165ada168f726f1f7bba68.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'guides/source/action_view_overview.md')
-rw-r--r--guides/source/action_view_overview.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/action_view_overview.md b/guides/source/action_view_overview.md
index 5cda104138..d19dd11181 100644
--- a/guides/source/action_view_overview.md
+++ b/guides/source/action_view_overview.md
@@ -68,7 +68,7 @@ Consider the following loop for names:
```html+erb
<h1>Names of all the people</h1>
<% @people.each do |person| %>
- Name: <%= person.name %><br/>
+ Name: <%= person.name %><br>
<% end %>
```
@@ -269,7 +269,7 @@ Rails will render the `_product_ruler` partial (with no data passed to it) betwe
### Layouts
-Layouts can be used to render a common view template around the results of Rails controller actions. Typically, every Rails has a couple of overall layouts that most pages are rendered within. For example, a site might have a layout for a logged in user, and a layout for the marketing or sales side of the site. The logged in user layout might include top-level navigation that should be present across many controller actions. The sales layout for a SaaS app might include top-level navigation for things like "Pricing" and "Contact Us." You would expect each layout to have a different look and feel. You can read more details about Layouts in the [Layouts and Rendering in Rails](layouts_and_rendering.html) guide.
+Layouts can be used to render a common view template around the results of Rails controller actions. Typically, every Rails application has a couple of overall layouts that most pages are rendered within. For example, a site might have a layout for a logged in user, and a layout for the marketing or sales side of the site. The logged in user layout might include top-level navigation that should be present across many controller actions. The sales layout for a SaaS app might include top-level navigation for things like "Pricing" and "Contact Us." You would expect each layout to have a different look and feel. You can read more details about Layouts in the [Layouts and Rendering in Rails](layouts_and_rendering.html) guide.
Partial Layouts
---------------