From 2a3955b5c4f4acddcb936e40fbcf499a3ea47cde Mon Sep 17 00:00:00 2001 From: John Bafford Date: Thu, 6 Mar 2014 23:26:51 -0500 Subject: [PATCH 1/3] Fix Image constraint class and validator link Change Image constraint links from File and FileValidator to Image and ImageValidator. --- reference/constraints/Image.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/constraints/Image.rst b/reference/constraints/Image.rst index 363aca62537..7469f45ac96 100644 --- a/reference/constraints/Image.rst +++ b/reference/constraints/Image.rst @@ -27,9 +27,9 @@ the documentation on this constraint. | | - `minHeightMessage`_ | | | - See :doc:`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 From 899bc4ef35493a83c0f0ad471d372f191ea7434f Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Thu, 3 Apr 2014 15:44:52 +0200 Subject: [PATCH 2/3] fix literal --- cookbook/security/firewall_restriction.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/security/firewall_restriction.rst b/cookbook/security/firewall_restriction.rst index b5ae292159d..e5379cbc310 100644 --- 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. From 612ab9b3af1715ed5b6c5b9837a7e463d4072bf6 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Thu, 3 Apr 2014 15:48:13 +0200 Subject: [PATCH 3/3] add missing toctree entry for the firewall restriction article --- cookbook/security/index.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/cookbook/security/index.rst b/cookbook/security/index.rst index 40b0edd297c..ebb0ae4db6a 100644 --- a/cookbook/security/index.rst +++ b/cookbook/security/index.rst @@ -12,6 +12,7 @@ Security acl acl_advanced force_https + firewall_restriction host_restriction form_login securing_services