Merge branch '2.0' into 2.1

weaverryan · weaverryan · commit c972162c50ae · 2013-05-09T06:17:13.000-04:00
diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst
@@ -10,7 +10,7 @@ The HttpFoundation Component
     specification.
 
 In PHP, the request is represented by some global variables (``$_GET``,
-``$_POST``, ``$_FILE``, ``$_COOKIE``, ``$_SESSION``, ...) and the response is
+``$_POST``, ``$_FILES``, ``$_COOKIE``, ``$_SESSION``, ...) and the response is
 generated by some functions (``echo``, ``header``, ``setcookie``, ...).
 
 The Symfony2 HttpFoundation component replaces these default PHP global
@@ -61,7 +61,7 @@ can be accessed via several public properties:
 
 * ``attributes``: no equivalent - used by your app to store other data (see :ref:`below<component-foundation-attributes>`)
 
-* ``files``: equivalent of ``$_FILE``;
+* ``files``: equivalent of ``$_FILES``;
 
 * ``server``: equivalent of ``$_SERVER``;
 
diff --git a/cookbook/controller/error_pages.rst b/cookbook/controller/error_pages.rst
@@ -16,7 +16,7 @@ control you need:
 
 1. Customize the error templates of the different error pages (explained below);
 
-2. Replace the default exception controller ``TwigBundle::Exception:show``
+2. Replace the default exception controller ``TwigBundle:Exception:show``
    with your own controller and handle it however you want (see
    :ref:`exception_controller in the Twig reference<config-twig-exception-controller>`);
 
