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

Commit6c7e69f

Browse files
committed
Merge branch '2.0' into 2.1
* 2.0: Fixing build bugs with new parser
2 parents89c6f1d +32063cd commit6c7e69f

File tree

13 files changed

+21
-58
lines changed

13 files changed

+21
-58
lines changed

‎book/controller.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ The Symfony templating engine is explained in great detail in the
527527
..tip::
528528

529529
You can even avoid calling the ``render`` method by using the ``@Template``
530-
annotation. See the:doc:`FrameworkExtraBundle documentation</bundles/SensioFrameworkExtraBundle/annotations/view>`
530+
annotation. See the FrameworkExtraBundle
531531
more details.
532532

533533
..tip::

‎book/doctrine.rst‎

Lines changed: 6 additions & 7 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
@@ -449,7 +449,7 @@ in your application. To do this, run:
449449
new column to the existing ``product`` table.
450450

451451
An even better way to take advantage of this functionality is via
452-
:doc:`migrations</bundles/DoctrineMigrationsBundle/index>`, which allow you to
452+
DoctrineMigrationsBundle, which allow you to
453453
generate these SQL statements and store them in migration classes that
454454
can be run systematically on your production server in order to track
455455
and migrate your database schema safely and reliably.
@@ -529,7 +529,7 @@ an ``UPDATE`` query if the record already exists in the database.
529529

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

534534
Fetching Objects from the Database
535535
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -557,7 +557,7 @@ on its ``id`` value::
557557

558558
You can achieve the equivalent of this without writing any code by using
559559
the ``@ParamConverter`` shortcut. See the
560-
:doc:`FrameworkExtraBundle documentation</bundles/SensioFrameworkExtraBundle/annotations/converters>`
560+
FrameworkExtraBundle
561561
for more details.
562562

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

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

10821082
Saving Related Entities
10831083
~~~~~~~~~~~~~~~~~~~~~~~
@@ -1525,7 +1525,7 @@ Some notable or interesting tasks include:
15251525

15261526
To be able to load data fixtures to your database, you will need to have
15271527
the ``DoctrineFixturesBundle`` bundle installed. To learn how to do it,
1528-
read the ":doc:`/bundles/DoctrineFixturesBundle/index`" entry of the
1528+
read the "DoctrineFixturesBundle" entry of the
15291529
documentation.
15301530

15311531
..tip::
@@ -1555,7 +1555,6 @@ lifecycle.
15551555
For more information about Doctrine, see the *Doctrine* section of the
15561556
:doc:`cookbook</cookbook/index>`, which includes the following articles:
15571557

1558-
*:doc:`/bundles/DoctrineFixturesBundle/index`
15591558
*:doc:`/cookbook/doctrine/common_extensions`
15601559

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

‎book/forms.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1269,7 +1269,7 @@ that lives inside the `Twig Bridge`_. Inside this file, you can see every block
12691269
needed to render a form and every default field type.
12701270

12711271
In PHP, the fragments are individual template files. By default they are located in
1272-
the `Resources/views/Form` directory of the framework bundle (`view on GitHub`_).
1272+
the ``Resources/views/Form`` directory of the framework bundle (`view on GitHub`_).
12731273

12741274
Each fragment name follows the same basic pattern and is broken up into two pieces,
12751275
separated by a single underscore character (``_``). A few examples are:

‎book/routing.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,7 @@ loaded from the new routing resource.
10291029
..tip::
10301030

10311031
You can also define routes using annotations. See the
1032-
:doc:`FrameworkExtraBundle documentation</bundles/SensioFrameworkExtraBundle/annotations/routing>`
1032+
``@Routing`` documentation
10331033
to see how.
10341034

10351035
..index::

‎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_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

@@ -128,8 +130,7 @@ Translations
128130
------------
129131

130132
Translations are not related to bundles, but to domains. That means that you
131-
can override the translations from any translation file, as long as it is in
132-
:ref:`the correct domain<translation-domains>`.
133+
can override the translations from any translation file, as long as it is in the correct domain.
133134

134135
..caution::
135136

‎cookbook/controller/service.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,4 @@ service, you need to specify your service as follows::
6161

6262
In this example, ``my_bundle.annot_controller`` should be the id of the
6363
``AnnotController`` instance defined in the service container. This is
64-
documented in the:doc:`/bundles/SensioFrameworkExtraBundle/annotations/routing`
65-
chapter.
64+
documented in the ``@Routing`` chapter.

‎cookbook/templating/PHP.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ below renders the ``index.html.php`` template::
5858
return $this->render('AcmeHelloBundle:Hello:index.html.php', array('name' => $name));
5959
}
6060

61-
You can also use the:doc:`/bundles/SensioFrameworkExtraBundle/annotations/view`
61+
You can also use the``@Template``
6262
shortcut to render the default ``AcmeHelloBundle:Hello:index.html.php`` template::
6363

6464
// src/Acme/HelloBundle/Controller/HelloController.php

0 commit comments

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