Skip to content

Commit a6e8fec

Browse files
committed
Fixing build for new parser, including removing old bundles/ dir
1 parent 3d88312 commit a6e8fec

File tree

14 files changed

+20
-50
lines changed

14 files changed

+20
-50
lines changed

book/controller.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ The Symfony templating engine is explained in great detail in the
570570

571571
You can even avoid calling the ``render`` method by using the ``@Template``
572572
annotation. See the
573-
:doc:`FrameworkExtraBundle documentation </bundles/SensioFrameworkExtraBundle/annotations/view>`
573+
FrameworkExtraBundle documentation
574574
more details.
575575

576576
.. tip::

book/doctrine.rst

Lines changed: 5 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
@@ -469,7 +469,7 @@ in your application. To do this, run:
469469
new column to the existing ``product`` table.
470470

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

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

563563
Fetching Objects from the Database
564564
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -586,7 +586,7 @@ on its ``id`` value::
586586

587587
You can achieve the equivalent of this without writing any code by using
588588
the ``@ParamConverter`` shortcut. See the
589-
:doc:`FrameworkExtraBundle documentation </bundles/SensioFrameworkExtraBundle/annotations/converters>`
589+
FrameworkExtraBundle documentation
590590
for more details.
591591

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

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

10871087
Saving Related Entities
10881088
~~~~~~~~~~~~~~~~~~~~~~~
@@ -1399,8 +1399,6 @@ For more information about Doctrine, see the *Doctrine* section of the
13991399

14001400
* :doc:`/cookbook/doctrine/common_extensions`
14011401
* :doc:`/cookbook/doctrine/console`
1402-
* :doc:`/bundles/DoctrineFixturesBundle/index`
1403-
* :doc:`/bundles/DoctrineMongoDBBundle/index`
14041402

14051403
.. _`Doctrine`: http://www.doctrine-project.org/
14061404
.. _`MongoDB`: http://www.mongodb.org/

book/forms.rst

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

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

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

book/http_cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ at some interval (the expiration) to verify that the content is still valid.
764764

765765
You can also define HTTP caching headers for expiration and validation by using
766766
annotations. See the
767-
:doc:`FrameworkExtraBundle documentation </bundles/SensioFrameworkExtraBundle/annotations/cache>`.
767+
FrameworkExtraBundle documentation.
768768

769769
.. index::
770770
pair: Cache; Configuration

book/routing.rst

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

11921192
You can also define routes using annotations. See the
1193-
:doc:`FrameworkExtraBundle documentation </bundles/SensioFrameworkExtraBundle/annotations/routing>`
1193+
FrameworkExtraBundle documentation
11941194
to see how.
11951195

11961196
Adding a Host Requirement to Imported Routes

book/security.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,7 @@ Thanks to the SensioFrameworkExtraBundle, you can also secure your controller us
11971197
}
11981198

11991199
For more information, see the
1200-
:doc:`FrameworkExtraBundle documentation </bundles/SensioFrameworkExtraBundle/annotations/security>`.
1200+
FrameworkExtraBundle documentation.
12011201

12021202
Securing other Services
12031203
~~~~~~~~~~~~~~~~~~~~~~~

bundles/index.rst

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

bundles/map.rst.inc

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

components/http_kernel/introduction.rst

Lines changed: 4 additions & 4 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
@@ -396,9 +396,9 @@ return a ``Response``.
396396

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

cookbook/bundles/override.rst

Lines changed: 3 additions & 1 deletion
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

cookbook/controller/service.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ the route ``_controller`` value:
133133

134134
You can also use annotations to configure routing using a controller
135135
defined as a service. See the
136-
:doc:`FrameworkExtraBundle documentation </bundles/SensioFrameworkExtraBundle/annotations/routing>`
136+
FrameworkExtraBundle documentation
137137
for details.
138138

139139
Alternatives to base Controller Methods

cookbook/templating/PHP.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ below renders the ``index.html.php`` template::
6060
);
6161
}
6262

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

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

index.rst

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,6 @@ Get answers quickly with reference documents:
6767

6868
.. include:: /reference/map.rst.inc
6969

70-
Bundles
71-
-------
72-
73-
The Symfony Standard Edition comes with some bundles. Learn more about them:
74-
75-
.. toctree::
76-
:hidden:
77-
78-
bundles/index
79-
80-
.. include:: /bundles/map.rst.inc
81-
8270
CMF
8371
---
8472

reference/forms/types/repeated.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ second_options
158158

159159
**type**: ``array`` **default**: ``array()``
160160

161-
Additional options (will be merged into `options` above) that should be passed
161+
Additional options (will be merged into ``options`` above) that should be passed
162162
*only* to the second field. This is especially useful for customizing the
163163
label (see `first_options`_).
164164

0 commit comments

Comments
 (0)