Merge branch '2.4'

weaverryan · weaverryan · commit c77835c7000f · 2014-04-07T11:57:33.000+10:00
Conflicts:
	cookbook/security/firewall_restriction.rst
diff --git a/cookbook/security/firewall_restriction.rst b/cookbook/security/firewall_restriction.rst
@@ -65,7 +65,7 @@ matches the configured ``pattern``.
         ));
 
 The ``pattern`` is a regular expression. In this example, the firewall will only be 
-activated if the URL starts (due to the ``^`` regex character) with ``/admin``. If 
+activated if the URL starts (due to the ``^`` regex character) with ``/admin``. If
 the URL does not match this pattern, the firewall will not be activated and subsequent 
 firewalls will have the opportunity to be matched for this request.
 
diff --git a/cookbook/security/index.rst b/cookbook/security/index.rst
@@ -12,6 +12,7 @@ Security
     acl
     acl_advanced
     force_https
+    firewall_restriction
     host_restriction
     firewall_restriction
     form_login
diff --git a/reference/constraints/Image.rst b/reference/constraints/Image.rst
@@ -42,9 +42,9 @@ the documentation on this constraint.
 |                | - `allowPortraitMessage`_                                             |
 |                | - See :doc:`File </reference/constraints/File>` for inherited options |
 +----------------+-----------------------------------------------------------------------+
-| Class          | :class:`Symfony\\Component\\Validator\\Constraints\\File`             |
+| Class          | :class:`Symfony\\Component\\Validator\\Constraints\\Image`            |
 +----------------+-----------------------------------------------------------------------+
-| Validator      | :class:`Symfony\\Component\\Validator\\Constraints\\FileValidator`    |
+| Validator      | :class:`Symfony\\Component\\Validator\\Constraints\\ImageValidator`   |
 +----------------+-----------------------------------------------------------------------+
 
 Basic Usage
