Merge branch '2.0' into 2.1

weaverryan · weaverryan · commit 6c7e69f651d7 · 2019-02-02T21:15:45.000-05:00
* 2.0:
  Fixing build bugs with new parser
diff --git a/book/controller.rst b/book/controller.rst
@@ -527,7 +527,7 @@ The Symfony templating engine is explained in great detail in the
 .. tip::
 
     You can even avoid calling the ``render`` method by using the ``@Template``
-    annotation. See the :doc:`FrameworkExtraBundle documentation</bundles/SensioFrameworkExtraBundle/annotations/view>`
+    annotation. See the FrameworkExtraBundle
     more details.
 
 .. tip::
diff --git a/book/doctrine.rst b/book/doctrine.rst
@@ -20,7 +20,7 @@ be.
     easy, and explained in the ":doc:`/cookbook/doctrine/dbal`" cookbook entry.
 
     You can also persist data to `MongoDB`_ using Doctrine ODM library. For
-    more information, read the ":doc:`/bundles/DoctrineMongoDBBundle/index`"
+    more information, read the DoctrineMongoDBBundle
     documentation.
 
 A Simple Example: A Product
@@ -449,7 +449,7 @@ in your application. To do this, run:
     new column to the existing ``product`` table.
 
     An even better way to take advantage of this functionality is via
-    :doc:`migrations</bundles/DoctrineMigrationsBundle/index>`, which allow you to
+    DoctrineMigrationsBundle, which allow you to
     generate these SQL statements and store them in migration classes that
     can be run systematically on your production server in order to track
     and migrate your database schema safely and reliably.
@@ -529,7 +529,7 @@ an ``UPDATE`` query if the record already exists in the database.
 
     Doctrine provides a library that allows you to programmatically load testing
     data into your project (i.e. "fixture data"). For information, see
-    :doc:`/bundles/DoctrineFixturesBundle/index`.
+    DoctrineFixturesBundle/index.
 
 Fetching Objects from the Database
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -557,7 +557,7 @@ on its ``id`` value::
 
     You can achieve the equivalent of this without writing any code by using
     the ``@ParamConverter`` shortcut. See the
-    :doc:`FrameworkExtraBundle documentation</bundles/SensioFrameworkExtraBundle/annotations/converters>`
+    FrameworkExtraBundle
     for more details.
 
 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:
 
     This task should only be really used during development. For a more robust
     method of systematically updating your production database, read about
-    :doc:`Doctrine migrations</bundles/DoctrineMigrationsBundle/index>`.
+    DoctrineMigrationsBundle.
 
 Saving Related Entities
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -1525,7 +1525,7 @@ Some notable or interesting tasks include:
 
    To be able to load data fixtures to your database, you will need to have
    the ``DoctrineFixturesBundle`` bundle installed. To learn how to do it,
-   read the ":doc:`/bundles/DoctrineFixturesBundle/index`" entry of the
+   read the "DoctrineFixturesBundle" entry of the
    documentation.
 
 .. tip::
@@ -1555,7 +1555,6 @@ lifecycle.
 For more information about Doctrine, see the *Doctrine* section of the
 :doc:`cookbook</cookbook/index>`, which includes the following articles:
 
-* :doc:`/bundles/DoctrineFixturesBundle/index`
 * :doc:`/cookbook/doctrine/common_extensions`
 
 .. _`Doctrine`: http://www.doctrine-project.org/
diff --git a/book/forms.rst b/book/forms.rst
@@ -1269,7 +1269,7 @@ that lives inside the `Twig Bridge`_. Inside this file, you can see every block
 needed to render a form and every default field type.
 
 In PHP, the fragments are individual template files. By default they are located in
-the `Resources/views/Form` directory of the framework bundle (`view on GitHub`_).
+the ``Resources/views/Form`` directory of the framework bundle (`view on GitHub`_).
 
 Each fragment name follows the same basic pattern and is broken up into two pieces,
 separated by a single underscore character (``_``). A few examples are:
diff --git a/book/routing.rst b/book/routing.rst
@@ -1029,7 +1029,7 @@ loaded from the new routing resource.
 .. tip::
 
     You can also define routes using annotations. See the
-    :doc:`FrameworkExtraBundle documentation</bundles/SensioFrameworkExtraBundle/annotations/routing>`
+    ``@Routing`` documentation
     to see how.
 
 .. index::
diff --git a/bundles/index.rst b/bundles/index.rst
diff --git a/bundles/map.rst.inc b/bundles/map.rst.inc
diff --git a/components/http_kernel/introduction.rst b/components/http_kernel/introduction.rst
@@ -288,9 +288,9 @@ on the event object that's passed to listeners on this event.
     the Symfony Framework, and many deal with collecting profiler data when
     the profiler is enabled.
     
-    One interesting listener comes from the :doc:`SensioFrameworkExtraBundle </bundles/SensioFrameworkExtraBundle/index>`,
+    One interesting listener comes from the SensioFrameworkExtraBundle,
     which is packaged with the Symfony Standard Edition. This listener's
-    :doc:`@ParamConverter</bundles/SensioFrameworkExtraBundle/annotations/converters>`
+    ``@ParamConverter``
     functionality allows you to pass a full object (e.g. a ``Post`` object)
     to your controller instead of a scalar value (e.g. an ``id`` parameter
     that was on your route). The listener - ``ParamConverterListener`` - uses
@@ -395,10 +395,9 @@ return a ``Response``.
 .. sidebar:: ``kernel.view`` in the Symfony Framework
 
     There is no default listener inside the Symfony Framework for the ``kernel.view``
-    event. However, one core bundle -
-    :doc:`SensioFrameworkExtraBundle </bundles/SensioFrameworkExtraBundle/index>` -
+    event. However, one core bundle - SensioFrameworkExtraBundle -
     *does* add a listener to this event. If your controller returns an array,
-    and you place the :doc:`@Template</bundles/SensioFrameworkExtraBundle/annotations/view>`
+    and you place the ``@Template``
     annotation above the controller, then this listener renders a template,
     passes the array you returned from your controller to that template,
     and creates a ``Response`` containing the returned content from that
diff --git a/cookbook/bundles/override.rst b/cookbook/bundles/override.rst
@@ -34,6 +34,8 @@ is almost always the case), you can easily override controllers via bundle
 inheritance. For more information, see :doc:`/cookbook/bundles/inheritance`.
 If the controller is a service, see the next section on how to override it.
 
+.. _override-services-configuration:
+
 Services & Configuration
 ------------------------
 
@@ -107,7 +109,7 @@ Forms
 
 In order to override a form type, it has to be registered as a service (meaning
 it is tagged as "form.type"). You can then override it as you would override any
-service as explained in `Services & Configuration`_. This, of course, will only
+service as explained in :ref:`override-services-configuration`. This, of course, will only
 work if the type is referred to by its alias rather than being instantiated,
 e.g.::
 
@@ -128,8 +130,7 @@ Translations
 ------------
 
 Translations are not related to bundles, but to domains. That means that you
-can override the translations from any translation file, as long as it is in
-:ref:`the correct domain <translation-domains>`.
+can override the translations from any translation file, as long as it is in the correct domain.
 
 .. caution::
 
diff --git a/cookbook/controller/service.rst b/cookbook/controller/service.rst
@@ -61,5 +61,4 @@ service, you need to specify your service as follows::
 
 In this example, ``my_bundle.annot_controller`` should be the id of the
 ``AnnotController`` instance defined in the service container. This is
-documented in the :doc:`/bundles/SensioFrameworkExtraBundle/annotations/routing`
-chapter.
+documented in the ``@Routing`` chapter.
diff --git a/cookbook/templating/PHP.rst b/cookbook/templating/PHP.rst
@@ -58,7 +58,7 @@ below renders the ``index.html.php`` template::
         return $this->render('AcmeHelloBundle:Hello:index.html.php', array('name' => $name));
     }
 
-You can also use the :doc:`/bundles/SensioFrameworkExtraBundle/annotations/view`
+You can also use the ``@Template``
 shortcut to render the default ``AcmeHelloBundle:Hello:index.html.php`` template::
 
     // src/Acme/HelloBundle/Controller/HelloController.php
diff --git a/index.rst b/index.rst
@@ -60,18 +60,6 @@ Get answers quickly with reference documents:
 
 .. include:: /reference/map.rst.inc
 
-Bundles
--------
-
-The Symfony Standard Edition comes with some bundles. Learn more about them:
-
-.. toctree::
-    :hidden:
-
-    bundles/index
-
-.. include:: /bundles/map.rst.inc
-
 Contributing
 ------------
 
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst
@@ -199,7 +199,7 @@ Symfony2 routes the request to the code that handles it by trying to match the
 requested URL against some configured patterns. By default, these patterns
 (called routes) are defined in the ``app/config/routing.yml`` configuration
 file. When you're in the ``dev`` :ref:`environment<quick-tour-big-picture-environments>` -
-indicated by the app_**dev**.php front controller - the ``app/config/routing_dev.yml``
+indicated by the ``app_dev.php`` front controller - the ``app/config/routing_dev.yml``
 configuration file is also loaded. In the Standard Edition, the routes to
 these "demo" pages are placed in that file:
 
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
@@ -873,7 +873,7 @@ other source, first create a class that implements the
     }
 
 Your custom loader's ``load`` method is responsible for returning a
-:Class:`Symfony\\Component\\Translation\\MessageCatalogue`.
+:class:`Symfony\\Component\\Translation\\MessageCatalogue`.
 
 Now, register your loader as a service and tag it with ``translation.loader``:
 

Original file line number	Diff line number	Diff line change
@@ -58,7 +58,7 @@ below renders the ``index.html.php`` template::
`58`	`58`	`return $this->render('AcmeHelloBundle:Hello:index.html.php', array('name' => $name));`
`59`	`59`	`}`
`60`	`60`
`61`		-You can also use the :doc:`/bundles/SensioFrameworkExtraBundle/annotations/view`
	`61`	+You can also use the ``@Template``
`62`	`62`	shortcut to render the default ``AcmeHelloBundle:Hello:index.html.php`` template::
`63`	`63`
`64`	`64`	`// src/Acme/HelloBundle/Controller/HelloController.php`
Original file line number	Diff line number	Diff line change
`@@ -873,7 +873,7 @@ other source, first create a class that implements the`
`873`	`873`	`}`
`874`	`874`
`875`	`875`	Your custom loader's ``load`` method is responsible for returning a
`876`		-:Class:`Symfony\\Component\\Translation\\MessageCatalogue`.
	`876`	+:class:`Symfony\\Component\\Translation\\MessageCatalogue`.
`877`	`877`
`878`	`878`	Now, register your loader as a service and tag it with ``translation.loader``:
`879`	`879`