Merge branch '5.2' into 5.3

* 5.2:
  Adding label_html for asterisk

Author: javiereguiluz

form/bootstrap4.rst

@@ -88,6 +88,13 @@ is a strong connection between the error and its ``<input>``, as required by the
 ``form_label()`` internally. If you call to ``form_errors()`` in your template,
 you'll get the error messages displayed *twice*.
 
+.. tip::
+
+    Since form errors are rendered *inside* the ``<label>``, you cannot use CSS
+    ``:after`` to append an asterisk to the label, because it would be displayed
+    after the error message. Use the :ref:`label <reference-form-option-label>`
+    or :ref:`label_html <reference-form-option-label-html>` options instead.
+
 Checkboxes and Radios
 ---------------------
 

reference/forms/types/form.rst

@@ -179,8 +179,12 @@ of the form type tree (i.e. it cannot be used as a form type on its own).
 
 .. include:: /reference/forms/types/options/disabled.rst.inc
 
+.. _reference-form-option-label:
+
 .. include:: /reference/forms/types/options/label.rst.inc
 
+.. _reference-form-option-label-html:
+
 .. include:: /reference/forms/types/options/label_html.rst.inc
 
 .. include:: /reference/forms/types/options/row_attr.rst.inc