githubfromgui
diff --git a/‎book/doctrine.rst
+1-1 b/‎book/doctrine.rst
+1-1
diff --git a/‎book/forms.rst
+6-6 b/‎book/forms.rst
+6-6
diff --git a/‎book/from_flat_php_to_symfony2.rst
+4-4 b/‎book/from_flat_php_to_symfony2.rst
+4-4
diff --git a/‎book/http_fundamentals.rst
+1-1 b/‎book/http_fundamentals.rst
+1-1
diff --git a/‎book/installation.rst
+8-8 b/‎book/installation.rst
+8-8
diff --git a/‎book/internals.rst
+11-11 b/‎book/internals.rst
+11-11
diff --git a/‎book/page_creation.rst
+3-3 b/‎book/page_creation.rst
+3-3
diff --git a/‎book/service_container.rst
+1-1 b/‎book/service_container.rst
+1-1
diff --git a/‎book/templating.rst
+1-1 b/‎book/templating.rst
+1-1
diff --git a/‎book/translation.rst
+2-2 b/‎book/translation.rst
+2-2
diff --git a/‎components/config/definition.rst
+2-2 b/‎components/config/definition.rst
+2-2
diff --git a/‎components/console/helpers/dialoghelper.rst
+25-25 b/‎components/console/helpers/dialoghelper.rst
+25-25
@@ -91,7 +91,7 @@ information. By convention, this information is usually configured in an
             </doctrine:config>
 
         .. code-block:: php
-        
+
             // app/config/config.php
             $configuration->loadFromExtension('doctrine', array(
                 'dbal' => array(
 
@@ -1610,7 +1610,7 @@ but here's a short example:
    The ``constraints`` option, which accepts a single constraint or an array
    of constraints (before 2.1, the option was called ``validation_constraint``,
    and only accepted a single constraint) is new to Symfony 2.1.
-   
+
 .. code-block:: php
 
     use Symfony\Component\Validator\Constraints\Length;
@@ -1630,15 +1630,15 @@ but here's a short example:
 
 .. tip::
 
-    If you are using Validation Groups, you need to either reference the 
-    ``Default`` group when creating the form, or set the correct group on 
+    If you are using Validation Groups, you need to either reference the
+    ``Default`` group when creating the form, or set the correct group on
     the constraint you are adding.
-    
+
 .. code-block:: php
 
     new NotBlank(array('groups' => array('create', 'update'))
-    
-    
+
+
 Final Thoughts
 --------------
 
 
@@ -422,8 +422,8 @@ Add a Touch of Symfony2
 
 Symfony2 to the rescue. Before actually using Symfony2, you need to download
 it. This can be done by using Composer, which takes care of downloading the
-correct version and all its dependencies and provides an autoloader. An 
-autoloader is a tool that makes it possible to start using PHP classes 
+correct version and all its dependencies and provides an autoloader. An
+autoloader is a tool that makes it possible to start using PHP classes
 without explicitly including the file containing the class.
 
 In your root directory, create a ``composer.json`` file with the following
@@ -439,7 +439,7 @@ content:
             "files": ["model.php","controllers.php"]
         }
     }
-    
+
 Next, `download Composer`_ and then run the following command, which will download Symfony
 into a vendor/ directory:
 
@@ -448,7 +448,7 @@ into a vendor/ directory:
     $ php composer.phar install
 
 Beside downloading your dependencies, Composer generates a ``vendor/autoload.php`` file,
-which takes care of autoloading for all the files in the Symfony Framework as well as 
+which takes care of autoloading for all the files in the Symfony Framework as well as
 the files mentioned in the autoload section of your ``composer.json``.
 
 Core to Symfony's philosophy is the idea that an application's main job is
 
@@ -358,7 +358,7 @@ Stay Organized
 ~~~~~~~~~~~~~~
 
 Inside your front controller, you have to figure out which code should be
-executed and what the content to return should be. To figure this out, you'll 
+executed and what the content to return should be. To figure this out, you'll
 need to check the incoming URI and execute different parts of your code depending
 on that value. This can get ugly quickly::
 
 
@@ -188,7 +188,7 @@ Symfony itself - into the ``vendor/`` directory.
     When running ``php composer.phar install`` or ``php composer.phar update``,
     composer will execute post install/update commands to clear the cache
     and install assets. By default, the assets will be copied into your ``web``
-    directory. 
+    directory.
 
     Instead of copying your Symfony assets, you can create symlinks if
     your operating system supports it. To create symlinks, add an entry
@@ -239,7 +239,7 @@ If there are any issues, correct them now before moving on.
     On a UNIX system, this can be done with one of the following commands:
 
     .. code-block:: bash
-    
+
         $ ps aux | grep httpd
 
     or
@@ -261,7 +261,7 @@ If there are any issues, correct them now before moving on.
 
         $ sudo chmod +a "www-data allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
         $ sudo chmod +a "`whoami` allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
-    
+
     **2. Using Acl on a system that does not support chmod +a**
 
     Some systems don't support ``chmod +a``, but do support another utility
@@ -304,12 +304,12 @@ Symfony2 should welcome and congratulate you for your hard work so far!
 .. image:: /images/quick_tour/welcome.png
 
 .. tip::
-    
-    To get nice and short urls you should point the document root of your 
-    webserver or virtual host to the ``Symfony/web/`` directory. Though 
-    this is not required for development it is recommended at the time your 
+
+    To get nice and short urls you should point the document root of your
+    webserver or virtual host to the ``Symfony/web/`` directory. Though
+    this is not required for development it is recommended at the time your
     application goes into production as all system and configuration files
-    become inaccessible to clients then. For information on configuring 
+    become inaccessible to clients then. For information on configuring
     your specific web server document root, read
     :doc:`/cookbook/configuration/web_server_configuration`
     or consult the official documentation of your webserver:
 
@@ -146,10 +146,10 @@ the Request attributes.
 Handling Requests
 ~~~~~~~~~~~~~~~~~
 
-The :method:`Symfony\\Component\\HttpKernel\\HttpKernel::handle` method 
-takes a ``Request`` and *always* returns a ``Response``. To convert the 
-``Request``, ``handle()`` relies on the Resolver and an ordered chain of 
-Event notifications (see the next section for more information about each 
+The :method:`Symfony\\Component\\HttpKernel\\HttpKernel::handle` method
+takes a ``Request`` and *always* returns a ``Response``. To convert the
+``Request``, ``handle()`` relies on the Resolver and an ordered chain of
+Event notifications (see the next section for more information about each
 Event):
 
 #. Before doing anything else, the ``kernel.request`` event is notified -- if
@@ -209,14 +209,14 @@ Each event thrown by the Kernel is a subclass of
 :class:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent`. This means that
 each event has access to the same basic information:
 
-* :method:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent::getRequestType` 
-  - returns the *type* of the request (``HttpKernelInterface::MASTER_REQUEST`` 
+* :method:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent::getRequestType`
+  - returns the *type* of the request (``HttpKernelInterface::MASTER_REQUEST``
   or ``HttpKernelInterface::SUB_REQUEST``);
 
-* :method:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent::getKernel` 
+* :method:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent::getKernel`
   - returns the Kernel handling the request;
 
-* :method:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent::getRequest` 
+* :method:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent::getRequest`
   - returns the current ``Request`` being handled.
 
 ``getRequestType()``
@@ -513,7 +513,7 @@ HTTP header of the Response::
     want to get the token for an Ajax request, use a tool like Firebug to get
     the value of the ``X-Debug-Token`` HTTP header.
 
-Use the :method:`Symfony\\Component\\HttpKernel\\Profiler\\Profiler::find` 
+Use the :method:`Symfony\\Component\\HttpKernel\\Profiler\\Profiler::find`
 method to access tokens based on some criteria::
 
     // get the latest 10 tokens
@@ -526,8 +526,8 @@ method to access tokens based on some criteria::
     $tokens = $container->get('profiler')->find('127.0.0.1', '', 10);
 
 If you want to manipulate profiling data on a different machine than the one
-where the information were generated, use the 
-:method:`Symfony\\Component\\HttpKernel\\Profiler\\Profiler::export` and 
+where the information were generated, use the
+:method:`Symfony\\Component\\HttpKernel\\Profiler\\Profiler::export` and
 :method:`Symfony\\Component\\HttpKernel\\Profiler\\Profiler::import` methods::
 
     // on the production machine
 
@@ -516,9 +516,9 @@ You'll learn more about each of these directories in later chapters.
 
 .. sidebar:: Autoloading
 
-    When Symfony is loading, a special file - ``vendor/autoload.php`` - is 
-    included. This file is created by Composer and will autoload all 
-    application files living in the `src/` folder as well as all 
+    When Symfony is loading, a special file - ``vendor/autoload.php`` - is
+    included. This file is created by Composer and will autoload all
+    application files living in the `src/` folder as well as all
     third-party libraries mentioned in the ``composer.json`` file.
 
     Because of the autoloader, you never need to worry about using ``include``
 
@@ -255,7 +255,7 @@ looks up the value of each parameter and uses it in the service definition.
 
 .. caution::
 
-    You may receive a 
+    You may receive a
     :class:`Symfony\\Component\\DependencyInjection\\Exception\\ScopeWideningInjectionException`
     when passing the ``request`` service as an argument. To understand this
     problem better and learn how to solve it, refer to the cookbook article
 
@@ -1346,7 +1346,7 @@ a variable that is trusted and contains markup that should not be escaped.
 Suppose that administrative users are able to write articles that contain
 HTML code. By default, Twig will escape the article body.
 
-To render it normally, add the ``raw`` filter: 
+To render it normally, add the ``raw`` filter:
 
 .. code-block:: jinja
 
 
@@ -512,7 +512,7 @@ via the ``request`` object::
 .. index::
    single: Translations; Fallback and default locale
 
-It is also possible to store the locale in the session instead of on a per 
+It is also possible to store the locale in the session instead of on a per
 request basis. If you do this, each subsequent request will have this locale.
 
 .. code-block:: php
@@ -556,7 +556,7 @@ by defining a ``default_locale`` for the framework:
 
 .. versionadded:: 2.1
      The ``default_locale`` parameter was defined under the session key
-     originally, however, as of 2.1 this has been moved. This is because the 
+     originally, however, as of 2.1 this has been moved. This is because the
      locale is now set on the request instead of the session.
 
 .. _book-translation-locale-url:
 
@@ -293,7 +293,7 @@ you can take advantage of the shortcut
                 ->defaultFalse()
     ;
 
-The ``canBeDisabled`` method looks about the same except that the section 
+The ``canBeDisabled`` method looks about the same except that the section
 would be enabled by default.
 
 Merging options
@@ -384,7 +384,7 @@ make both of these ``auto_connect``.
 
 .. caution::
 
-    The target key will not be altered if it's mixed like 
+    The target key will not be altered if it's mixed like
     ``foo-bar_moo`` or if it already exists.
 
 Another difference between Yaml and XML is in the way arrays of values may
 
@@ -11,15 +11,15 @@ helper set, which you can get by calling
 
     $dialog = $this->getHelperSet()->get('dialog');
 
-All the methods inside the Dialog Helper have an 
+All the methods inside the Dialog Helper have an
 :class:`Symfony\\Component\\Console\\Output\\OutputInterface` as first the
 argument, the question as the second argument and the default value as last
 argument.
 
 Asking the User for confirmation
 --------------------------------
 
-Suppose you want to confirm an action before actually executing it. Add 
+Suppose you want to confirm an action before actually executing it. Add
 the following to your command::
 
     // ...
@@ -32,8 +32,8 @@ the following to your command::
     }
 
 In this case, the user will be asked "Continue with this action", and will return
-``true`` if the user answers with ``y`` or false in any other case. The third 
-argument to ``askConfirmation`` is the default value to return if the user doesn't 
+``true`` if the user answers with ``y`` or false in any other case. The third
+argument to ``askConfirmation`` is the default value to return if the user doesn't
 enter any input.
 
 Asking the User for Information
@@ -82,8 +82,8 @@ Validating the Answer
 
 You can even validate the answer. For instance, in the last example you asked
 for the bundle name. Following the Symfony2 naming conventions, it should
-be suffixed with ``Bundle``. You can validate that by using the 
-:method:`Symfony\\Component\\Console\\Helper\\DialogHelper::askAndValidate` 
+be suffixed with ``Bundle``. You can validate that by using the
+:method:`Symfony\\Component\\Console\\Helper\\DialogHelper::askAndValidate`
 method::
 
     // ...
@@ -105,16 +105,16 @@ method::
 This methods has 2 new arguments, the full signature is::
 
     askAndValidate(
-        OutputInterface $output, 
-        string|array $question, 
-        callback $validator, 
-        integer $attempts = false, 
+        OutputInterface $output,
+        string|array $question,
+        callback $validator,
+        integer $attempts = false,
         string $default = null
     )
 
 The ``$validator`` is a callback which handles the validation. It should
 throw an exception if there is something wrong. The exception message is displayed
-in the console, so it is a good practice to put some useful information in it. The callback 
+in the console, so it is a good practice to put some useful information in it. The callback
 function should also return the value of the user's input if the validation was successful.
 
 You can set the max number of times to ask in the ``$attempts`` argument.
@@ -162,24 +162,24 @@ could use the ``ask`` method described above or, to make sure the user
 provided a correct answer, the ``askAndValidate`` method. Both have
 the disadvantage that you need to handle incorrect values yourself.
 
-Instead, you can use the 
+Instead, you can use the
 :method:`Symfony\\Component\\Console\\Helper\\DialogHelper::select`
 method, which makes sure that the user can only enter a valid string
 from a predefined list::
 
     $dialog = $app->getHelperSet()->get('dialog');
     $colors = array('red', 'blue', 'yellow');
-    
+
     $color = $dialog->select(
-        $output, 
-        'Please select your favorite color (default to red)', 
-        $colors, 
+        $output,
+        'Please select your favorite color (default to red)',
+        $colors,
         0
     );
     $output->writeln('You have just selected: ' . $colors[$color]);
-    
+
     // ... do something with the color
-    
+
 The option which should be selected by default is provided with the fourth
 parameter. The default is ``null``, which means that no option is the default one.
 
@@ -197,23 +197,23 @@ from the command line, you need to overwrite the HelperSet used by the command::
 
     use Symfony\Component\Console\Helper\DialogHelper;
     use Symfony\Component\Console\Helper\HelperSet;
-    
+
     // ...
     public function testExecute()
     {
         // ...
         $commandTester = new CommandTester($command);
-        
+
         $dialog = $command->getHelper('dialog');
-        $dialog->setInputStream($this->getInputStream('Test\n')); 
+        $dialog->setInputStream($this->getInputStream('Test\n'));
         // Equals to a user inputing "Test" and hitting ENTER
         // If you need to enter a confirmation, "yes\n" will work
-        
+
         $commandTester->execute(array('command' => $command->getName()));
-    
+
         // $this->assertRegExp('/.../', $commandTester->getDisplay());
     }
-    
+
     protected function getInputStream($input)
     {
         $stream = fopen('php://memory', 'r+', false);
@@ -222,7 +222,7 @@ from the command line, you need to overwrite the HelperSet used by the command::
 
         return $stream;
     }
-    
+
 By setting the inputStream of the ``DialogHelper``, you imitate what the
 console would do internally with all user input through the cli. This way
 you can test any user interaction (even complex ones) by passing an appropriate