Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit00ee6ee

Browse files
committed
Merge branch '2.1' into 2.2
* 2.1: Fixing missing double ticks Fixing build bugs with new parser
2 parents88e25d5 +1ba3e82 commit00ee6ee

File tree

15 files changed

+27
-64
lines changed

15 files changed

+27
-64
lines changed

‎book/controller.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,8 +549,7 @@ The Symfony templating engine is explained in great detail in the
549549
..tip::
550550

551551
You can even avoid calling the ``render`` method by using the ``@Template``
552-
annotation. See the
553-
:doc:`FrameworkExtraBundle documentation</bundles/SensioFrameworkExtraBundle/annotations/view>`
552+
annotation. See the FrameworkExtraBundle documentation
554553
more details.
555554

556555
..tip::

‎book/doctrine.rst‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ be.
2020
easy, and explained in the ":doc:`/cookbook/doctrine/dbal`" cookbook entry.
2121

2222
You can also persist data to `MongoDB`_ using Doctrine ODM library. For
23-
more information, read the":doc:`/bundles/DoctrineMongoDBBundle/index`"
23+
more information, read the DoctrineMongoDBBundle
2424
documentation.
2525

2626
A Simple Example: A Product
@@ -473,7 +473,7 @@ in your application. To do this, run:
473473
new column to the existing ``product`` table.
474474

475475
An even better way to take advantage of this functionality is via
476-
:doc:`migrations</bundles/DoctrineMigrationsBundle/index>`, whichallow you to
476+
DoctrineMigrationsBundle, whichallows you to
477477
generate these SQL statements and store them in migration classes that
478478
can be run systematically on your production server in order to track
479479
and migrate your database schema safely and reliably.
@@ -553,7 +553,7 @@ an ``UPDATE`` query if the record already exists in the database.
553553

554554
Doctrine provides a library that allows you to programmatically load testing
555555
data into your project (i.e. "fixture data"). For information, see
556-
:doc:`/bundles/DoctrineFixturesBundle/index`.
556+
DoctrineFixturesBundle/index.
557557

558558
Fetching Objects from the Database
559559
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -581,7 +581,7 @@ on its ``id`` value::
581581

582582
You can achieve the equivalent of this without writing any code by using
583583
the ``@ParamConverter`` shortcut. See the
584-
:doc:`FrameworkExtraBundle documentation</bundles/SensioFrameworkExtraBundle/annotations/converters>`
584+
FrameworkExtraBundle documentation
585585
for more details.
586586

587587
When you query for a particular type of object, you always use what's known
@@ -1112,7 +1112,7 @@ table, and ``product.category_id`` column, and new foreign key:
11121112

11131113
This task should only be really used during development. For a more robust
11141114
method of systematically updating your production database, read about
1115-
:doc:`Doctrine migrations</bundles/DoctrineMigrationsBundle/index>`.
1115+
Doctrine migrations.
11161116

11171117
Saving Related Entities
11181118
~~~~~~~~~~~~~~~~~~~~~~~
@@ -1564,8 +1564,8 @@ Some notable or interesting tasks include:
15641564
..note::
15651565

15661566
To be able to load data fixtures to your database, you will need to have
1567-
the DoctrineFixturesBundle bundle installed. To learn how to do it,
1568-
read the ":doc:`/bundles/DoctrineFixturesBundle/index`" entry of the
1567+
the``DoctrineFixturesBundle`` bundle installed. To learn how to do it,
1568+
read the "DoctrineFixturesBundle" entry of the
15691569
documentation.
15701570

15711571
..tip::
@@ -1595,7 +1595,6 @@ lifecycle.
15951595
For more information about Doctrine, see the *Doctrine* section of the
15961596
:doc:`cookbook</cookbook/index>`, which includes the following articles:
15971597

1598-
*:doc:`/bundles/DoctrineFixturesBundle/index`
15991598
*:doc:`/cookbook/doctrine/common_extensions`
16001599

16011600
.. _`Doctrine`:http://www.doctrine-project.org/

‎book/forms.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1294,7 +1294,7 @@ that lives inside the `Twig Bridge`_. Inside this file, you can see every block
12941294
needed to render a form and every default field type.
12951295
12961296
In PHP, the fragments are individual template files. By default they are located in
1297-
the `Resources/views/Form` directory of the framework bundle (`view on GitHub`_).
1297+
the ``Resources/views/Form`` directory of the framework bundle (`view on GitHub`_).
12981298
12991299
Each fragment name follows the same basic pattern and is broken up into two pieces,
13001300
separated by a single underscore character (``_``). A few examples are:

‎book/installation.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Distribution:
6161
6262
..tip::
6363

64-
For an exact version, replace `2.2.0` with the latest Symfony version
64+
For an exact version, replace ``2.2.0`` with the latest Symfony version
6565
(e.g. 2.2.1). For details, see the `Symfony Installation Page`_
6666

6767
..tip::

‎book/routing.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1064,7 +1064,7 @@ from the new routing resource.
10641064
..tip::
10651065

10661066
You can also define routes using annotations. See the
1067-
:doc:`FrameworkExtraBundle documentation</bundles/SensioFrameworkExtraBundle/annotations/routing>`
1067+
FrameworkExtraBundle documentation
10681068
to see how.
10691069

10701070
Adding a Host requirement to Imported Routes

‎bundles/index.rst‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎bundles/map.rst.inc‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎components/http_foundation/session_configuration.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ Save Handlers
1313
~~~~~~~~~~~~~
1414

1515
The PHP session workflow has 6 possible operations that may occur. The normal
16-
session follows `open`, `read`, `write` and `close`, with the possibility of
17-
`destroy` and `gc` (garbage collection which will expire any old sessions: `gc`
16+
session follows ``open``, ``read``, ``write`` and ``close``, with the possibility of
17+
``destroy`` and ``gc`` (garbage collection which will expire any old sessions: ``gc``
1818
is called randomly according to PHP's configuration and if called, it is invoked
19-
after the `open` operation). You can read more about this at
19+
after the ``open`` operation). You can read more about this at
2020
`php.net/session.customhandler`_
2121

2222
Native PHP Save Handlers

‎components/http_kernel/introduction.rst‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,9 @@ on the event object that's passed to listeners on this event.
288288
the Symfony Framework, and many deal with collecting profiler data when
289289
the profiler is enabled.
290290

291-
One interesting listener comes from the:doc:`SensioFrameworkExtraBundle</bundles/SensioFrameworkExtraBundle/index>`,
291+
One interesting listener comes from the SensioFrameworkExtraBundle,
292292
which is packaged with the Symfony Standard Edition. This listener's
293-
:doc:`@ParamConverter</bundles/SensioFrameworkExtraBundle/annotations/converters>`
293+
``@ParamConverter``
294294
functionality allows you to pass a full object (e.g. a ``Post`` object)
295295
to your controller instead of a scalar value (e.g. an ``id`` parameter
296296
that was on your route). The listener - ``ParamConverterListener`` - uses
@@ -395,10 +395,9 @@ return a ``Response``.
395395
..sidebar::``kernel.view`` in the Symfony Framework
396396

397397
There is no default listener inside the Symfony Framework for the ``kernel.view``
398-
event. However, one core bundle -
399-
:doc:`SensioFrameworkExtraBundle</bundles/SensioFrameworkExtraBundle/index>` -
398+
event. However, one core bundle - SensioFrameworkExtraBundle -
400399
*does* add a listener to this event. If your controller returns an array,
401-
and you place the:doc:`@Template</bundles/SensioFrameworkExtraBundle/annotations/view>`
400+
and you place the``@Template``
402401
annotation above the controller, then this listener renders a template,
403402
passes the array you returned from your controller to that template,
404403
and creates a ``Response`` containing the returned content from that

‎cookbook/bundles/override.rst‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ is almost always the case), you can easily override controllers via bundle
3434
inheritance. For more information, see:doc:`/cookbook/bundles/inheritance`.
3535
If the controller is a service, see the next section on how to override it.
3636

37+
.. _override-services-configuration:
38+
3739
Services & Configuration
3840
------------------------
3941

@@ -107,7 +109,7 @@ Forms
107109

108110
In order to override a form type, it has to be registered as a service (meaning
109111
it is tagged as "form.type"). You can then override it as you would override any
110-
service as explained in`Services & Configuration`_. This, of course, will only
112+
service as explained in:ref:`override-services-configuration`. This, of course, will only
111113
work if the type is referred to by its alias rather than being instantiated,
112114
e.g.::
113115

@@ -176,8 +178,7 @@ Translations
176178
------------
177179

178180
Translations are not related to bundles, but to domains. That means that you
179-
can override the translations from any translation file, as long as it is in
180-
:ref:`the correct domain<using-message-domains>`.
181+
can override the translations from any translation file, as long as it is in the correct domain.
181182

182183
..caution::
183184

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp