Merge branch '2.0' into 2.1

weaverryan · weaverryan · commit beb366595146 · 2013-05-03T23:47:23.000-06:00
Conflicts:
	reference/configuration/framework.rst
diff --git a/components/http_foundation/trusting_proxies.rst b/components/http_foundation/trusting_proxies.rst
@@ -18,7 +18,7 @@ your proxy::
 
     $request = Request::createFromGlobals();
     // only trust proxy headers coming from this IP address
-    $request->setTrustedProxies(array(192.0.0.1));
+    $request->setTrustedProxies(array('192.0.0.1'));
 
 Configuring Header Names
 ------------------------
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -26,6 +26,7 @@ Configuration
     * enabled
     * field_name
 * `session`_
+    * `name`_
     * `cookie_lifetime`_
     * `cookie_path`_
     * `cookie_domain`_
@@ -146,6 +147,14 @@ csrf_protection
 session
 ~~~~~~~
 
+name
+....
+
+**type**: ``string`` **default**: ``null``
+
+This specifies the name of the session cookie. By default it will use the cookie
+name which is defined in the ``php.ini`` with the ``session.name`` directive.
+
 cookie_lifetime
 ...............
 
