dave1010
diff --git a/‎components/http_foundation/trusting_proxies.rst
Copy file name to clipboardExpand all lines: components/http_foundation/trusting_proxies.rst
+9-3Lines changed: 9 additions & 3 deletions b/‎components/http_foundation/trusting_proxies.rst
Copy file name to clipboardExpand all lines: components/http_foundation/trusting_proxies.rst
+9-3Lines changed: 9 additions & 3 deletions
diff --git a/‎reference/configuration/framework.rst
Copy file name to clipboardExpand all lines: reference/configuration/framework.rst
+7-3Lines changed: 7 additions & 3 deletions b/‎reference/configuration/framework.rst
Copy file name to clipboardExpand all lines: reference/configuration/framework.rst
+7-3Lines changed: 7 additions & 3 deletions
@@ -12,13 +12,19 @@ stored in a ``X-Forwarded-Host`` header.
 
 Since HTTP headers can be spoofed, Symfony2 does *not* trust these proxy
 headers by default. If you are behind a proxy, you should manually whitelist
-your proxy::
+your proxy.
+
+.. versionadded:: 2.3
+    CIDR notation support was introduced, so you can whitelist whole
+    subnets (e.g. ``10.0.0.0/8``, ``fc00::/7``).
+
+.. code-block:: php
 
     use Symfony\Component\HttpFoundation\Request;
 
     $request = Request::createFromGlobals();
-    // only trust proxy headers coming from this IP address
-    $request->setTrustedProxies(array(192.0.0.1));
+    // only trust proxy headers coming from this IP addresses
+    $request->setTrustedProxies(array('192.0.0.1', '10.0.0.0/8'));
 
 Configuring Header Names
 ------------------------
 
@@ -118,23 +118,27 @@ trusted_proxies
 Configures the IP addresses that should be trusted as proxies. For more details,
 see :doc:`/components/http_foundation/trusting_proxies`.
 
+.. versionadded:: 2.3
+    CIDR notation support was introduced, so you can whitelist whole
+    subnets (e.g. ``10.0.0.0/8``, ``fc00::/7``).
+
 .. configuration-block::
 
     .. code-block:: yaml
 
         framework:
-            trusted_proxies:  [192.0.0.1]
+            trusted_proxies:  [192.0.0.1, 10.0.0.0/8]
 
     .. code-block:: xml
 
-        <framework:config trusted-proxies="192.0.0.1">
+        <framework:config trusted-proxies="192.0.0.1, 10.0.0.0/8">
             <!-- ... -->
         </framework>
 
     .. code-block:: php
 
         $container->loadFromExtension('framework', array(
-            'trusted_proxies' => array('192.0.0.1'),
+            'trusted_proxies' => array('192.0.0.1', '10.0.0.0/8'),
         ));
 
 .. _reference-framework-form: