Merge branch '7.0' into 7.1

* 7.0:
  [AssetMapper] Minor syntax fix
  [Reference] Form empty data option - Update repetitive text
  add-label-for-links-entityType

Author: OskarStark

frontend/asset_mapper.rst

@@ -1028,7 +1028,7 @@ you pass to ``importmap()``.
 
     If you look at the source of your page, by default, the ``<script type="module">``
     from ``importmap()`` will contain ``import 'app';`` - not something like
-    ``import ``/assets/app-4e986c1a2318dd050b1d47.js``. Both would work - but
+    ``import /assets/app-4e986c1a2318dd050b1d47.js``. Both would work - but
     because ``app`` appears in your ``importmap.php``, the browser will read ``app``
     from the ``importmap`` on the page and ultimately load ``/assets/app-4e986c1a2318dd050b1d47.js``
 

reference/forms/types/entity.rst

@@ -175,7 +175,7 @@ instead of the ``default`` entity manager.
 **type**: ``Doctrine\ORM\QueryBuilder`` or a ``callable`` **default**: ``null``
 
 Allows you to create a custom query for your choices. See
-:ref:`ref-form-entity-query-builder` for an example.
+:ref:`how to use it <ref-form-entity-query-builder>` for an example.
 
 The value of this option can either be a ``QueryBuilder`` object, a callable or
 ``null`` (which will load all entities). When using a callable, you will be
@@ -212,7 +212,7 @@ submitted.
 
 Instead of allowing the `class`_ and `query_builder`_ options to fetch the
 entities to include for you, you can pass the ``choices`` option directly.
-See :ref:`reference-forms-entity-choices`.
+See :ref:`how to use choices <reference-forms-entity-choices>`.
 
 ``data_class``
 ~~~~~~~~~~~~~~

reference/forms/types/options/empty_data_description.rst.inc

@@ -15,14 +15,12 @@ This will still render an empty text box, but upon submission the ``John Doe``
 value will be set. Use the ``data`` or ``placeholder`` options to show this
 initial value in the rendered form.
 
-If a form is compound, you can set ``empty_data`` as an array, object or
-closure. See the :doc:`/form/use_empty_data` article for more details about
-these options.
-
 .. note::
 
-    If you want to set the ``empty_data`` option for your entire form class,
-    see the :doc:`/form/use_empty_data` article.
+    If a form is compound, you can set ``empty_data`` as an array, object or
+    closure. This option can be set for your entire form class, see the
+    :doc:`/form/use_empty_data` article for more details about these
+    options.
 
 .. caution::