[IMP] doc: update website to scaffold

1 files changed, 12 insertions, 7 deletions

diff --git a/doc/howtos/website/routing-basic b/doc/howtos/website/routing-basic
index 15c19c632a5..933b6540b27 100644
--- a/doc/howtos/website/routing-basic
+++ b/doc/howtos/website/routing-basic
@@ -1,14 +1,19 @@
 # HG changeset patch
 # Parent 0795247fa6cbb63238941f3dd26a8b6144fa71ee
-diff -r 0795247fa6cb -r e9d9740fa185 academy/controllers.py
---- a/academy/controllers.py	Tue Aug 12 11:27:14 2014 +0200
-+++ b/academy/controllers.py	Tue Aug 12 16:51:29 2014 +0200
-@@ -8,3 +8,8 @@ class Academy(http.Controller):
-         return http.request.render('academy.index', {
-             'teachers': Teachers.search([]),
+# Parent  f66ff336f8ed20e022660bd74a43af1b44a1f275
+
+diff --git a/academy/controllers.py b/academy/controllers.py
+--- a/academy/controllers.py
++++ b/academy/controllers.py
+@@ -9,6 +9,11 @@ class Academy(http.Controller):
+             'teachers': Teachers.search([])
          })
-+
+ 
 +    @http.route('/academy/<name>/', auth='public', website=True)
 +    def teacher(self, name):
 +        return '<h1>{}</h1>'.format(name)
 +
++
+ #     @http.route('/academy/academy/objects/', auth='public')
+ #     def list(self, **kw):
+ #         return http.request.render('academy.listing', {