Merge branch '2.0' into 2.1

weaverryan · weaverryan · commit a2dabe8107bd · 2013-03-30T16:32:01.000-05:00
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -19,6 +19,7 @@ Configuration
 * `ide`_
 * `test`_
 * `trust_proxy_headers`_
+* `trusted_proxies`_
 * `form`_
     * enabled
 * `csrf_protection`_
