Skip to content

Commit 6c09522

Browse files
committed
Applied (most of) the comments
1 parent 43924f2 commit 6c09522

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
@@ -237,8 +237,8 @@ default_locale
237237

238238
**type**: ``string`` **default**: ``'en'``
239239

240-
If the locale can't be determined from the Request or session, the default
241-
locale will be used. It becomes the service container parameter called
240+
If the locale can't be determined from the Request, the default locale will be
241+
used. It becomes the service container parameter called
242242
``kernel.default_locale``.
243243

244244
.. seealso::
@@ -279,7 +279,7 @@ subdomains).
279279

280280
.. seealso::
281281

282-
Read more about this in the `Security Advisory Blog post`_.
282+
Read more about this in the `Security Advisory Blog post`_.
283283

284284
.. _reference-framework-form:
285285

@@ -295,16 +295,16 @@ enabled
295295

296296
Whether to enable the form services or not in the service container.
297297

298-
This option will be set to ``true`` automatically when one of the child
299-
settings are configured.
298+
This option will automatically be set to ``true`` when one of the child
299+
settings is configured.
300300

301301
.. note::
302302

303-
This will automatically enable the validation.
303+
This will automatically enable the validation.
304304

305305
.. seealso::
306306

307-
For more details, see :doc:`/book/forms`.
307+
For more details, see :doc:`/book/forms`.
308308

309309
csrf_protection
310310
~~~~~~~~~~~~~~~
@@ -321,11 +321,11 @@ enabled
321321
**type**: ``boolean`` **default**: ``false``
322322

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

327-
This option will be set to ``true`` automatically when one of the child
328-
settings are configured.
327+
This option will automatically be set to ``true`` when one of the child
328+
settings is configured.
329329

330330
field_name
331331
..........
@@ -387,7 +387,7 @@ enabled
387387
**type**: ``boolean`` **default**: ``false``
388388

389389
Whether to enable the fragment listener or not. The fragment listener is used
390-
to render ESI fragments independently of the rst of the page.
390+
to render ESI fragments independently of the rest of the page.
391391

392392
This setting is automatically set to ``true`` when one of the child settings is
393393
configured.
@@ -399,8 +399,8 @@ path
399399

400400
**type**: ``string`` **default**: ``'/_fragment'``
401401

402-
The paths prefix for fragments. The fragment listener will only be executed
403-
when the requests starts with this path. It becomes the service container
402+
The path prefix for fragments. The fragment listener will only be executed
403+
when the request starts with this path. It becomes the service container
404404
parameter called ``fragment.path``.
405405

406406
profiler
@@ -418,12 +418,13 @@ enabled
418418

419419
**type**: ``boolean`` **default**: ``true`` in the ``dev`` and ``test`` environments
420420

421-
The profiler can be disabled by setting this setting to ``false``.
421+
The profiler can be disabled by setting this option to ``false``.
422422

423423
.. note::
424424

425425
The profiler works independently from the Web Developer Toolbar, see the
426-
:doc:`WebProfilerBundle configuration <web_profiler>` on how to disable/enable it.
426+
:doc:`WebProfilerBundle configuration
427+
</reference/configuration/web_profiler>` on how to disable/enable it.
427428

428429
collect
429430
.......
@@ -439,7 +440,7 @@ collect
439440
This option configures the way the profiler behaves when it is enabled. If set
440441
to ``true``, the profiler collects data for all requests. If you want to only
441442
collect information on-demand, you can set the ``collect`` flag to ``false``
442-
and activate the data collectors by hand::
443+
and activate the data collectors manually::
443444

444445
$profiler->enable();
445446

@@ -518,7 +519,9 @@ ip
518519

519520
**type**: ``string``
520521

521-
If set, the profiler will only be enabled when the current IP adres matches.
522+
If set, the profiler will only be enabled when the current IP address matches.
523+
524+
.. _profiler.matcher.path:
522525

523526
path
524527
""""

0 commit comments

Comments
 (0)