diff --git a/validation.rst b/validation.rst
index 847a73ddc63..412676a908b 100644
--- a/validation.rst
+++ b/validation.rst
@@ -132,7 +132,7 @@ returned. Take this simple example from inside a controller::
     use App\Entity\Author;
 
     // ...
-    public function authorAction()
+    public function author()
     {
         $author = new Author();
 
diff --git a/validation/custom_constraint.rst b/validation/custom_constraint.rst
index 23932f8f652..c93356c8d60 100644
--- a/validation/custom_constraint.rst
+++ b/validation/custom_constraint.rst
@@ -107,7 +107,7 @@ Using custom validators is very easy, just as the ones provided by Symfony itsel
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # config/validator/validation.yaml
         App\Entity\AcmeEntity:
             properties:
                 name:
@@ -116,7 +116,7 @@ Using custom validators is very easy, just as the ones provided by Symfony itsel
 
     .. code-block:: xml
 
-        <!-- src/Resources/config/validation.xml -->
+        <!-- config/validator/validation.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -202,14 +202,14 @@ not to the property:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # config/validator/validation.yaml
         App\Entity\AcmeEntity:
             constraints:
                 - App\Validator\Constraints\ContainsAlphanumeric: ~
 
     .. code-block:: xml
 
-        <!-- src/Resources/config/validation.xml -->
+        <!-- config/validator/validation.xml -->
         <class name="App\Entity\AcmeEntity">
             <constraint name="App\Validator\Constraints\ContainsAlphanumeric" />
         </class>
diff --git a/validation/groups.rst b/validation/groups.rst
index bbf482bda11..d1ddd0a924d 100644
--- a/validation/groups.rst
+++ b/validation/groups.rst
@@ -44,7 +44,7 @@ user registers and when a user updates their contact information later:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # config/validator/validation.yaml
         App\Entity\User:
             properties:
                 email:
@@ -58,7 +58,7 @@ user registers and when a user updates their contact information later:
 
     .. code-block:: xml
 
-        <!-- src/Resources/config/validation.xml -->
+        <!-- config/validator/validation.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/validation/raw_values.rst b/validation/raw_values.rst
index 02ebe9fd178..915aebf5ce2 100644
--- a/validation/raw_values.rst
+++ b/validation/raw_values.rst
@@ -14,7 +14,7 @@ looks like this::
     use Symfony\Component\Validator\Validator\ValidatorInterface;
 
     // ...
-    public function addEmailAction($email, ValidatorInterface $validator)
+    public function addEmail($email, ValidatorInterface $validator)
     {
         $emailConstraint = new Assert\Email();
         // all constraint "options" can be set this way
diff --git a/validation/sequence_provider.rst b/validation/sequence_provider.rst
index e86e376cfa4..d570ae15958 100644
--- a/validation/sequence_provider.rst
+++ b/validation/sequence_provider.rst
@@ -49,7 +49,7 @@ username and the password are different only if all other validation passes
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # config/validator/validation.yaml
         App\Entity\User:
             group_sequence:
                 - User
@@ -67,7 +67,7 @@ username and the password are different only if all other validation passes
 
     .. code-block:: xml
 
-        <!-- src/Resources/config/validation.xml -->
+        <!-- config/validator/validation.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -145,7 +145,7 @@ You can also define a group sequence in the ``validation_groups`` form option::
     use Symfony\Component\Validator\Constraints\GroupSequence;
     use Symfony\Component\Form\AbstractType;
     // ...
-    
+
     class MyType extends AbstractType
     {
         // ...
@@ -195,7 +195,7 @@ entity and a new constraint group called ``Premium``:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # config/validator/validation.yaml
         App\Entity\User:
             properties:
                 name:
@@ -207,7 +207,7 @@ entity and a new constraint group called ``Premium``:
 
     .. code-block:: xml
 
-        <!-- src/Resources/config/validation.xml -->
+        <!-- config/validator/validation.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -308,13 +308,13 @@ provides a sequence of groups to be validated:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # config/validator/validation.yaml
         App\Entity\User:
             group_sequence_provider: true
 
     .. code-block:: xml
 
-        <!-- src/Resources/config/validation.xml -->
+        <!-- config/validator/validation.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/validation/severity.rst b/validation/severity.rst
index 61c50698d89..00c1b004e16 100644
--- a/validation/severity.rst
+++ b/validation/severity.rst
@@ -52,7 +52,7 @@ Use the ``payload`` option to configure the error level for each constraint:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # config/validator/validation.yaml
         App\Entity\User:
             properties:
                 username:
@@ -70,7 +70,7 @@ Use the ``payload`` option to configure the error level for each constraint:
 
     .. code-block:: xml
 
-        <!-- src/Resources/config/validation.xml -->
+        <!-- config/validator/validation.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/validation/translations.rst b/validation/translations.rst
index 0fbf130e559..223766e7aaf 100644
--- a/validation/translations.rst
+++ b/validation/translations.rst
@@ -84,13 +84,13 @@ property is not empty, add the following:
             }
         }
 
-Now, create a ``validators`` catalog file in the ``config/translations/`` directory:
+Now, create a ``validators`` catalog file in the ``translations/`` directory:
 
 .. configuration-block::
 
     .. code-block:: xml
 
-        <!-- config/translations/validators.en.xlf -->
+        <!-- translations/validators.en.xlf -->
         <?xml version="1.0"?>
         <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
             <file source-language="en" datatype="plaintext" original="file.ext">
@@ -105,12 +105,12 @@ Now, create a ``validators`` catalog file in the ``config/translations/`` direct
 
     .. code-block:: yaml
 
-        # config/translations/validators.en.yaml
+        # translations/validators.en.yaml
         author.name.not_blank: Please enter an author name.
 
     .. code-block:: php
 
-        // config/translations/validators.en.php
+        // translations/validators.en.php
         return array(
             'author.name.not_blank' => 'Please enter an author name.',
         );