diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 192b365bee..c1b1261ada 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -11,21 +11,25 @@ module ActionView
# Form helpers are designed to make working with resources much easier
# compared to using vanilla HTML.
#
- # Model-based forms are created with +form_for+. That method yields a form
+ # Forms for models are created with +form_for+. That method yields a form
# builder that knows the model the form is about. The form builder is thus
# able to generate default values for input fields that correspond to model
- # attributes, and also convenient element names, IDs, endpoints, etc.
+ # attributes, and also convenient names, IDs, endpoints, etc.
#
# Conventions in the generated field names allow controllers to receive form
# data nicely structured in +params+ with no effort on your side.
#
- # For example, to create a new +Person+ resource you typically set up a new
- # instance in PeopleController#new action, @person, and
- # write the form in new.html.erb this way:
+ # For example, to create a new person you typically set up a new instance of
+ # +Person+ in the PeopleController#new action, @person, and
+ # pass it to +form_for+:
#
# <%= form_for @person do |f| %>
- # <%= f.text_field :first_name %>
- # <%= f.text_field :last_name %>
+ # <%= f.label :first_name %>:
+ # <%= f.text_field :first_name %>
+ #
+ # <%= f.label :last_name %>:
+ # <%= f.text_field :last_name %>
+ #
# <%= f.submit %>
# <% end %>
#
@@ -35,16 +39,54 @@ module ActionView
#