Merge branch '2.3' into 2.4

Conflicts:
	book/security.rst
	book/service_container.rst

Author: weaverryan

.gitignore

@@ -1 +1,8 @@
-_exts
+/_build
+/bundles/DoctrineFixturesBundle
+/bundles/DoctrineMigrationsBundle
+/bundles/DoctrineMongoDBBundle
+/bundles/SensioFrameworkExtraBundle
+/bundles/SensioGeneratorBundle
+/cmf
+/_exts

Makefile

@@ -77,17 +77,17 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/SymfonyCMF.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Symfony.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/SymfonyCMF.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Symfony.qhc"
 
 devhelp:
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/SymfonyCMF"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/SymfonyCMF"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/Symfony"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Symfony"
 	@echo "# devhelp"
 
 epub:

book/doctrine.rst

@@ -30,7 +30,7 @@ The easiest way to understand how Doctrine works is to see it in action.
 In this section, you'll configure your database, create a ``Product`` object,
 persist it to the database and fetch it back out.
 
-.. sidebar:: Code along with the example
+.. sidebar:: Code along with the Example
 
     If you want to follow along with the example in this chapter, create
     an ``AcmeStoreBundle`` via:
@@ -125,7 +125,7 @@ for you:
 
     $ php app/console doctrine:database:create
 
-.. sidebar:: Setting Up The Database to be UTF8
+.. sidebar:: Setting up the Database to be UTF8
 
     One mistake even seasoned developers make when starting a Symfony2 project
     is forgetting to setup default charset and collation on their database,
@@ -1392,7 +1392,7 @@ powerful, allowing you to create complex queries and subscribe to events
 that allow you to take different actions as objects go through their persistence
 lifecycle.
 
-Learn More
+Learn more
 ~~~~~~~~~~
 
 For more information about Doctrine, see the *Doctrine* section of the

book/forms.rst

@@ -618,7 +618,7 @@ Each field type has a number of different options that can be passed to it.
 Many of these are specific to the field type and details can be found in
 the documentation for each type.
 
-.. sidebar:: The ``required`` option
+.. sidebar:: The ``required`` Option
 
     The most common option is the ``required`` option, which can be applied to
     any field. By default, the ``required`` option is set to ``true``, meaning
@@ -636,7 +636,7 @@ the documentation for each type.
     In other words, the ``required`` option is "nice", but true server-side
     validation should *always* be used.
 
-.. sidebar:: The ``label`` option
+.. sidebar:: The ``label`` Option
 
     The label for the form field can be set using the ``label`` option,
     which can be applied to any field::
@@ -1101,6 +1101,12 @@ Defining your Forms as Services
 Defining your form type as a service is a good practice and makes it really
 easy to use in your application.
 
+.. note::
+
+    Services and the service container will be handled
+    :doc:`later on in this book </book/service_container>`. Things will be
+    more clear after reading that chapter.
+
 .. configuration-block::
 
     .. code-block:: yaml

book/from_flat_php_to_symfony2.rst

@@ -16,7 +16,7 @@ to where it is now.
 By the end, you'll see how Symfony2 can rescue you from mundane tasks and
 let you take back control of your code.
 
-A simple Blog in flat PHP
+A Simple Blog in Flat PHP
 -------------------------
 
 In this chapter, you'll build the token blog application using only flat PHP.
@@ -701,7 +701,7 @@ And perhaps best of all, by using Symfony2, you now have access to a whole
 set of **high-quality open source tools developed by the Symfony2 community**!
 A good selection of Symfony2 community tools can be found on `KnpBundles.com`_.
 
-Better templates
+Better Templates
 ----------------
 
 If you choose to use it, Symfony2 comes standard with a templating engine

book/http_cache.rst

@@ -234,7 +234,7 @@ If ``debug`` is ``true``, Symfony2 automatically adds a ``X-Symfony-Cache``
 header to the response containing useful information about cache hits and
 misses.
 
-.. sidebar:: Changing from one Reverse Proxy to Another
+.. sidebar:: Changing from one Reverse Proxy to another
 
     The Symfony2 reverse proxy is a great tool to use when developing your
     website or when you deploy your website to a shared host where you cannot
@@ -327,7 +327,7 @@ its creation more manageable::
     // set a custom Cache-Control directive
     $response->headers->addCacheControlDirective('must-revalidate', true);
 
-Public vs Private Responses
+Public vs private Responses
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Both gateway and proxy caches are considered "shared" caches as the cached

book/http_fundamentals.rst

@@ -42,7 +42,7 @@ how to master it.
 .. index::
    single: HTTP; Request-response paradigm
 
-Step1: The Client sends a Request
+Step1: The Client Sends a Request
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Every conversation on the web starts with a *request*. The request is a text
@@ -105,7 +105,7 @@ the client accepts (``Accept``) and the application the client is using to
 make the request (``User-Agent``). Many other headers exist and can be found
 on Wikipedia's `List of HTTP header fields`_ article.
 
-Step 2: The Server returns a Response
+Step 2: The Server Returns a Response
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Once a server has received the request, it knows exactly which resource the
@@ -248,7 +248,7 @@ you'll never need to worry about. For example, the ``isSecure()`` method
 checks the *three* different values in PHP that can indicate whether or not
 the user is connecting via a secured connection (i.e. HTTPS).
 
-.. sidebar:: ParameterBags and Request attributes
+.. sidebar:: ParameterBags and Request Attributes
 
     As seen above, the ``$_GET`` and ``$_POST`` variables are accessible via
     the public ``query`` and ``request`` properties respectively. Each of

book/internals.rst

@@ -127,7 +127,7 @@ method returns an array of arguments to pass to the Controller callable. The
 default implementation automatically resolves the method arguments, based on
 the Request attributes.
 
-.. sidebar:: Matching Controller method arguments from Request attributes
+.. sidebar:: Matching Controller Method Arguments from Request Attributes
 
     For each method argument, Symfony2 tries to get the value of a Request
     attribute with the same name. If it is not defined, the argument default
@@ -505,7 +505,7 @@ token link (a string made of 13 random characters) to access the Web Profiler.
     If the token is not clickable, it means that the profiler routes are not
     registered (see below for configuration information).
 
-Analyzing Profiling data with the Web Profiler
+Analyzing Profiling Data with the Web Profiler
 ..............................................
 
 The Web Profiler is a visualization tool for profiling data that you can use

book/propel.rst

@@ -15,7 +15,7 @@ A Simple Example: A Product
 In this section, you'll configure your database, create a ``Product`` object,
 persist it to the database and fetch it back out.
 
-.. sidebar:: Code along with the example
+.. sidebar:: Code along with the Example
 
     If you want to follow along with the example in this chapter, create an
     ``AcmeStoreBundle`` via:
@@ -425,7 +425,7 @@ before. First, fetch a ``$product`` object and then access its related
 
 Note, in the above example, only one query was made.
 
-More information on Associations
+More Information on Associations
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You will find more information on relations by reading the dedicated chapter on

book/routing.rst

@@ -868,7 +868,7 @@ routing system can be:
 
         $collection = new RouteCollection();
         $collection->add(
-            'homepage',
+            'article_show',
             new Route('/articles/{culture}/{year}/{title}.{_format}', array(
                 '_controller' => 'AcmeDemoBundle:Article:show',
                 '_format'     => 'html',
@@ -1161,7 +1161,7 @@ from the new routing resource.
     :doc:`FrameworkExtraBundle documentation </bundles/SensioFrameworkExtraBundle/annotations/routing>`
     to see how.
 
-Adding a Host requirement to Imported Routes
+Adding a Host Requirement to Imported Routes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.2
@@ -1343,8 +1343,8 @@ method::
     $this->generateUrl('blog_show', array('slug' => 'my-blog-post'), true);
     // http://www.example.com/blog/my-blog-post
 
-From a template, in Twig, simply use the ``url()`` function (which generates an absolute URL) 
-rather than the ``path()`` function (which generates a relative URL). In PHP, pass ``true`` 
+From a template, in Twig, simply use the ``url()`` function (which generates an absolute URL)
+rather than the ``path()`` function (which generates a relative URL). In PHP, pass ``true``
 to ``generateUrl()``:
 
 .. configuration-block::