X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=doc%2Fhowto%2Fhowto_website%2Fbasic-page;fp=doc%2Fhowto%2Fhowto_website%2Fbasic-page;h=765522cbbbc5178aefd36125b02271fbf7c046f9;hb=8bcc42d4d08530801630c1ae9310369d59d1d17a;hp=9e6c9d9abc709777f97eff648b3ee2b18765b3b3;hpb=729258ed9db3d6114a68bab2436084ab478f22ae;p=odoo%2Fodoo.git

diff --git a/doc/howto/howto_website/basic-page b/doc/howto/howto_website/basic-page
index 9e6c9d9..765522c 100644
--- a/doc/howto/howto_website/basic-page
+++ b/doc/howto/howto_website/basic-page
@@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent a76a9a0e0668f4191bdc383a0d4b3173f44b39b1
+# Parent d06b1f422ac5672c4a4c34bb3a50e98df42f3e31
 
-diff --git a/controllers/my_controller.py b/controllers/my_controller.py
---- a/controllers/my_controller.py
-+++ b/controllers/my_controller.py
+diff --git a/controllers/academy.py b/controllers/academy.py
+--- a/controllers/academy.py
++++ b/controllers/academy.py
 @@ -6,4 +6,16 @@ from openerp.addons.web.controllers impo
- class my_controller(main.Home):
+ class academy(main.Home):
      @http.route('/', auth='none')
      def index(self):
 -        return "Hello, world!"