1 files changed, 19 insertions, 16 deletions
diff --git a/doc/howtos/website/basic-controller b/doc/howtos/website/basic-controller
index 96f67b46508..7b29c58f013 100644
--- a/doc/howtos/website/basic-controller
+++ b/doc/howtos/website/basic-controller
@@ -1,19 +1,22 @@
 # HG changeset patch
 # Parent 78b4476f35cbef86ee4f858daf843e3b932fb9fa
-diff -r 78b4476f35cb -r d5ad2ad84a5d academy/__init__.py
---- a/academy/__init__.py	Mon Aug 11 16:09:21 2014 +0200
-+++ b/academy/__init__.py	Mon Aug 11 16:12:38 2014 +0200
-@@ -0,0 +1,1 @@
-+from . import controllers
-diff -r 78b4476f35cb -r d5ad2ad84a5d academy/controllers.py
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/academy/controllers.py	Mon Aug 11 16:12:38 2014 +0200
-@@ -0,0 +1,8 @@
-+# -*- coding: utf-8 -*-
-+from openerp import http
-+
+# Parent  0a4f5e3206a0738201a40d2d1a88f41fdbbc98bf
+
+diff --git a/academy/controllers.py b/academy/controllers.py
+--- a/academy/controllers.py
++++ b/academy/controllers.py
+@@ -1,10 +1,10 @@
+ # -*- coding: utf-8 -*-
+ from openerp import http
+ 
+-# class Academy(http.Controller):
+-#     @http.route('/academy/academy/', auth='public')
+-#     def index(self, **kw):
+-#         return "Hello, world"
 +class Academy(http.Controller):
-+    @http.route('/academy/', auth='public')
-+    def index(self):
-+        return "Hello, world!"
-+
++    @http.route('/academy/academy/', auth='public')
++    def index(self, **kw):
++        return "Hello, world"
+ 
+ #     @http.route('/academy/academy/objects/', auth='public')
+ #     def list(self, **kw):