Skip to content
Prev Previous commit
Some fixes
  • Loading branch information
wouterj committed Nov 25, 2014
commit 5ee97915cf8b0a92545f005d7a47a13186275c94
12 changes: 6 additions & 6 deletions book/forms.rst
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,10 @@ helper functions:
That's it! Just three lines are needed to render the complete form:

* ``form_start(form)`` - Renders the start tag of the form, including the
correct enctype attributes when using file uploads;
correct enctype attribute when using file uploads;

* ``form_widget(form)`` - Renders all fields, along with a label and error
message (if there is one) input element;
* ``form_widget(form)`` - Renders all of the fields, which includes the field
element itself, a label and any validation error messages for the field;

* ``form_end()`` - Renders the end tag of the form and any fields that have not
yet been rendered, in case you rendered each field yourself. This is useful
Expand Down Expand Up @@ -779,9 +779,9 @@ the other functions do?
``div`` element.

The majority of the work is done by the ``form_row`` helper, which renders
the label and HTML form widget of each field inside a ``div`` tag by default.
In the :ref:`form-theming` section, you'll learn how the ``form_row`` output
can be customized on many different levels.
the label, errors and HTML form widget of each field inside a ``div`` tag by
default. In the :ref:`form-theming` section, you'll learn how the ``form_row``
output can be customized on many different levels.

.. tip::

Expand Down
6 changes: 3 additions & 3 deletions book/http_fundamentals.rst
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ regardless of how your project is developed. To name a few:
about how that request should be handled (e.g. execute the ``contactAction()``
method);

* `Form </components/form/introduction>` - A full-featured and flexible
* :doc:`Form </components/form/introduction>` - A full-featured and flexible
framework for creating forms and handling form submissions;

* `Validator`_ - A system for creating rules about data and then validating
Expand All @@ -534,10 +534,10 @@ regardless of how your project is developed. To name a few:
templates, handling template inheritance (i.e. a template is decorated with
a layout) and performing other common template tasks;

* `Security </components/security/introduction>` - A powerful library for
* :doc:`Security </components/security/introduction>` - A powerful library for
handling all types of security inside an application;

* `Translation </components/translation/introduction>` - A framework for
* :doc:`Translation </components/translation/introduction>` - A framework for
translating strings in your application.

Each and every one of these components is decoupled and can be used in *any*
Expand Down