@@ -1614,6 +1614,6 @@ Learn more from the Cookbook
 .. _`Symfony2 Form Component`: https://.com/symfony/Form
 .. _`DateTime`: http://php.net/manual/en/class.datetime.php
 .. _`Twig Bridge`: https://.com/symfony/symfony/tree/master/src/Symfony/Bridge/Twig
-.. _`form_div_layout.html.twig`: https://.com/symfony/symfony/blob/2.0/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
+.. _`form_div_layout.html.twig`: https://.com/symfony/symfony/blob/2.1/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
 .. _`Cross-site request forgery`: http://en.wikipedia.org/wiki/Cross-site_request_forgery
 .. _`view on `: https://.com/symfony/symfony/tree/master/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form

@@ -949,4 +949,4 @@ customizations directly. Look at the following example:
 The array passed as the second argument contains form "variables". For
 more details about this concept in Twig, see :ref:`twig-reference-form-variables`.
 
-.. _`form_div_layout.html.twig`: https://.com/symfony/symfony/blob/2.0/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
+.. _`form_div_layout.html.twig`: https://.com/symfony/symfony/blob/2.1/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig

@@ -771,5 +771,5 @@ For an example, see the ``EntityInitializer`` class inside the Doctrine Bridge.
 
 .. _`Twig's documentation`: http://twig.sensiolabs.org/doc/advanced.html#creating-an-extension
 .. _`Twig official extension repository`: http://.com/fabpot/Twig-extensions
-.. _`KernelEvents`: https://.com/symfony/symfony/blob/2.0/src/Symfony/Component/HttpKernel/KernelEvents.php
+.. _`KernelEvents`: https://.com/symfony/symfony/blob/2.1/src/Symfony/Component/HttpKernel/KernelEvents.php
 .. _`SwiftMailer's Plugin Documentation`: http://swiftmailer.org/docs/plugins.html

@@ -120,18 +120,25 @@ not be immediately clear, but they're incredibly powerful. Whenever you
 render any part of a form, the block that renders it makes use of a number
 of variables. By default, these blocks live inside `form_div_layout.html.twig`_.
 
-Look at the ``generic_label`` as an example:
+Look at the ``form_label`` as an example:
 
 .. code-block:: jinja
 
-{% block generic_label %}
+{% block form_label %}
+{% if not compound %}
+{% set label_attr = label_attr|merge({'for': id}) %}
+{% endif %}
 {% if required %}
-{% set attr = attr|merge({'class': attr.class|default('') ~ ' required'}) %}
+{% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' required')|trim}) %}
+{% endif %}
+{% if label is empty %}
+{% set label = name|humanize %}
 {% endif %}
-<label{% for attrname,attrvalue in attr %} {{attrname}}="{{attrvalue}}"{% endfor %}>{{ label|trans }}</label>
-{% endblock %}
+<label{% for attrname, attrvalue in label_attr %} {{ attrname }}="{{ attrvalue }}"{% endfor %}>{{ label|trans({}, translation_domain) }}</label>
+{% endblock form_label %}
 
-This block makes use of 3 variables: ``required``, ``attr`` and ``label``.
+This block makes use of several variables: ``compound``, ``label_attr``, ``required``,
+``label``, ``name`` and ``translation_domain``.
 These variables are made available by the form rendering system. But more
 importantly, these are the variables that you can override when calling ``form_label``
 (since in this example, you're rendering the label).
@@ -162,4 +169,4 @@ to see what options you have available.
 {# does **not** work - the variables are not recursive #}
 {{ form_widget(form, { 'attr': {'class': 'foo'} }) }}
 
-.. _`form_div_layout.html.twig`: https://.com/symfony/symfony/blob/2.0/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
+.. _`form_div_layout.html.twig`: https://.com/symfony/symfony/blob/2.1/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig