Merge branch 'feature/di-parameter-escape' of github.com:tPl0ch/symfony-docs into tPl0ch-feature/di-parameter-escape

Conflicts:
	book/service_container.rst

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: