Merge branch '2.2' into 2.3

weaverryan · weaverryan · commit b4bcd86def75 · 2013-07-20T16:43:35.000-05:00
Conflicts:
	book/templating.rst
	quick_tour/the_big_picture.rst
diff --git a/book/http_fundamentals.rst b/book/http_fundamentals.rst
@@ -430,7 +430,7 @@ by adding an entry for ``/contact`` to your routing configuration file:
     .. code-block:: xml
 
         <route id="contact" path="/contact">
-            <default key="_controller">AcmeBlogBundle:Main:contact</default>
+            <default key="_controller">AcmeDemoBundle:Main:contact</default>
         </route>
 
     .. code-block:: php
@@ -441,7 +441,7 @@ by adding an entry for ``/contact`` to your routing configuration file:
 
         $collection = new RouteCollection();
         $collection->add('contact', new Route('/contact', array(
-            '_controller' => 'AcmeBlogBundle:Main:contact',
+            '_controller' => 'AcmeDemoBundle:Main:contact',
         )));
 
         return $collection;
diff --git a/book/installation.rst b/book/installation.rst
@@ -127,12 +127,6 @@ All public files and the front controller that handles incoming requests in
 a Symfony2 application live in the ``Symfony/web/`` directory. So, assuming
 you unpacked the archive into your web server's or virtual host's document root,
 your application's URLs will start with ``http://localhost/Symfony/web/``.
-To get nice and short URLs you should point the document root of your web
-server or virtual host to the ``Symfony/web/`` directory. Though this is not
-required for development it is recommended when your application goes into
-production as all system and configuration files become inaccessible to clients.
-For information on configuring your specific web server document root, see
-the following documentation: `Apache`_ | `Nginx`_ .
 
 .. note::
 
diff --git a/book/page_creation.rst b/book/page_creation.rst
@@ -22,6 +22,42 @@ HTTP response.
 Symfony2 follows this philosophy and provides you with tools and conventions
 to keep your application organized as it grows in users and complexity.
 
+.. index::
+   single: Page creation; Environments & Front Controllers
+
+.. _page-creation-environments:
+
+Environments & Front Controllers
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Every Symfony application runs within an :term:`environment`. An environment
+is a specific set of configuration and loaded bundles, represented by a string.
+The same application can be run with different configurations by running the
+application in different environments. Symfony2 comes with three environments
+defined — ``dev``, ``test`` and ``prod`` — but you can create your own as well.
+
+Environments are useful by allowing a single application to have a dev environment
+built for debugging and a production environment optimized for speed. You might
+also load specific bundles based on the selected environment. For example,
+Symfony2 comes with the WebProfilerBundle (described below), enabled only
+in the ``dev`` and ``test`` environments.
+
+Symfony2 comes with two web-accessible front controllers: ``app_dev.php`` 
+provides the ``dev`` environment, and ``app.php`` provides the ``prod`` environment.
+All web accesses to Symfony2 normally go through one of these front controllers.
+(The ``test`` environment is normally only used when running unit tests, and so 
+doesn't have a dedicated front controller. The console tool also provides a
+front controller that can be used with any environment.)
+
+When the front controller initializes the kernel, it provides two parameters:
+the environment, and also whether the kernel should run in debug mode.
+To make your application respond faster, Symfony2 maintains a cache under the
+``app/cache/`` directory. When in debug mode is enabled (such as ``app_dev.php``
+does by default), this cache is flushed automatically whenever you make changes
+to any code or configuration. When running in debug mode, Symfony2 runs
+slower, but your changes are reflected without having to manually clear the
+cache.
+
 .. index::
    single: Page creation; Example
 
diff --git a/book/propel.rst b/book/propel.rst
@@ -353,7 +353,7 @@ Create the classes:
 
     $ php app/console propel:model:build
 
-Assuming you have products in your database, you don't want lose them. Thanks to
+Assuming you have products in your database, you don't want to lose them. Thanks to
 migrations, Propel will be able to update your database without losing existing
 data.
 
@@ -362,7 +362,7 @@ data.
     $ php app/console propel:migration:generate-diff
     $ php app/console propel:migration:migrate
 
-Your database has been updated, you can continue to write your application.
+Your database has been updated, you can continue writing your application.
 
 Saving Related Objects
 ~~~~~~~~~~~~~~~~~~~~~~
diff --git a/book/templating.rst b/book/templating.rst
@@ -564,7 +564,7 @@ template name follows the same typical convention. The ``articleDetails.html.twi
 template uses an ``article`` variable, which we pass to it. In this case,
 you could avoid doing this entirely, as all of the variables available in
 ``list.html.twig`` are also available in ``articleDetails.html.twig`` (unless
-you set `with_context<twig_include_function>`_ to false).
+you set `with_context`_ to false).
 
 .. tip::
 
@@ -573,9 +573,8 @@ you set `with_context<twig_include_function>`_ to false).
     elements, it would look like this: ``{'foo': foo, 'bar': bar}``.
 
 .. versionadded:: 2.2
-    The `include()<twig_include_function>`_ function is a new Twig feature
-    that's available in Symfony 2.2. Prior, the `{% include %}<twig_include_tag>`_
-    tag was used.
+    The `include() function`_ is a new Twig feature that's available in Symfony
+    2.2. Prior, the `{% include %} tag`_ tag was used.
 
 .. index::
    single: Templating; Embedding action
@@ -1532,5 +1531,6 @@ Learn more from the Cookbook
 .. _`filters`: http://twig.sensiolabs.org/doc/filters/index.html
 .. _`add your own extensions`: http://twig.sensiolabs.org/doc/advanced.html#creating-an-extension
 .. _`hinclude.js`: http://mnot.github.com/hinclude/
-.. _`twig_include_function`: http://twig.sensiolabs.org/doc/functions/include.html
-.. _`twig_include_tag`: http://twig.sensiolabs.org/doc/tags/include.html
+.. _`with_context`: http://twig.sensiolabs.org/doc/functions/include.html
+.. _`include() function`: http://twig.sensiolabs.org/doc/functions/include.html
+.. _`{% include %} tag`: http://twig.sensiolabs.org/doc/tags/include.html
diff --git a/book/testing.rst b/book/testing.rst
@@ -544,8 +544,7 @@ narrow down your node selection by chaining the method calls::
 
     $crawler
         ->filter('h1')
-        ->reduce(function ($node, $i)
-        {
+        ->reduce(function ($node, $i) {
             if (!$node->getAttribute('class')) {
                 return false;
             }
diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst
@@ -24,6 +24,8 @@ You can install the component in 2 different ways:
 * Use the official Git repository (https://github.com/symfony/HttpFoundation);
 * :doc:`Install it via Composer </components/using_components>` (``symfony/http-foundation`` on `Packagist`_).
 
+.. _component-http-foundation-request:
+
 Request
 -------
 
@@ -267,6 +269,8 @@ request information. Have a look at
 :class:`the Request API<Symfony\\Component\\HttpFoundation\\Request>`
 for more information about them.
 
+.. _component-http-foundation-response:
+
 Response
 --------
 
diff --git a/cookbook/security/entity_provider.rst b/cookbook/security/entity_provider.rst
@@ -632,7 +632,7 @@ of the application::
 For brevity, the getter and setter methods are hidden, but you can
 :ref:`generate them <book-doctrine-generating-getters-and-setters>`:
 
-.. code-block:: bas
+.. code-block:: bash
 
     $ php app/console doctrine:generate:entities Acme/UserBundle/Entity/User
 
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst
diff --git a/reference/constraints/UniqueEntity.rst b/reference/constraints/UniqueEntity.rst

Original file line number	Diff line number	Diff line change
`@@ -544,8 +544,7 @@ narrow down your node selection by chaining the method calls::`
`544`	`544`
`545`	`545`	`$crawler`
`546`	`546`	`->filter('h1')`
`547`		`- ->reduce(function ($node, $i)`
`548`		`- {`
	`547`	`+ ->reduce(function ($node, $i) {`
`549`	`548`	`if (!$node->getAttribute('class')) {`
`550`	`549`	`return false;`
`551`	`550`	`}`