Skip to content

Commit a7a16c4

Browse files
committed
Applied (most of) the comments
1 parent 057c2a7 commit a7a16c4

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

reference/configuration/framework.rst

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Configuration
4848
* `lifetime`_
4949
* `matcher`_
5050
* `ip`_
51-
* `path`_
51+
* :ref:`path <profiler.matcher.path>`
5252
* `service`_
5353
* router
5454
* resource
@@ -242,8 +242,8 @@ default_locale
242242

243243
**type**: ``string`` **default**: ``'en'``
244244

245-
If the locale can't be determined from the Request or session, the default
246-
locale will be used. It becomes the service container parameter called
245+
If the locale can't be determined from the Request, the default locale will be
246+
used. It becomes the service container parameter called
247247
``kernel.default_locale``.
248248

249249
.. seealso::
@@ -295,7 +295,7 @@ subdomains).
295295

296296
.. seealso::
297297

298-
Read more about this in the `Security Advisory Blog post`_.
298+
Read more about this in the `Security Advisory Blog post`_.
299299

300300
.. _reference-framework-form:
301301

@@ -311,16 +311,16 @@ enabled
311311

312312
Whether to enable the form services or not in the service container.
313313

314-
This option will be set to ``true`` automatically when one of the child
315-
settings are configured.
314+
This option will automatically be set to ``true`` when one of the child
315+
settings is configured.
316316

317317
.. note::
318318

319-
This will automatically enable the validation.
319+
This will automatically enable the validation.
320320

321321
.. seealso::
322322

323-
For more details, see :doc:`/book/forms`.
323+
For more details, see :doc:`/book/forms`.
324324

325325
csrf_protection
326326
~~~~~~~~~~~~~~~
@@ -337,11 +337,11 @@ enabled
337337
**type**: ``boolean`` **default**: ``false``
338338

339339
Whether to enable the CSRF support in forms or not. Setting this option to
340-
``true`` requires the `secret`_ to be set and the `session`_ to be enabled. It
340+
``true`` requires the `secret`_ to be set and `session`_ to be enabled. It
341341
becomes the service container parameter named ``form.type_extension.csrf.enabled``.
342342

343-
This option will be set to ``true`` automatically when one of the child
344-
settings are configured.
343+
This option will automatically be set to ``true`` when one of the child
344+
settings is configured.
345345

346346
field_name
347347
..........
@@ -403,7 +403,7 @@ enabled
403403
**type**: ``boolean`` **default**: ``false``
404404

405405
Whether to enable the fragment listener or not. The fragment listener is used
406-
to render ESI fragments independently of the rst of the page.
406+
to render ESI fragments independently of the rest of the page.
407407

408408
This setting is automatically set to ``true`` when one of the child settings is
409409
configured.
@@ -415,8 +415,8 @@ path
415415

416416
**type**: ``string`` **default**: ``'/_fragment'``
417417

418-
The paths prefix for fragments. The fragment listener will only be executed
419-
when the requests starts with this path. It becomes the service container
418+
The path prefix for fragments. The fragment listener will only be executed
419+
when the request starts with this path. It becomes the service container
420420
parameter called ``fragment.path``.
421421

422422
profiler
@@ -434,12 +434,13 @@ enabled
434434

435435
**type**: ``boolean`` **default**: ``true`` in the ``dev`` and ``test`` environments
436436

437-
The profiler can be disabled by setting this setting to ``false``.
437+
The profiler can be disabled by setting this option to ``false``.
438438

439439
.. note::
440440

441441
The profiler works independently from the Web Developer Toolbar, see the
442-
:doc:`WebProfilerBundle configuration <web_profiler>` on how to disable/enable it.
442+
:doc:`WebProfilerBundle configuration
443+
</reference/configuration/web_profiler>` on how to disable/enable it.
443444

444445
collect
445446
.......
@@ -455,7 +456,7 @@ collect
455456
This option configures the way the profiler behaves when it is enabled. If set
456457
to ``true``, the profiler collects data for all requests. If you want to only
457458
collect information on-demand, you can set the ``collect`` flag to ``false``
458-
and activate the data collectors by hand::
459+
and activate the data collectors manually::
459460

460461
$profiler->enable();
461462

@@ -534,7 +535,9 @@ ip
534535

535536
**type**: ``string``
536537

537-
If set, the profiler will only be enabled when the current IP adres matches.
538+
If set, the profiler will only be enabled when the current IP address matches.
539+
540+
.. _profiler.matcher.path:
538541

539542
path
540543
""""

0 commit comments

Comments
 (0)