diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-12 19:22:40 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-12 19:22:40 -0700 |
| commit | 2978af8a7466dbb47f390785b1740462d94821df (patch) | |
| tree | 41727e61a4ce25999b6d5151c4c05ac9185d4132 /guides | |
| parent | 081e4aad70015c0cf2adcaae3ca2cd57ff463f0f (diff) | |
| parent | ce46f20d13ca1b45dfd499c359ee8bce7abce1ae (diff) | |
| download | rails-2978af8a7466dbb47f390785b1740462d94821df.tar.gz rails-2978af8a7466dbb47f390785b1740462d94821df.tar.bz2 rails-2978af8a7466dbb47f390785b1740462d94821df.zip | |
Merge pull request #12507 from malavbhavsar/doc_patch
Some fixes in docs [ci skip]
Diffstat (limited to 'guides')
| -rw-r--r-- | guides/source/action_view_overview.md | 2 | ||||
| -rw-r--r-- | guides/source/active_record_basics.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/action_view_overview.md b/guides/source/action_view_overview.md index 94aa0f8502..d19dd11181 100644 --- a/guides/source/action_view_overview.md +++ b/guides/source/action_view_overview.md @@ -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 --------------- diff --git a/guides/source/active_record_basics.md b/guides/source/active_record_basics.md index 34baae509b..a184f0753d 100644 --- a/guides/source/active_record_basics.md +++ b/guides/source/active_record_basics.md @@ -116,7 +116,7 @@ to Active Record instances: locking](http://api.rubyonrails.org/classes/ActiveRecord/Locking.html) to a model. * `type` - Specifies that the model uses [Single Table - Inheritance](http://api.rubyonrails.org/classes/ActiveRecord/Base.html). + Inheritance](http://api.rubyonrails.org/classes/ActiveRecord/Base.html#label-Single+table+inheritance). * `(association_name)_type` - Stores the type for [polymorphic associations](association_basics.html#polymorphic-associations). * `(table_name)_count` - Used to cache the number of belonging objects on |