Apr 12, 2014 · Apr 6, 2014 · Apr 12, 2014 · Apr 12, 2014
diff --git a/book/doctrine.rst b/book/doctrine.rst
 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 theexample
 ..sidebar::Code along with theExample

    If you want to follow along with the example in this chapter, create
    an ``AcmeStoreBundle`` via:

    $ php app/console doctrine:database:create

 ..sidebar::SettingUp The Database to be UTF8
 ..sidebar::Settingup 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,
 that allow you to take different actions as objects go through their persistence
 lifecycle.

 LearnMore
 Learnmore
 ~~~~~~~~~~

 For more information about Doctrine, see the *Doctrine* section of the
diff --git a/book/forms.rst b/book/forms.rst
 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
    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::
diff --git a/book/from_flat_php_to_symfony2.rst b/book/from_flat_php_to_symfony2.rst
 By the end, you'll see how Symfony2 can rescue you from mundane tasks and
 let you take back control of your code.

 Asimple Blog inflat PHP
 ASimple Blog inFlat PHP
 -------------------------

 In this chapter, you'll build the token blog application using only flat PHP.
 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`_.

 Bettertemplates
 BetterTemplates
 ----------------

 If you choose to use it, Symfony2 comes standard with a templating engine
diff --git a/book/http_cache.rst b/book/http_cache.rst
 header to the response containing useful information about cache hits and
 misses.

 ..sidebar::Changing from one Reverse Proxy toAnother
 ..sidebar::Changing from one Reverse Proxy toanother

    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
    // set a custom Cache-Control directive
    $response->headers->addCacheControlDirective('must-revalidate', true);

 Public vsPrivate Responses
 Public vsprivate Responses
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~

 Both gateway and proxy caches are considered "shared" caches as the cached
diff --git a/book/http_fundamentals.rst b/book/http_fundamentals.rst
 ..index::
   single: HTTP; Request-response paradigm

 Step1: The Clientsends a Request
 Step1: The ClientSends a Request
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 Every conversation on the web starts with a *request*. The request is a text
 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 Serverreturns a Response
 Step 2: The ServerReturns a Response
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 Once a server has received the request, it knows exactly which resource the
 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 Requestattributes
 ..sidebar::ParameterBags and RequestAttributes

    As seen above, the ``$_GET`` and ``$_POST`` variables are accessible via
    the public ``query`` and ``request`` properties respectively. Each of
diff --git a/book/internals.rst b/book/internals.rst
 default implementation automatically resolves the method arguments, based on
 the Request attributes.

 ..sidebar::Matching Controllermethod arguments from Requestattributes
 ..sidebar::Matching ControllerMethod Arguments from RequestAttributes

    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
    If the token is not clickable, it means that the profiler routes are not
    registered (see below for configuration information).

 Analyzing Profilingdata with the Web Profiler
 Analyzing ProfilingData with the Web Profiler
 ..............................................

 The Web Profiler is a visualization tool for profiling data that you can use
diff --git a/book/propel.rst b/book/propel.rst
 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 theexample
 ..sidebar::Code along with theExample

    If you want to follow along with the example in this chapter, create an
    ``AcmeStoreBundle`` via:

 Note, in the above example, only one query was made.

 Moreinformation on Associations
 MoreInformation on Associations
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 You will find more information on relations by reading the dedicated chapter on
diff --git a/book/routing.rst b/book/routing.rst
 :doc:`FrameworkExtraBundle documentation</bundles/SensioFrameworkExtraBundle/annotations/routing>`
    to see how.

 Adding a Hostrequirement to Imported Routes
 Adding a HostRequirement to Imported Routes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 ..versionadded::2.2
    $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::
diff --git a/book/security.rst b/book/security.rst

 .. _book-security-common-pitfalls:

 ..sidebar::AvoidCommon Pitfalls
 ..sidebar::Avoidcommon Pitfalls

    When setting up your login form, watch out for a few common pitfalls.

 method calls, etc) with different roles. Later, you'll learn more about how
 roles are created and assigned to users.

 SecuringSpecific URL Patterns
 Securingspecific URL Patterns
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 The most basic way to secure part of your application is to secure an entire

 .. _security-book-access-control-explanation:

 Understanding how ``access_control``works
 Understanding how ``access_control``Works
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 For each incoming request, Symfony2 checks each ``access_control`` entry
 by requiring a set of *roles* for a resource. This section explores
 the other side of authorization: users.

 Where do Userscome from? (*User Providers*)
 Where do UsersCome from? (*User Providers*)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 During authentication, the user submits a set of credentials (usually a username

        <p>Username: <?php echo $app->getUser()->getUsername() ?></p>

 UsingMultiple User Providers
 Usingmultiple User Providers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 Each authentication mechanism (e.g. HTTP Authentication, form login, etc)
    idea to have a main firewall that covers all URLs (as has been shown
    in this chapter).

 Access Control Lists (ACLs): SecuringIndividual Database Objects
 Access Control Lists (ACLs): Securingindividual Database Objects
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 Imagine you are designing a blog system where your users can comment on your
    // is password1 equals to password2?
    $bool = StringUtils::equals($password1, $password2);

 Generating a secureRandom Number
 Generating a securerandom Number
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 Whenever you need to generate a secure random number, you are highly
diff --git a/book/service_container.rst b/book/service_container.rst
    and "setter injection". The Symfony2 service container also supports
    "property injection".

 Making ReferencesOptional
 Making Referencesoptional
 --------------------------

 Sometimes, one of your services may have an optional dependency, meaning
diff --git a/book/templating.rst b/book/templating.rst
 ..index::
   single: Templating

 Creating andusing Templates
 Creating andUsing Templates
 ============================

 As you know, the:doc:`controller</book/controller>` is responsible for
 ..index::
   single: Templating; The templating service

 Configuring andusing the ``templating`` Service
 Configuring andUsing the ``templating`` Service
 ------------------------------------------------

 The heart of the template system in Symfony2 is the templating ``Engine``.
diff --git a/book/testing.rst b/book/testing.rst

 .. _book-testing-request-method-sidebar:

 ..sidebar::More about the ``request()``method:
 ..sidebar::More about the ``request()``Method:

    The full signature of the ``request()`` method is::

    // Clears all cookies and the history
    $client->restart();

 AccessingInternal Objects
 Accessinginternal Objects
 ~~~~~~~~~~~~~~~~~~~~~~~~~~

 ..versionadded::2.3
diff --git a/book/translation.rst b/book/translation.rst
 You can now use the locale to create routes to other translated pages
 in your application.

 Setting aDefault Locale
 Setting adefault Locale
 ~~~~~~~~~~~~~~~~~~~~~~~~

 What if the user's locale hasn't been determined? You can guarantee that a
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst

 .. _quick-tour-big-picture-environments-intro:

 WhatIs anenvironment?
 Whatis anEnvironment?
 ~~~~~~~~~~~~~~~~~~~~~~~

 An :term:`Environment` represents a group of configurations that's used to run

 .. _Composer:             https://getcomposer.org/
 .. _executable installer: http://getcomposer.org/download
 .. _Twig:                 http://twig.sensiolabs.org/
 .. _Twig:                 http://twig.sensiolabs.org/
diff --git a/quick_tour/the_controller.rst b/quick_tour/the_controller.rst

    throw new \Exception('Something went wrong!');

 Gettinginformation from the Request
 GettingInformation from the Request
 ------------------------------------

 Symfony automatically injects the ``Request`` object when the controller has an
diff --git a/quick_tour/the_view.rst b/quick_tour/the_view.rst
    *absolute* URLs, which is very handy when rendering emails and RSS files:
    ``{{ url('_demo_hello', {'name': 'Thomas'}) }}``.

 Including Assets:images, JavaScripts, andstylesheets
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Including Assets:Images, JavaScripts andStylesheets
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 What would the Internet be without images, JavaScripts, and stylesheets?
 Symfony2 provides the ``asset`` function to deal with them easily:
diff --git a/reference/configuration/assetic.rst b/reference/configuration/assetic.rst
 .. index::
   pair: Assetic; Configuration reference
 pair: Assetic; Configuration reference

 AsseticBundle Configuration ("assetic")
 =======================================

 FullDefault Configuration
 Fulldefault Configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~

 .. configuration-block::
diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst
 .. index::
   single: Doctrine; ORM configuration reference
   single: Configuration reference; Doctrine ORM
 single: Doctrine; ORM configuration reference
 single: Configuration reference; Doctrine ORM

 DoctrineBundle Configuration ("doctrine")
 =========================================

 Full default configuration
 --------------------------

 .. configuration-block::

    .. code-block:: yaml
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
 .. index::
   single: Configuration reference; Framework
 single: Configuration reference; Framework

 FrameworkBundle Configuration ("framework")
 ===========================================

    $profiler->enable();

 FullDefault Configuration
 Fulldefault Configuration
 --------------------------

 .. configuration-block::
diff --git a/reference/configuration/monolog.rst b/reference/configuration/monolog.rst
 .. index::
   pair: Monolog; Configuration reference
 pair: Monolog; Configuration reference

 MonologBundle Configuration ("monolog")
 =======================================

 Full default Configuration
 --------------------------

 .. configuration-block::

    .. code-block:: yaml
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 theexample
		..sidebar::Code along with theExample

		If you want to follow along with the example in this chapter, create
		an ``AcmeStoreBundle`` via:
Expand DownExpand Up		@@ -125,7 +125,7 @@ for you:

		$ php app/console doctrine:database:create

		..sidebar::SettingUp The Database to be UTF8
		..sidebar::Settingup 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,
Expand DownExpand Up		@@ -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.

		LearnMore
		Learnmore
		~~~~~~~~~~

		For more information about Doctrine, see the Doctrine section of the
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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
Expand All		@@ -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::
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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.

		Asimple Blog inflat PHP
		ASimple Blog inFlat PHP
		-------------------------

		In this chapter, you'll build the token blog application using only flat PHP.
Expand DownExpand Up		@@ -698,7 +698,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`_.

		Bettertemplates
		BetterTemplates
		----------------

		If you choose to use it, Symfony2 comes standard with a templating engine
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 toAnother
		..sidebar::Changing from one Reverse Proxy toanother

		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
Expand DownExpand Up		@@ -327,7 +327,7 @@ its creation more manageable::
		// set a custom Cache-Control directive
		$response->headers->addCacheControlDirective('must-revalidate', true);

		Public vsPrivate Responses
		Public vsprivate Responses
		~~~~~~~~~~~~~~~~~~~~~~~~~~~

		Both gateway and proxy caches are considered "shared" caches as the cached
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,7 +42,7 @@ how to master it.
		..index::
		single: HTTP; Request-response paradigm

		Step1: The Clientsends a Request
		Step1: The ClientSends a Request
		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

		Every conversation on the web starts with a request. The request is a text
Expand DownExpand Up		@@ -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 Serverreturns a Response
		Step 2: The ServerReturns a Response
		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

		Once a server has received the request, it knows exactly which resource the
Expand DownExpand Up		@@ -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 Requestattributes
		..sidebar::ParameterBags and RequestAttributes

		As seen above, the ``$_GET`` and ``$_POST`` variables are accessible via
		the public ``query`` and ``request`` properties respectively. Each of
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 Controllermethod arguments from Requestattributes
		..sidebar::Matching ControllerMethod Arguments from RequestAttributes

		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
Expand DownExpand Up		@@ -489,7 +489,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 Profilingdata with the Web Profiler
		Analyzing ProfilingData with the Web Profiler
		..............................................

		The Web Profiler is a visualization tool for profiling data that you can use
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 theexample
		..sidebar::Code along with theExample

		If you want to follow along with the example in this chapter, create an
		``AcmeStoreBundle`` via:
Expand DownExpand Up		@@ -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.

		Moreinformation on Associations
		MoreInformation on Associations
		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

		You will find more information on relations by reading the dedicated chapter on
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1071,7 +1071,7 @@ from the new routing resource.
		:doc:`FrameworkExtraBundle documentation</bundles/SensioFrameworkExtraBundle/annotations/routing>`
		to see how.

		Adding a Hostrequirement to Imported Routes
		Adding a HostRequirement to Imported Routes
		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

		..versionadded::2.2
Expand DownExpand Up		@@ -1253,8 +1253,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::
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -570,7 +570,7 @@ see :doc:`/cookbook/security/form_login`.

		.. _book-security-common-pitfalls:

		..sidebar::AvoidCommon Pitfalls
		..sidebar::Avoidcommon Pitfalls

		When setting up your login form, watch out for a few common pitfalls.

Expand DownExpand Up		@@ -713,7 +713,7 @@ In this section, you'll focus on how to secure different resources (e.g. URLs,
		method calls, etc) with different roles. Later, you'll learn more about how
		roles are created and assigned to users.

		SecuringSpecific URL Patterns
		Securingspecific URL Patterns
		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

		The most basic way to secure part of your application is to secure an entire
Expand DownExpand Up		@@ -763,7 +763,7 @@ You can define as many URL patterns as you need - each is a regular expression.

		.. _security-book-access-control-explanation:

		Understanding how ``access_control``works
		Understanding how ``access_control``Works
		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

		For each incoming request, Symfony2 checks each ``access_control`` entry
Expand DownExpand Up		@@ -1025,7 +1025,7 @@ In the previous sections, you learned how you can protect different resources
		by requiring a set of roles for a resource. This section explores
		the other side of authorization: users.

		Where do Userscome from? (User Providers)
		Where do UsersCome from? (User Providers)
		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

		During authentication, the user submits a set of credentials (usually a username
Expand DownExpand Up		@@ -1390,7 +1390,7 @@ method:

		<p>Username: <?php echo $app->getUser()->getUsername() ?></p>

		UsingMultiple User Providers
		Usingmultiple User Providers
		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

		Each authentication mechanism (e.g. HTTP Authentication, form login, etc)
Expand DownExpand Up		@@ -1671,7 +1671,7 @@ the built-in helper function:
		idea to have a main firewall that covers all URLs (as has been shown
		in this chapter).

		Access Control Lists (ACLs): SecuringIndividual Database Objects
		Access Control Lists (ACLs): Securingindividual Database Objects
		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

		Imagine you are designing a blog system where your users can comment on your
Expand DownExpand Up		@@ -1868,7 +1868,7 @@ algorithm; you can use the same strategy in your own code thanks to the
		// is password1 equals to password2?
		$bool = StringUtils::equals($password1, $password2);

		Generating a secureRandom Number
		Generating a securerandom Number
		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

		Whenever you need to generate a secure random number, you are highly
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -762,7 +762,7 @@ Injecting the dependency by the setter method just needs a change of syntax:
		and "setter injection". The Symfony2 service container also supports
		"property injection".

		Making ReferencesOptional
		Making Referencesoptional
		--------------------------

		Sometimes, one of your services may have an optional dependency, meaning
Expand Down