- Move static dir from pkg/templates/ to /pkg/ in pyramid_* paster templates.

40 files changed, 22 insertions, 24 deletions

diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index a03529e21..d129ff7ec 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -95,7 +95,7 @@ following:
    static resources for us, in this case, at
    ``http://localhost:6543/static/`` and below.  The ``path`` element
    of this tag is a relative directory name, so it finds the resources
-   it should serve within the ``templates/static`` directory inside
+   it should serve within the ``static`` directory inside
    the ``tutorial`` package.
 
 Content Models with ``models.py``
diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst
index 05ce2fbcd..44543cb33 100644
--- a/docs/tutorials/wiki/definingviews.rst
+++ b/docs/tutorials/wiki/definingviews.rst
@@ -234,12 +234,11 @@ the below:
 Static Resources
 ----------------
 
-Our templates name a single static resource named ``style.css``.  We
-need to create this and place it in a file named ``style.css`` within
-our package's ``templates/static`` directory.  This file is a little
-too long to replicate within the body of this guide, however it is
-available `online
-<http://github.com/Pylons/pyramid/blob/master/docs/tutorials/wiki/src/views/tutorial/templates/static/default.css>`_.
+Our templates name a single static resource named ``style.css``.  We need to
+create this and place it in a file named ``style.css`` within our package's
+``static`` directory.  This file is a little too long to replicate within the
+body of this guide, however it is available `online
+<http://github.com/Pylons/pyramid/blob/master/docs/tutorials/wiki/src/views/tutorial/static/default.css>`_.
 
 This CSS file will be accessed via
 e.g. ``http://localhost:6543/static/style.css`` by virtue of the
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/configure.zcml b/docs/tutorials/wiki/src/authorization/tutorial/configure.zcml
index e8603d7c4..d0e65516e 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/configure.zcml
+++ b/docs/tutorials/wiki/src/authorization/tutorial/configure.zcml
@@ -19,7 +19,7 @@
 
   <static
     name="static"
-    path="templates/static"
+    path="static"
     />
 
 </configure>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki/src/authorization/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki/src/authorization/tutorial/static/favicon.ico
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/static/logo.png b/docs/tutorials/wiki/src/authorization/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki/src/authorization/tutorial/static/logo.png
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/static/pylons.css b/docs/tutorials/wiki/src/authorization/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki/src/authorization/tutorial/static/pylons.css
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/configure.zcml b/docs/tutorials/wiki/src/basiclayout/tutorial/configure.zcml
index 4e83227bb..ab7fd6fbe 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/configure.zcml
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/configure.zcml
@@ -11,7 +11,7 @@
 
   <static
     name="static"
-    path="templates/static"
+    path="static"
     />
 
 </configure>
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki/src/basiclayout/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/static/favicon.ico
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/static/logo.png b/docs/tutorials/wiki/src/basiclayout/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/static/logo.png
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/static/pylons.css b/docs/tutorials/wiki/src/basiclayout/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/static/pylons.css
diff --git a/docs/tutorials/wiki/src/models/tutorial/configure.zcml b/docs/tutorials/wiki/src/models/tutorial/configure.zcml
index 6db3bd158..38675eb13 100644
--- a/docs/tutorials/wiki/src/models/tutorial/configure.zcml
+++ b/docs/tutorials/wiki/src/models/tutorial/configure.zcml
@@ -11,7 +11,7 @@
 
   <static
      name="static"
-     path="templates/static"
+     path="static"
      />
 
 </configure>
diff --git a/docs/tutorials/wiki/src/models/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki/src/models/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki/src/models/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki/src/models/tutorial/static/favicon.ico
diff --git a/docs/tutorials/wiki/src/models/tutorial/templates/static/logo.png b/docs/tutorials/wiki/src/models/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki/src/models/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki/src/models/tutorial/static/logo.png
diff --git a/docs/tutorials/wiki/src/models/tutorial/templates/static/pylons.css b/docs/tutorials/wiki/src/models/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki/src/models/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki/src/models/tutorial/static/pylons.css
diff --git a/docs/tutorials/wiki/src/viewdecorators/tutorial/configure.zcml b/docs/tutorials/wiki/src/viewdecorators/tutorial/configure.zcml
index 220160f73..be5b84c43 100644
--- a/docs/tutorials/wiki/src/viewdecorators/tutorial/configure.zcml
+++ b/docs/tutorials/wiki/src/viewdecorators/tutorial/configure.zcml
@@ -7,7 +7,7 @@
 
   <static
     name="static"
-    path="templates/static"
+    path="static"
     />
 
 </configure>
diff --git a/docs/tutorials/wiki/src/viewdecorators/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki/src/viewdecorators/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki/src/viewdecorators/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki/src/viewdecorators/tutorial/static/favicon.ico
diff --git a/docs/tutorials/wiki/src/viewdecorators/tutorial/templates/static/logo.png b/docs/tutorials/wiki/src/viewdecorators/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki/src/viewdecorators/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki/src/viewdecorators/tutorial/static/logo.png
diff --git a/docs/tutorials/wiki/src/viewdecorators/tutorial/templates/static/pylons.css b/docs/tutorials/wiki/src/viewdecorators/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki/src/viewdecorators/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki/src/viewdecorators/tutorial/static/pylons.css
diff --git a/docs/tutorials/wiki/src/views/tutorial/configure.zcml b/docs/tutorials/wiki/src/views/tutorial/configure.zcml
index 27bbd8cb1..c1b1d6ce8 100644
--- a/docs/tutorials/wiki/src/views/tutorial/configure.zcml
+++ b/docs/tutorials/wiki/src/views/tutorial/configure.zcml
@@ -5,7 +5,7 @@
 
   <static
     name="static"
-    path="templates/static"
+    path="static"
     />
 
   <view
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki/src/views/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki/src/views/tutorial/static/favicon.ico
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/static/logo.png b/docs/tutorials/wiki/src/views/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki/src/views/tutorial/static/logo.png
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/static/pylons.css b/docs/tutorials/wiki/src/views/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki/src/views/tutorial/static/pylons.css
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index bd5a04ef5..7448563c7 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -57,10 +57,10 @@ entry point happens to be the ``app`` function within the file named
 
 #. *Line 19*.  We call
    :meth:`pyramid.configuration.Configurator.add_static_view` with the
-   arguments ``static`` (the name), and ``tutorial:templates/static``.  This
+   arguments ``static`` (the name), and ``tutorial:static`` (the path).  This
    registers a static resource view which will match any URL that starts with
    ``/static/``.  This will serve up static resources for us from within the
-   ``templates/static`` directory of our ``tutorial`` package, in this case,
+   ``static`` directory of our ``tutorial`` package, in this case,
    via ``http://localhost:6543/static/`` and below.  With this declaration,
    we're saying that any URL that starts with ``/static`` should go to the
    static view; any remainder of its path (e.g. the ``/foo`` in
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst
index a10e8b9ca..ea4ca3bab 100644
--- a/docs/tutorials/wiki2/definingviews.rst
+++ b/docs/tutorials/wiki2/definingviews.rst
@@ -248,12 +248,11 @@ the below:
 Static Resources
 ----------------
 
-Our templates name a single static resource named ``style.css``.  We
-need to create this and place it in a file named ``style.css`` within
-our package's ``templates/static`` directory.  This file is a little
-too long to replicate within the body of this guide, however it is
-available `online
-<http://github.com/Pylons/pyramid/blob/master/docs/tutorials/wiki2/src/views/tutorial/templates/static/style.css>`_.
+Our templates name a single static resource named ``style.css``.  We need to
+create this and place it in a file named ``style.css`` within our package's
+``static`` directory.  This file is a little too long to replicate within the
+body of this guide, however it is available `online
+<http://github.com/Pylons/pyramid/blob/master/docs/tutorials/wiki2/src/views/tutorial/static/style.css>`_.
 
 
 This CSS file will be accessed via
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
index a47b6dc32..fba1d706b 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
@@ -26,7 +26,7 @@ def app(global_config, **settings):
                           authentication_policy=authn_policy,
                           authorization_policy=authz_policy)
     config.begin()
-    config.add_static_view('static', 'templates/static')
+    config.add_static_view('static', 'tutorial:static')
     config.add_route('view_wiki', '/', view='tutorial.views.view_wiki')
     config.add_route('login', '/login',
                      view='tutorial.login.login',
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki2/src/authorization/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/static/favicon.ico
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/static/logo.png b/docs/tutorials/wiki2/src/authorization/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/static/logo.png
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/static/pylons.css b/docs/tutorials/wiki2/src/authorization/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/static/pylons.css
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
index e1ef485f7..7a947f1e1 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
@@ -16,7 +16,7 @@ def app(global_config, **settings):
     initialize_sql(db_string, asbool(db_echo))
     config = Configurator(settings=settings)
     config.begin()
-    config.add_static_view('static', 'templates/static')
+    config.add_static_view('static', 'tutorial:static')
     config.add_route('home', '/', view='tutorial.views.my_view',
                      view_renderer='templates/mytemplate.pt')
     config.end()
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki2/src/basiclayout/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/static/favicon.ico
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/static/logo.png b/docs/tutorials/wiki2/src/basiclayout/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/static/logo.png
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/static/pylons.css b/docs/tutorials/wiki2/src/basiclayout/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/static/pylons.css
diff --git a/docs/tutorials/wiki2/src/models/tutorial/__init__.py b/docs/tutorials/wiki2/src/models/tutorial/__init__.py
index e1ef485f7..7a947f1e1 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/models/tutorial/__init__.py
@@ -16,7 +16,7 @@ def app(global_config, **settings):
     initialize_sql(db_string, asbool(db_echo))
     config = Configurator(settings=settings)
     config.begin()
-    config.add_static_view('static', 'templates/static')
+    config.add_static_view('static', 'tutorial:static')
     config.add_route('home', '/', view='tutorial.views.my_view',
                      view_renderer='templates/mytemplate.pt')
     config.end()
diff --git a/docs/tutorials/wiki2/src/models/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki2/src/models/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki2/src/models/tutorial/static/favicon.ico
diff --git a/docs/tutorials/wiki2/src/models/tutorial/templates/static/logo.png b/docs/tutorials/wiki2/src/models/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki2/src/models/tutorial/static/logo.png
diff --git a/docs/tutorials/wiki2/src/models/tutorial/templates/static/pylons.css b/docs/tutorials/wiki2/src/models/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki2/src/models/tutorial/static/pylons.css
diff --git a/docs/tutorials/wiki2/src/views/tutorial/__init__.py b/docs/tutorials/wiki2/src/views/tutorial/__init__.py
index 2d00cccc2..39ec17735 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/__init__.py
@@ -16,7 +16,7 @@ def app(global_config, **settings):
     initialize_sql(db_string, asbool(db_echo))
     config = Configurator(settings=settings)
     config.begin()
-    config.add_static_view('static', 'templates/static')
+    config.add_static_view('static', 'tutorial:static')
     config.add_route('home', '/', view='tutorial.views.view_wiki')
     config.add_route('view_page', '/:pagename',
                      view='tutorial.views.view_page',
diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki2/src/views/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki2/src/views/tutorial/static/favicon.ico
diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/static/logo.png b/docs/tutorials/wiki2/src/views/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki2/src/views/tutorial/static/logo.png
diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/static/pylons.css b/docs/tutorials/wiki2/src/views/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki2/src/views/tutorial/static/pylons.css