symfony
diff --git a/‎book/forms.rst
+6-6 b/‎book/forms.rst
+6-6
diff --git a/‎book/from_flat_php_to_symfony2.rst
+1-1 b/‎book/from_flat_php_to_symfony2.rst
+1-1
diff --git a/‎book/installation.rst
+3-3 b/‎book/installation.rst
+3-3
diff --git a/‎book/routing.rst
-14 b/‎book/routing.rst
-14
diff --git a/‎book/security.rst
+16-12 b/‎book/security.rst
+16-12
diff --git a/‎book/templating.rst
+38-12 b/‎book/templating.rst
+38-12
@@ -711,8 +711,8 @@ the correct values of a number of field options.
   (i.e. is the field ``nullable``). This is very useful, as your client-side
   validation will automatically match your validation rules.
 
-* ``max_length``: If the field is some sort of text field, then the ``max_length``
-  option can be guessed from the validation constraints (if ``Length`` or
+* ``maxlength``: If the field is some sort of text field, then the ``maxlength``
+  option attribute can be guessed from the validation constraints (if ``Length`` or
   ``Range`` is used) or from the Doctrine metadata (via the field's length).
 
 .. note::
@@ -723,7 +723,7 @@ the correct values of a number of field options.
 If you'd like to change one of the guessed values, you can override it by
 passing the option in the options field array::
 
-    ->add('task', null, array('max_length' => 4))
+    ->add('task', null, array('attr' => array('maxlength' => 4)))
 
 .. index::
    single: Forms; Rendering in a template
@@ -1903,7 +1903,7 @@ Learn more from the Cookbook
 
 .. _`Symfony Form component`: https://github.com./symfony/Form
 .. _`DateTime`: http://php.net/manual/en/class.datetime.php
-.. _`Twig Bridge`: https://github.com./symfony/symfony/tree/2.3/src/Symfony/Bridge/Twig
-.. _`form_div_layout.html.twig`: https://github.com./symfony/symfony/blob/2.3/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
+.. _`Twig Bridge`: https://github.com./symfony/symfony/tree/master/src/Symfony/Bridge/Twig
+.. _`form_div_layout.html.twig`: https://github.com./symfony/symfony/blob/master/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
 .. _`Cross-site request forgery`: http://en.wikipedia.org/wiki/Cross-site_request_forgery
-.. _`view on GitHub`: https://github.com./symfony/symfony/tree/2.3/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form
+.. _`view on GitHub`: https://github.com./symfony/symfony/tree/master/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form
@@ -435,7 +435,7 @@ content:
 
     {
         "require": {
-            "symfony/symfony": "2.4.*"
+            "symfony/symfony": "2.5.*"
         },
         "autoload": {
             "files": ["model.php","controllers.php"]
 
@@ -59,7 +59,7 @@ Distribution:
 
 .. code-block:: bash
 
-    $ php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony '2.4.*'
+    $ php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony '2.5.*'
 
 .. tip::
 
@@ -106,10 +106,10 @@ one of the following commands (replacing ``###`` with your actual filename):
 .. code-block:: bash
 
     # for .tgz file
-    $ tar zxvf Symfony_Standard_Vendors_2.4.###.tgz
+    $ tar zxvf Symfony_Standard_Vendors_2.5.###.tgz
 
     # for a .zip file
-    $ unzip Symfony_Standard_Vendors_2.4.###.zip
+    $ unzip Symfony_Standard_Vendors_2.5.###.zip
 
 If you've downloaded "without vendors", you'll definitely need to read the
 next section.
 
@@ -68,10 +68,6 @@ The route is simple:
 
         return $collection;
 
-.. versionadded:: 2.2
-    The ``path`` option was introduced in Symfony 2.2, ``pattern`` is used
-    in older versions.
-
 The path defined by the ``blog_show`` route acts like ``/blog/*`` where
 the wildcard is given the name ``slug``. For the URL ``/blog/my-blog-post``,
 the ``slug`` variable gets a value of ``my-blog-post``, which is available
@@ -733,10 +729,6 @@ be accomplished with the following route configuration:
 
         return $collection;
 
-.. versionadded:: 2.2
-    The ``methods`` option was introduced in Symfony 2.2. Use the ``_method``
-    requirement in older versions.
-
 Despite the fact that these two routes have identical paths (``/contact``),
 the first route will match only GET requests and the second route will match
 only POST requests. This means that you can display the form and submit the
@@ -749,9 +741,6 @@ form via the same URL, while using distinct controllers for the two actions.
 Adding a Host Requirement
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 2.2
-    Host matching support was introduced in Symfony 2.2
-
 You can also match on the HTTP *host* of the incoming request. For more
 information, see :doc:`/components/routing/hostname_pattern` in the Routing
 component documentation.
@@ -1196,9 +1185,6 @@ from the new routing resource.
 Adding a Host Requirement to Imported Routes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 2.2
-    Host matching support was introduced in Symfony 2.2
-
 You can set the host regex on imported routes. For more information, see
 :ref:`component-routing-host-imported`.
 
 
@@ -183,8 +183,9 @@ can access ``/foo`` without being prompted to authenticate.
 
 .. tip::
 
-    You can also match a request against other details of the request (e.g. host).
-    For more information and examples read :doc:`/cookbook/security/firewall_restriction`.
+    You can also match a request against other details of the request (e.g.
+    host, method). For more information and examples read
+    :doc:`/cookbook/security/firewall_restriction`.
 
 .. image:: /images/book/security_anonymous_user_access.png
    :align: center
@@ -938,7 +939,7 @@ will match any ``ip``, ``host`` or ``method``:
 .....................
 
 Once Symfony has decided which ``access_control`` entry matches (if any),
-it then *enforces* access restrictions based on the ``roles`` and ``requires_channel``
+it then *enforces* access restrictions based on the ``roles``, ``allow_if`` and ``requires_channel``
 options:
 
 * ``role`` If the user does not have the given role(s), then access is denied
@@ -1170,19 +1171,25 @@ fine-grained enough in certain cases. When necessary, you can easily force
 authorization from inside a controller::
 
     // ...
-    use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
     public function helloAction($name)
     {
         if (false === $this->get('security.context')->isGranted('ROLE_ADMIN')) {
-            throw new AccessDeniedException();
+            throw $this->createAccessDeniedException('Unable to access this page!');
         }
 
         // ...
     }
 
 .. _book-security-securing-controller-annotations:
 
+.. versionadded:: 2.5
+    The ``createAccessDeniedException`` method was introduced in Symfony 2.5.
+
+The :method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller::createAccessDeniedException`
+method creates a special :class:`Symfony\\Component\\Security\\Core\\Exception\\AccessDeniedException`
+object, which ultimately triggers a 403 HTTP response inside Symfony.
+
 Thanks to the SensioFrameworkExtraBundle, you can also secure your controller using annotations::
 
     // ...
@@ -1552,9 +1559,10 @@ or via some online tool.
 Supported algorithms for this method depend on your PHP version. A full list
 is available by calling the PHP function :phpfunction:`hash_algos`.
 
-.. versionadded:: 2.2
-    As of Symfony 2.2 you can also use the :ref:`PBKDF2 <reference-security-pbkdf2>`
-    password encoder.
+.. tip::
+
+    It's also possible to use different hashing algorithms on a user-by-user
+    basis. See :doc:`/cookbook/security/named_encoders` for more details.
 
 Determining the Hashed Password
 ...............................
@@ -2217,10 +2225,6 @@ cookie will be ever created by Symfony):
 Utilities
 ---------
 
-.. versionadded:: 2.2
-    The ``StringUtils`` and ``SecureRandom`` classes were introduced in Symfony
-    2.2
-
 The Symfony Security component comes with a collection of nice utilities related
 to security. These utilities are used by Symfony, but you should also use
 them if you want to solve the problem they address.
 
@@ -373,11 +373,6 @@ When working with template inheritance, here are some tips to keep in mind:
 Template Naming and Locations
 -----------------------------
 
-.. versionadded:: 2.2
-    Namespaced path support was introduced in 2.2, allowing for template names
-    like ``@AcmeDemo/layout.html.twig``. See :doc:`/cookbook/templating/namespaced_paths`
-    for more details.
-
 By default, templates can live in two different locations:
 
 * ``app/Resources/views/``: The applications ``views`` directory can contain
@@ -570,10 +565,6 @@ you set `with_context`_ to false).
     maps (i.e. an array with named keys). If you needed to pass in multiple
     elements, it would look like this: ``{'foo': foo, 'bar': bar}``.
 
-.. versionadded:: 2.2
-    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
 
@@ -781,9 +772,6 @@ in your application configuration:
             ),
         ));
 
-.. versionadded:: 2.2
-    Default templates per render function was introduced in Symfony 2.2
-
 You can define default templates per ``render`` function (which will override
 any global default template that is defined):
 
@@ -1014,6 +1002,44 @@ assets won't be cached when deployed. For example, ``/images/logo.png`` might
 look like ``/images/logo.png?v2``. For more information, see the :ref:`ref-framework-assets-version`
 configuration option.
 
+.. _`book-templating-version-by-asset`:
+
+.. versionadded:: 2.5
+    Setting versioned URLs on an asset-by-asset basis was introduced in Symfony 2.5.
+
+If you need to set a version for a specific asset, you can set the fourth
+argument (or the ``version`` argument) to the desired version:
+
+.. configuration-block::
+
+    .. code-block:: html+jinja
+
+        <img src="{{ asset('images/logo.png', version='3.0') }}" alt="Symfony!" />
+
+    .. code-block:: html+php
+
+        <img src="<?php echo $view['assets']->getUrl('images/logo.png', null, false, '3.0') ?>" alt="Symfony!" />
+
+If you dont give a version or pass ``null``, the default package version
+(from :ref:`ref-framework-assets-version`) will be used. If you pass ``false``,
+versioned URL will be deactivated for this asset.
+
+.. versionadded:: 2.5
+    Absolute URLs for assets were introduced in Symfony 2.5.
+
+If you need absolute URLs for assets, you can set the third argument (or the
+``absolute`` argument) to ``true``:
+
+.. configuration-block::
+
+    .. code-block:: html+jinja
+
+        <img src="{{ asset('images/logo.png', absolute=true) }}" alt="Symfony!" />
+
+    .. code-block:: html+php
+
+        <img src="<?php echo $view['assets']->getUrl('images/logo.png', null, true) ?>" alt="Symfony!" />
+
 .. index::
    single: Templating; Including stylesheets and JavaScripts
    single: Stylesheets; Including stylesheets
Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ content:`
`435`	`435`
`436`	`436`	`{`
`437`	`437`	`"require": {`
`438`		`- "symfony/symfony": "2.4.*"`
	`438`	`+ "symfony/symfony": "2.5.*"`
`439`	`439`	`},`
`440`	`440`	`"autoload": {`
`441`	`441`	`"files": ["model.php","controllers.php"]`