Skip to content

Commit 84ff994

Browse files
committed
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
2 parents d052a00 + 503741f commit 84ff994

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

frontend/asset_mapper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1028,7 +1028,7 @@ you pass to ``importmap()``.
10281028

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

reference/forms/types/entity.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ instead of the ``default`` entity manager.
175175
**type**: ``Doctrine\ORM\QueryBuilder`` or a ``callable`` **default**: ``null``
176176

177177
Allows you to create a custom query for your choices. See
178-
:ref:`ref-form-entity-query-builder` for an example.
178+
:ref:`how to use it <ref-form-entity-query-builder>` for an example.
179179

180180
The value of this option can either be a ``QueryBuilder`` object, a callable or
181181
``null`` (which will load all entities). When using a callable, you will be
@@ -212,7 +212,7 @@ submitted.
212212

213213
Instead of allowing the `class`_ and `query_builder`_ options to fetch the
214214
entities to include for you, you can pass the ``choices`` option directly.
215-
See :ref:`reference-forms-entity-choices`.
215+
See :ref:`how to use choices <reference-forms-entity-choices>`.
216216

217217
``data_class``
218218
~~~~~~~~~~~~~~

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@ This will still render an empty text box, but upon submission the ``John Doe``
1515
value will be set. Use the ``data`` or ``placeholder`` options to show this
1616
initial value in the rendered form.
1717

18-
If a form is compound, you can set ``empty_data`` as an array, object or
19-
closure. See the :doc:`/form/use_empty_data` article for more details about
20-
these options.
21-
2218
.. note::
2319

24-
If you want to set the ``empty_data`` option for your entire form class,
25-
see the :doc:`/form/use_empty_data` article.
20+
If a form is compound, you can set ``empty_data`` as an array, object or
21+
closure. This option can be set for your entire form class, see the
22+
:doc:`/form/use_empty_data` article for more details about these
23+
options.
2624

2725
.. caution::
2826

0 commit comments

Comments
 (0)