Merge branch '2.1' into 2.2

Author: weaverryan

book/service_container.rst

@@ -227,6 +227,23 @@ The end result is exactly the same as before - the difference is only in
 to look for parameters with those names. When the container is built, it
 looks up the value of each parameter and uses it in the service definition.
 
+.. versionadded:: 2.1
+    Escaping the ``@`` character in YAML parameter values is new in Symfony 2.1.9
+    and Symfony 2.2.1.
+
+.. note::
+
+    If you want to use a string that starts with an ``@`` sign as a parameter
+    value (i.e. a very safe mailer password) in a yaml file, you need to escape
+    it by adding another ``@`` sign (This only applies to the YAML format):
+
+    .. code-block:: yaml
+
+        # app/config/parameters.yml
+        parameters:
+            # This will be parsed as string "@securepass"
+            mailer_password: "@@securepass"
+
 The purpose of parameters is to feed information into services. Of course
 there was nothing wrong with defining the service without using any parameters.
 Parameters, however, have several advantages:

cookbook/security/target_path.rst

@@ -5,9 +5,10 @@ How to change the Default Target Path Behavior
 ==============================================
 
 By default, the security component retains the information of the last request
-URI in a session variable named ``_security.target_path``. Upon a successful
-login, the user is redirected to this path, as to help her continue from
-the last known page she visited.
+URI in a session variable named ``_security.main.target_path`` (with ``main`` being
+the name of the firewall, defined in ``security.yml``). Upon a successful
+login, the user is redirected to this path, as to help her continue from the
+last known page she visited.
 
 On some occasions, this is unexpected. For example when the last request
 URI was an HTTP POST against a route which is configured to allow only a POST
@@ -61,7 +62,7 @@ Next, create your own ``ExceptionListener``::
                 return;
             }
 
-            $request->getSession()->set('_security.target_path', $request->getUri());
+            $request->getSession()->set('_security.main.target_path', $request->getUri());
         }
     }
 

reference/configuration/security.rst

@@ -64,34 +64,34 @@ Each part will be explained in the next section.
                     iterations:           1000
 
                 # Example options/values for what a custom encoder might look like
-                Acme\Your\Class\Name:
-                    algorithm:            ~
-                    ignore_case:          false
-                    encode_as_base64:     true
-                    iterations:           5000
-                    id:                   ~
+                Acme\DemoBundle\Entity\User3:
+                    id:                   my.encoder.id
 
             providers:            # Required
                 # Examples:
-                memory:
-                    name:                memory
-                    users:
-                        foo:
-                            password:            foo
-                            roles:               ROLE_USER
-                        bar:
-                            password:            bar
-                            roles:               [ROLE_USER, ROLE_ADMIN]
-                entity:
+                my_in_memory_provider:
+                    memory:
+                        users:
+                            foo:
+                                password:           foo
+                                roles:              ROLE_USER
+                            bar:
+                                password:           bar
+                                roles:              [ROLE_USER, ROLE_ADMIN]
+
+                my_entity_provider:
                     entity:
-                        class:               SecurityBundle:User
-                        property:            username
+                        class:              SecurityBundle:User
+                        property:           username
 
                 # Example custom provider
-                some_custom_provider:
+                my_some_custom_provider:
                     id:                   ~
+
+                # Chain some providers
+                my_chain_provider:
                     chain:
-                        providers:            []
+                        providers:          [ my_in_memory_provider, my_entity_provider ]
 
             firewalls:            # Required
                 # Examples: