From 0f3fe256251108aba0e93a4a3a2b5c4e7a625046 Mon Sep 17 00:00:00 2001
From: Alexander O'Neill <al.oneill@unb.ca>
Date: Sun, 16 Jun 2013 14:33:06 -0700
Subject: [PATCH 1/2] Added namespace declaration to MainController.php.

---
 book/http_fundamentals.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/book/http_fundamentals.rst b/book/http_fundamentals.rst
index 61760b5e41e..53ce5de3e4e 100644
--- a/book/http_fundamentals.rst
+++ b/book/http_fundamentals.rst
@@ -459,6 +459,8 @@ the ``AcmeDemoBundle:Main:contact`` string is a short syntax that points to a
 specific PHP method ``contactAction`` inside a class called ``MainController``::
 
     // src/Acme/DemoBundle/Controller/MainController.php
+    namespace Acme\DemoBundle\Controller;
+
     use Symfony\Component\HttpFoundation\Response;
 
     class MainController

From 0ff91da3103912531ef25168063f10e4283d496f Mon Sep 17 00:00:00 2001
From: Alexander O'Neill <al.oneill@unb.ca>
Date: Mon, 17 Jun 2013 08:08:17 -0700
Subject: [PATCH 2/2] Changed </components/yaml/introduction> to
 </components/yaml/format> per PR feedback.

---
 book/http_fundamentals.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/http_fundamentals.rst b/book/http_fundamentals.rst
index 53ce5de3e4e..97fc86467ad 100644
--- a/book/http_fundamentals.rst
+++ b/book/http_fundamentals.rst
@@ -449,7 +449,7 @@ by adding an entry for ``/contact`` to your routing configuration file:
 
 .. note::
 
-   This example uses :doc:`YAML</components/yaml/introduction>` to define the routing
+   This example uses :doc:`YAML</components/yaml/format>` to define the routing
    configuration. Routing configuration can also be written in other formats
    such as XML or PHP.