Merge branch 'master' of github.com:Pylons/pyramid

Chris McDonough

2010-12-19 ca07a1c93923a275bac1aa71a8a8323522305eb0

Merge branch 'master' of github.com:Pylons/pyramid

 pyramid/paster_templates/starter/+package+/__init__.py_tmpl

@@ -6,7 +6,7 @@
    """
    config = Configurator(root_factory=Root, settings=settings)
    config.add_view('{{package}}.views.my_view',
                    context='{{package}}:resources.Root"
                    context='{{package}}:resources.Root',
                    renderer='{{package}}:templates/mytemplate.pt')
    config.add_static_view('static', '{{package}}:static')
    return config.make_wsgi_app()

 pyramid/paster_templates/starter_zcml/+package+/__init__.py_tmpl

@@ -1,5 +1,5 @@
from pyramid.config import Configurator
from {{package}}.models import Root
from {{package}}.resources import Root

def main(global_config, **settings):
    """ This function returns a Pyramid WSGI application.