Merge branch 'model2resource'

Conflicts:
	docs/narr/views.rst

1 files changed, 3 insertions, 3 deletions

diff --git a/docs/narr/MyProject/myproject/__init__.py b/docs/narr/MyProject/myproject/__init__.py
index 05730a115..813028704 100644
--- a/docs/narr/MyProject/myproject/__init__.py
+++ b/docs/narr/MyProject/myproject/__init__.py
@@ -1,12 +1,12 @@
 from pyramid.config import Configurator
-from myproject.models import get_root
+from myproject.resources import Root
 
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
-    config = Configurator(root_factory=get_root, settings=settings)
+    config = Configurator(root_factory=Root, settings=settings)
     config.add_view('myproject.views.my_view',
-                    context='myproject.models.MyModel',
+                    context='myproject.resources.Root',
                     renderer='myproject:templates/mytemplate.pt')
     config.add_static_view('static', 'myproject:static')
     return config.make_wsgi_app()