From c5a467b86b96d2cb0b4eda13134dac7edb68d0ec Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Sun, 22 Sep 2013 14:29:38 -0500
Subject: try to clarify the docs to avoid "if '__main__'" confusion

---
 docs/narr/viewconfig.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index 182676b29..7c76116f7 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -822,7 +822,7 @@ of this:
        def delete(self):
            return Response('delete')
 
-   if __name__ == '__main__':
+   def main(global_config, **settings):
        config = Configurator()
        config.add_route('rest', '/rest')
        config.add_view(
@@ -831,6 +831,7 @@ of this:
            RESTView, route_name='rest', attr='post', request_method='POST')
        config.add_view(
            RESTView, route_name='rest', attr='delete', request_method='DELETE')
+       return config.make_wsgi_app()
 
 To reduce the amount of repetition in the ``config.add_view`` statements, we
 can move the ``route_name='rest'`` argument to a ``@view_defaults`` class
@@ -857,12 +858,13 @@ decorator on the RESTView class:
        def delete(self):
            return Response('delete')
 
-   if __name__ == '__main__':
+   def main(global_config, **settings):
        config = Configurator()
        config.add_route('rest', '/rest')
        config.add_view(RESTView, attr='get', request_method='GET')
        config.add_view(RESTView, attr='post', request_method='POST')
        config.add_view(RESTView, attr='delete', request_method='DELETE')
+       return config.make_wsgi_app()
 
 :class:`pyramid.view.view_defaults` accepts the same set of arguments that
 :class:`pyramid.view.view_config` does, and they have the same meaning.  Each
-- 
cgit v1.2.3


From 1034327081839902e691236f60b2a85f74bbc4e3 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Mon, 14 Oct 2013 16:29:32 -0500
Subject: update old ptweens output

---
 docs/narr/commandline.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst
index 58b9bdd21..a04b38ae3 100644
--- a/docs/narr/commandline.rst
+++ b/docs/narr/commandline.rst
@@ -387,12 +387,12 @@ explicit tweens defined in its ``development.ini`` file:
 
    Implicit Tween Chain (not used)
 
-   Position    Name                                                Alias
-   --------    ----                                                -----
-   -           -                                                   INGRESS
-   0           pyramid_debugtoolbar.toolbar.toolbar_tween_factory  pdbt
-   1           pyramid.tweens.excview_tween_factory                excview
-   -           -                                                   MAIN
+   Position    Name
+   --------    ----
+   -           INGRESS
+   0           pyramid_debugtoolbar.toolbar.toolbar_tween_factory
+   1           pyramid.tweens.excview_tween_factory
+   -           MAIN
 
 Here's the application configuration section of the ``development.ini`` used
 by the above ``ptweens`` command which reports that the explicit tween chain
-- 
cgit v1.2.3


From 592ec0178d25767859523c1ac221c6f3cb303875 Mon Sep 17 00:00:00 2001
From: Jeff Hemphill <jthemphill@gmail.com>
Date: Wed, 16 Oct 2013 20:55:41 -0700
Subject: Add HTML escaping to views.py

At least it's less obviously dangerous this way.
---
 docs/tutorials/wiki2/src/views/tutorial/views.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/tutorials/wiki2/src/views/tutorial/views.py b/docs/tutorials/wiki2/src/views/tutorial/views.py
index 5a9c75a61..d54b2a7aa 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/views.py
@@ -1,3 +1,4 @@
+import cgi
 import re
 from docutils.core import publish_parts
 
@@ -32,10 +33,10 @@ def view_page(request):
         exists = DBSession.query(Page).filter_by(name=word).all()
         if exists:
             view_url = request.route_url('view_page', pagename=word)
-            return '<a href="%s">%s</a>' % (view_url, word)
+            return '<a href="%s">%s</a>' % (view_url, cgi.escape(word))
         else:
             add_url = request.route_url('add_page', pagename=word)
-            return '<a href="%s">%s</a>' % (add_url, word)
+            return '<a href="%s">%s</a>' % (add_url, cgi.escape(word))
 
     content = publish_parts(page.data, writer_name='html')['html_body']
     content = wikiwords.sub(check, content)
-- 
cgit v1.2.3


From 3c95b1af3661618490e6a3789fd80755924e7d18 Mon Sep 17 00:00:00 2001
From: Wichert Akkerman <wichert@wiggy.net>
Date: Tue, 10 Dec 2013 13:31:23 +0100
Subject: Fix JSONP syntax error

---
 CHANGES.txt                     | 3 +++
 pyramid/renderers.py            | 2 +-
 pyramid/tests/test_renderers.py | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9f780fe45..c05c4561e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -51,6 +51,9 @@ Features
 Bug Fixes
 ---------
 
+- Add a trailing semicolon to the JSONP response. This fixes JavaScript syntax
+  errors for old IE versions.
+
 - Fix the ``pcreate`` script so that when the target directory name ends with a 
   slash it does not produce a non-working project directory structure.  
   Previously saying ``pcreate -s starter /foo/bar/`` produced different output 
diff --git a/pyramid/renderers.py b/pyramid/renderers.py
index e90d07b38..88ef285a0 100644
--- a/pyramid/renderers.py
+++ b/pyramid/renderers.py
@@ -363,7 +363,7 @@ class JSONP(JSON):
                 body = val
             else:
                 ct = 'application/javascript'
-                body = '%s(%s)' % (callback, val)
+                body = '%s(%s);' % (callback, val)
             response = request.response
             if response.content_type == response.default_content_type:
                 response.content_type = ct
diff --git a/pyramid/tests/test_renderers.py b/pyramid/tests/test_renderers.py
index f6b9d2b0d..2bddd2318 100644
--- a/pyramid/tests/test_renderers.py
+++ b/pyramid/tests/test_renderers.py
@@ -567,7 +567,7 @@ class TestJSONP(unittest.TestCase):
         request = testing.DummyRequest()
         request.GET['callback'] = 'callback'
         result = renderer({'a':'1'}, {'request':request})
-        self.assertEqual(result, 'callback({"a": "1"})')
+        self.assertEqual(result, 'callback({"a": "1"});')
         self.assertEqual(request.response.content_type,
                          'application/javascript')
 
-- 
cgit v1.2.3


From 5431138583ee9d4382c1fe6dd0fb706ed514a4bf Mon Sep 17 00:00:00 2001
From: Matthew Wilkes <git@matthewwilkes.name>
Date: Tue, 10 Dec 2013 20:29:28 +0000
Subject: Use new pluralize calling convention recognised by Lingua 1.7

---
 docs/narr/i18n.rst | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
index c9b782c08..5f50ca212 100644
--- a/docs/narr/i18n.rst
+++ b/docs/narr/i18n.rst
@@ -607,10 +607,8 @@ object, but the domain and mapping information attached is ignored.
    def aview(request):
        localizer = request.localizer
        num = 1
-       translated = localizer.pluralize(
-                          _('item_plural', default="${number} items"), 
-                          None, num, 'mydomain', mapping={'number':num}
-                          )
+       translated = localizer.pluralize('item_plural', '${number} items',
+           num, 'mydomain', mapping={'number':num})
 
 The corresponding message catalog must have language plural definitions and
 plural alternatives set.
-- 
cgit v1.2.3


From 2da03fedcdebd9499d13eadf1500f80d04f4d796 Mon Sep 17 00:00:00 2001
From: Matthew Wilkes <git@matthewwilkes.name>
Date: Tue, 10 Dec 2013 20:36:34 +0000
Subject: Expand on docstring

---
 pyramid/i18n.py | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/pyramid/i18n.py b/pyramid/i18n.py
index 6ffd93e8f..aaba769c6 100644
--- a/pyramid/i18n.py
+++ b/pyramid/i18n.py
@@ -75,16 +75,16 @@ class Localizer(object):
         :term:`message identifier` objects as a singular/plural pair
         and an ``n`` value representing the number that appears in the
         message using gettext plural forms support.  The ``singular``
-        and ``plural`` objects passed may be translation strings or
-        unicode strings.  ``n`` represents the number of elements.
-        ``domain`` is the translation domain to use to do the
-        pluralization, and ``mapping`` is the interpolation mapping
-        that should be used on the result.  Note that if the objects
-        passed are translation strings, their domains and mappings are
-        ignored.  The domain and mapping arguments must be used
-        instead.  If the ``domain`` is not supplied, a default domain
-        is used (usually ``messages``).
-
+        and ``plural`` objects should be unicode strings. There is no
+        reason to use translation string objects as arguments as all
+        metadata is ignored.
+        
+        ``n`` represents the number of elements. ``domain`` is the
+        translation domain to use to do the pluralization, and ``mapping``
+        is the interpolation mapping that should be used on the result. If
+        the ``domain`` is not supplied, a default domain is used (usually
+        ``messages``).
+        
         Example::
 
            num = 1
@@ -93,6 +93,19 @@ class Localizer(object):
                                             num,
                                             mapping={'num':num})
 
+        If using the gettext plural support, which is required for
+        languages that have pluralisation rules other than n != 1, the
+        ``singular`` argument must be the message_id defined in the
+        translation file. The plural argument is not used in this case.
+
+        Example::
+
+           num = 1
+           translated = localizer.pluralize('item_plural',
+                                            '',
+                                            num,
+                                            mapping={'num':num})
+
         
         """
         if self.pluralizer is None:
-- 
cgit v1.2.3


From 8856e23b9aa6d3d12da8d74c751c2a7191ff687b Mon Sep 17 00:00:00 2001
From: Ira <whiteroses@users.noreply.github.com>
Date: Thu, 12 Dec 2013 00:38:58 +0000
Subject: Fix a typo.

---
 pyramid/url.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/url.py b/pyramid/url.py
index 484ee775f..78dd297d5 100644
--- a/pyramid/url.py
+++ b/pyramid/url.py
@@ -359,7 +359,7 @@ class URLMethodsMixin(object):
         .. warning:: if no ``elements`` arguments are specified, the resource
                      URL will end with a trailing slash.  If any
                      ``elements`` are used, the generated URL will *not*
-                     end in trailing a slash.
+                     end in a trailing slash.
 
         If a keyword argument ``query`` is present, it will be used to compose
         a query string that will be tacked on to the end of the URL.  The value
-- 
cgit v1.2.3


From 2617e2198fac67364b195a12e228da20c3f8afee Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Thu, 12 Dec 2013 16:06:50 -0500
Subject: add url to issue

---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1ae2ebbd9..88b3c1229 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -75,7 +75,7 @@ Bug Fixes
 ---------
 
 - Add a trailing semicolon to the JSONP response. This fixes JavaScript syntax
-  errors for old IE versions.
+  errors for old IE versions. See https://github.com/Pylons/pyramid/pull/1205
 
 - Fix the ``pcreate`` script so that when the target directory name ends with a 
   slash it does not produce a non-working project directory structure.  
-- 
cgit v1.2.3


From 6b0d6ff01277993660049e3c289126ffb309c8dd Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Thu, 12 Dec 2013 16:09:05 -0500
Subject: put change note in the right release section

---
 CHANGES.txt | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 88b3c1229..b7e47f0e5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,12 @@
+Next release
+============
+
+Bug Fixes
+---------
+
+- Add a trailing semicolon to the JSONP response. This fixes JavaScript syntax
+  errors for old IE versions. See https://github.com/Pylons/pyramid/pull/1205
+
 1.5a3 (2013-12-10)
 ==================
 
@@ -74,9 +83,6 @@ Features
 Bug Fixes
 ---------
 
-- Add a trailing semicolon to the JSONP response. This fixes JavaScript syntax
-  errors for old IE versions. See https://github.com/Pylons/pyramid/pull/1205
-
 - Fix the ``pcreate`` script so that when the target directory name ends with a 
   slash it does not produce a non-working project directory structure.  
   Previously saying ``pcreate -s starter /foo/bar/`` produced different output 
-- 
cgit v1.2.3


From 0506e76256fa25adffeff2aa4b1947c9bc2ceceb Mon Sep 17 00:00:00 2001
From: Bert JW Regeer <bert.regeer@absio.com>
Date: Fri, 13 Dec 2013 10:51:40 -0700
Subject: Depend on 1.3.1 of WebOb

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e6c9a490a..5bf096622 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ except IOError:
 
 install_requires=[
     'setuptools',
-    'WebOb >= 1.3', # request.domain and CookieProfile
+    'WebOb >= 1.3.1', # request.domain and CookieProfile
     'repoze.lru >= 0.4', # py3 compat
     'zope.interface >= 3.8.0',  # has zope.interface.registry
     'zope.deprecation >= 3.5.0', # py3 compat
-- 
cgit v1.2.3


From e2600da48a2808fbd3a94ea12255021b4356fb33 Mon Sep 17 00:00:00 2001
From: Bert JW Regeer <bert.regeer@absio.com>
Date: Fri, 13 Dec 2013 10:52:46 -0700
Subject: Update CHANGES

---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index b7e47f0e5..9d877c0ac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,9 @@ Next release
 Bug Fixes
 ---------
 
+- Depend on a newer version of WebOb so that we pull in some crucial bug-fixes
+  that were showstoppers for functionality in Pyramid.
+
 - Add a trailing semicolon to the JSONP response. This fixes JavaScript syntax
   errors for old IE versions. See https://github.com/Pylons/pyramid/pull/1205
 
-- 
cgit v1.2.3


From dd449905be07e6088d78af0be84e8e98e72e445d Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 19 Dec 2013 01:00:42 -0600
Subject: typos

---
 pyramid/session.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyramid/session.py b/pyramid/session.py
index 8c9900975..e3ce4a090 100644
--- a/pyramid/session.py
+++ b/pyramid/session.py
@@ -165,7 +165,7 @@ def BaseCookieSessionFactory(
     Parameters:
 
     ``serializer``
-      An object with two methods: `loads`` and ``dumps``.  The ``loads`` method
+      An object with two methods: ``loads`` and ``dumps``.  The ``loads`` method
       should accept bytes and return a Python object.  The ``dumps`` method
       should accept a Python object and return bytes.  A ``ValueError`` should
       be raised for malformed inputs.
@@ -572,7 +572,7 @@ def SignedCookieSessionFactory(
       while rendering a view. Default: ``True``.
 
     ``serializer``
-      An object with two methods: `loads`` and ``dumps``.  The ``loads`` method
+      An object with two methods: ``loads`` and ``dumps``.  The ``loads`` method
       should accept bytes and return a Python object.  The ``dumps`` method
       should accept a Python object and return bytes.  A ``ValueError`` should
       be raised for malformed inputs.  If a serializer is not passed, the
-- 
cgit v1.2.3


From 3687465ab87b82b83b7ffa2f216425136d71ebec Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Mon, 30 Dec 2013 02:49:18 -0800
Subject: grammar fixes

---
 docs/narr/templates.rst | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index 3e19f7198..00fc21634 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -38,8 +38,8 @@ within the body of a view callable like so:
    from pyramid.renderers import render_to_response
 
    def sample_view(request):
-       return render_to_response('templates/foo.pt', 
-                                 {'foo':1, 'bar':2}, 
+       return render_to_response('templates/foo.pt',
+                                 {'foo':1, 'bar':2},
                                  request=request)
 
 The ``sample_view`` :term:`view callable` function above returns a
@@ -56,7 +56,7 @@ In this case, this is the directory containing the file that
 defines the ``sample_view`` function.  Although a renderer path is
 usually just a simple relative pathname, a path named as a renderer
 can be absolute, starting with a slash on UNIX or a drive letter
-prefix on Windows. The path can alternately be a
+prefix on Windows. The path can alternately be an
 :term:`asset specification` in the form
 ``some.dotted.package_name:relative/path``. This makes it possible to
 address template assets which live in another package.  For example:
@@ -73,11 +73,11 @@ address template assets which live in another package.  For example:
 
 An asset specification points at a file within a Python *package*.
 In this case, it points at a file named ``foo.pt`` within the
-``templates`` directory of the ``mypackage`` package.  Using a
+``templates`` directory of the ``mypackage`` package.  Using an
 asset specification instead of a relative template name is usually
 a good idea, because calls to :func:`~pyramid.renderers.render_to_response`
 using asset specifications will continue to work properly if you move the
-code containing them around.
+code containing them to another location.
 
 In the examples above we pass in a keyword argument named ``request``
 representing the current :app:`Pyramid` request. Passing a request
@@ -94,8 +94,8 @@ Every view must return a :term:`response` object, except for views
 which use a :term:`renderer` named via view configuration (which we'll
 see shortly).  The :func:`pyramid.renderers.render_to_response`
 function is a shortcut function that actually returns a response
-object. This allows the example view above to simply return the result 
-of its call to ``render_to_response()`` directly. 
+object. This allows the example view above to simply return the result
+of its call to ``render_to_response()`` directly.
 
 Obviously not all APIs you might call to get response data will return a
 response object. For example, you might render one or more templates to
@@ -111,8 +111,8 @@ as the body of the response:
    from pyramid.response import Response
 
    def sample_view(request):
-       result = render('mypackage:templates/foo.pt', 
-                       {'foo':1, 'bar':2}, 
+       result = render('mypackage:templates/foo.pt',
+                       {'foo':1, 'bar':2},
                        request=request)
        response = Response(result)
        return response
@@ -194,7 +194,7 @@ of :func:`~pyramid.renderers.render` (a string):
 
    def sample_view(request):
        result = render('mypackage:templates/foo.pt',
-                       {'foo':1, 'bar':2}, 
+                       {'foo':1, 'bar':2},
                        request=request)
        response = Response(result)
        response.content_type = 'text/plain'
@@ -241,7 +241,7 @@ These values are provided to the template:
   The renderer name used to perform the rendering,
   e.g. ``mypackage:templates/foo.pt``.
 
-``renderer_info`` 
+``renderer_info``
   An object implementing the :class:`pyramid.interfaces.IRendererInfo`
   interface.  Basically, an object with the following attributes: ``name``,
   ``package`` and ``type``.
@@ -273,7 +273,7 @@ Templates Used as Renderers via Configuration
 An alternative to using :func:`~pyramid.renderers.render_to_response`
 to render templates manually in your view callable code, is
 to specify the template as a :term:`renderer` in your
-*view configuration*. This can be done with any of the 
+*view configuration*. This can be done with any of the
 templating languages supported by :app:`Pyramid`.
 
 To use a renderer via view configuration, specify a template
-- 
cgit v1.2.3


From 382e50f3b27f8bffc00165ba2b08329c30234538 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 3 Jan 2014 22:48:21 -0500
Subject: removed starter assets

---
 .../scaffolds/starter/+package+/static/favicon.ico | Bin 1406 -> 0 bytes
 .../starter/+package+/static/footerbg.png          | Bin 333 -> 0 bytes
 .../starter/+package+/static/headerbg.png          | Bin 203 -> 0 bytes
 pyramid/scaffolds/starter/+package+/static/ie6.css |   8 -
 .../starter/+package+/static/middlebg.png          | Bin 2797 -> 0 bytes
 .../scaffolds/starter/+package+/static/pylons.css  | 372 ---------------------
 .../scaffolds/starter/+package+/static/pyramid.png | Bin 33055 -> 0 bytes
 .../starter/+package+/static/transparent.gif       | Bin 49 -> 0 bytes
 8 files changed, 380 deletions(-)
 delete mode 100644 pyramid/scaffolds/starter/+package+/static/favicon.ico
 delete mode 100644 pyramid/scaffolds/starter/+package+/static/footerbg.png
 delete mode 100644 pyramid/scaffolds/starter/+package+/static/headerbg.png
 delete mode 100644 pyramid/scaffolds/starter/+package+/static/ie6.css
 delete mode 100644 pyramid/scaffolds/starter/+package+/static/middlebg.png
 delete mode 100644 pyramid/scaffolds/starter/+package+/static/pylons.css
 delete mode 100644 pyramid/scaffolds/starter/+package+/static/pyramid.png
 delete mode 100644 pyramid/scaffolds/starter/+package+/static/transparent.gif

diff --git a/pyramid/scaffolds/starter/+package+/static/favicon.ico b/pyramid/scaffolds/starter/+package+/static/favicon.ico
deleted file mode 100644
index 71f837c9e..000000000
Binary files a/pyramid/scaffolds/starter/+package+/static/favicon.ico and /dev/null differ
diff --git a/pyramid/scaffolds/starter/+package+/static/footerbg.png b/pyramid/scaffolds/starter/+package+/static/footerbg.png
deleted file mode 100644
index 1fbc873da..000000000
Binary files a/pyramid/scaffolds/starter/+package+/static/footerbg.png and /dev/null differ
diff --git a/pyramid/scaffolds/starter/+package+/static/headerbg.png b/pyramid/scaffolds/starter/+package+/static/headerbg.png
deleted file mode 100644
index 0596f2020..000000000
Binary files a/pyramid/scaffolds/starter/+package+/static/headerbg.png and /dev/null differ
diff --git a/pyramid/scaffolds/starter/+package+/static/ie6.css b/pyramid/scaffolds/starter/+package+/static/ie6.css
deleted file mode 100644
index b7c8493d8..000000000
--- a/pyramid/scaffolds/starter/+package+/static/ie6.css
+++ /dev/null
@@ -1,8 +0,0 @@
-* html img,
-* html .png{position:relative;behavior:expression((this.runtimeStyle.behavior="none")&&(this.pngSet?this.pngSet=true:(this.nodeName == "IMG" && this.src.toLowerCase().indexOf('.png')>-1?(this.runtimeStyle.backgroundImage = "none",
-this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.src + "',sizingMethod='image')",
-this.src = "static/transparent.gif"):(this.origBg = this.origBg? this.origBg :this.currentStyle.backgroundImage.toString().replace('url("','').replace('")',''),
-this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.origBg + "',sizingMethod='crop')",
-this.runtimeStyle.backgroundImage = "none")),this.pngSet=true)
-);}
-#wrap{display:table;height:100%}
diff --git a/pyramid/scaffolds/starter/+package+/static/middlebg.png b/pyramid/scaffolds/starter/+package+/static/middlebg.png
deleted file mode 100644
index 2369cfb7d..000000000
Binary files a/pyramid/scaffolds/starter/+package+/static/middlebg.png and /dev/null differ
diff --git a/pyramid/scaffolds/starter/+package+/static/pylons.css b/pyramid/scaffolds/starter/+package+/static/pylons.css
deleted file mode 100644
index 4b1c017cd..000000000
--- a/pyramid/scaffolds/starter/+package+/static/pylons.css
+++ /dev/null
@@ -1,372 +0,0 @@
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td
-{
-  margin: 0;
-  padding: 0;
-  border: 0;
-  outline: 0;
-  font-size: 100%; /* 16px */
-  vertical-align: baseline;
-  background: transparent;
-}
-
-body
-{
-  line-height: 1;
-}
-
-ol, ul
-{
-  list-style: none;
-}
-
-blockquote, q
-{
-  quotes: none;
-}
-
-blockquote:before, blockquote:after, q:before, q:after
-{
-  content: '';
-  content: none;
-}
-
-:focus
-{
-  outline: 0;
-}
-
-ins
-{
-  text-decoration: none;
-}
-
-del
-{
-  text-decoration: line-through;
-}
-
-table
-{
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-sub
-{
-  vertical-align: sub;
-  font-size: smaller;
-  line-height: normal;
-}
-
-sup
-{
-  vertical-align: super;
-  font-size: smaller;
-  line-height: normal;
-}
-
-ul, menu, dir
-{
-  display: block;
-  list-style-type: disc;
-  margin: 1em 0;
-  padding-left: 40px;
-}
-
-ol
-{
-  display: block;
-  list-style-type: decimal-leading-zero;
-  margin: 1em 0;
-  padding-left: 40px;
-}
-
-li
-{
-  display: list-item;
-}
-
-ul ul, ul ol, ul dir, ul menu, ul dl, ol ul, ol ol, ol dir, ol menu, ol dl, dir ul, dir ol, dir dir, dir menu, dir dl, menu ul, menu ol, menu dir, menu menu, menu dl, dl ul, dl ol, dl dir, dl menu, dl dl
-{
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-ol ul, ul ul, menu ul, dir ul, ol menu, ul menu, menu menu, dir menu, ol dir, ul dir, menu dir, dir dir
-{
-  list-style-type: circle;
-}
-
-ol ol ul, ol ul ul, ol menu ul, ol dir ul, ol ol menu, ol ul menu, ol menu menu, ol dir menu, ol ol dir, ol ul dir, ol menu dir, ol dir dir, ul ol ul, ul ul ul, ul menu ul, ul dir ul, ul ol menu, ul ul menu, ul menu menu, ul dir menu, ul ol dir, ul ul dir, ul menu dir, ul dir dir, menu ol ul, menu ul ul, menu menu ul, menu dir ul, menu ol menu, menu ul menu, menu menu menu, menu dir menu, menu ol dir, menu ul dir, menu menu dir, menu dir dir, dir ol ul, dir ul ul, dir menu ul, dir dir ul, dir ol menu, dir ul menu, dir menu menu, dir dir menu, dir ol dir, dir ul dir, dir menu dir, dir dir dir
-{
-  list-style-type: square;
-}
-
-.hidden
-{
-  display: none;
-}
-
-p
-{
-  line-height: 1.5em;
-}
-
-h1
-{
-  font-size: 1.75em;
-  line-height: 1.7em;
-  font-family: helvetica, verdana;
-}
-
-h2
-{
-  font-size: 1.5em;
-  line-height: 1.7em;
-  font-family: helvetica, verdana;
-}
-
-h3
-{
-  font-size: 1.25em;
-  line-height: 1.7em;
-  font-family: helvetica, verdana;
-}
-
-h4
-{
-  font-size: 1em;
-  line-height: 1.7em;
-  font-family: helvetica, verdana;
-}
-
-html, body
-{
-  width: 100%;
-  height: 100%;
-}
-
-body
-{
-  margin: 0;
-  padding: 0;
-  background-color: #fff;
-  position: relative;
-  font: 16px/24px NobileRegular, "Lucida Grande", Lucida, Verdana, sans-serif;
-}
-
-a
-{
-  color: #1b61d6;
-  text-decoration: none;
-}
-
-a:hover
-{
-  color: #e88f00;
-  text-decoration: underline;
-}
-
-body h1, body h2, body h3, body h4, body h5, body h6
-{
-  font-family: NeutonRegular, "Lucida Grande", Lucida, Verdana, sans-serif;
-  font-weight: 400;
-  color: #373839;
-  font-style: normal;
-}
-
-#wrap
-{
-  min-height: 100%;
-}
-
-#header, #footer
-{
-  width: 100%;
-  color: #fff;
-  height: 40px;
-  position: absolute;
-  text-align: center;
-  line-height: 40px;
-  overflow: hidden;
-  font-size: 12px;
-  vertical-align: middle;
-}
-
-#header
-{
-  background: #000;
-  top: 0;
-  font-size: 14px;
-}
-
-#footer
-{
-  bottom: 0;
-  background: #000 url(footerbg.png) repeat-x 0 top;
-  position: relative;
-  margin-top: -40px;
-  clear: both;
-}
-
-.header, .footer
-{
-  width: 750px;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-.wrapper
-{
-  width: 100%;
-}
-
-#top, #top-small, #bottom
-{
-  width: 100%;
-}
-
-#top
-{
-  color: #000;
-  height: 230px;
-  background: #fff url(headerbg.png) repeat-x 0 top;
-  position: relative;
-}
-
-#top-small
-{
-  color: #000;
-  height: 60px;
-  background: #fff url(headerbg.png) repeat-x 0 top;
-  position: relative;
-}
-
-#bottom
-{
-  color: #222;
-  background-color: #fff;
-}
-
-.top, .top-small, .middle, .bottom
-{
-  width: 750px;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-.top
-{
-  padding-top: 40px;
-}
-
-.top-small
-{
-  padding-top: 10px;
-}
-
-#middle
-{
-  width: 100%;
-  height: 100px;
-  background: url(middlebg.png) repeat-x;
-  border-top: 2px solid #fff;
-  border-bottom: 2px solid #b2b2b2;
-}
-
-.app-welcome
-{
-  margin-top: 25px;
-}
-
-.app-name
-{
-  color: #000;
-  font-weight: 700;
-}
-
-.bottom
-{
-  padding-top: 50px;
-}
-
-#left
-{
-  width: 350px;
-  float: left;
-  padding-right: 25px;
-}
-
-#right
-{
-  width: 350px;
-  float: right;
-  padding-left: 25px;
-}
-
-.align-left
-{
-  text-align: left;
-}
-
-.align-right
-{
-  text-align: right;
-}
-
-.align-center
-{
-  text-align: center;
-}
-
-ul.links
-{
-  margin: 0;
-  padding: 0;
-}
-
-ul.links li
-{
-  list-style-type: none;
-  font-size: 14px;
-}
-
-form
-{
-  border-style: none;
-}
-
-fieldset
-{
-  border-style: none;
-}
-
-input
-{
-  color: #222;
-  border: 1px solid #ccc;
-  font-family: sans-serif;
-  font-size: 12px;
-  line-height: 16px;
-}
-
-input[type=text], input[type=password]
-{
-  width: 205px;
-}
-
-input[type=submit]
-{
-  background-color: #ddd;
-  font-weight: 700;
-}
-
-/*Opera Fix*/
-body:before
-{
-  content: "";
-  height: 100%;
-  float: left;
-  width: 0;
-  margin-top: -32767px;
-}
diff --git a/pyramid/scaffolds/starter/+package+/static/pyramid.png b/pyramid/scaffolds/starter/+package+/static/pyramid.png
deleted file mode 100644
index 347e05549..000000000
Binary files a/pyramid/scaffolds/starter/+package+/static/pyramid.png and /dev/null differ
diff --git a/pyramid/scaffolds/starter/+package+/static/transparent.gif b/pyramid/scaffolds/starter/+package+/static/transparent.gif
deleted file mode 100644
index 0341802e5..000000000
Binary files a/pyramid/scaffolds/starter/+package+/static/transparent.gif and /dev/null differ
-- 
cgit v1.2.3


From 98a3e7037b16d1c471f84ce8c3358d93386df3e1 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 3 Jan 2014 22:49:14 -0500
Subject: added new assets

---
 .../starter/+package+/static/pyramid-16x16.png     | Bin 0 -> 1319 bytes
 .../scaffolds/starter/+package+/static/pyramid.png | Bin 0 -> 12901 bytes
 .../scaffolds/starter/+package+/static/theme.css   | 152 +++++++++++++++++++++
 .../starter/+package+/static/theme.min.css         |   1 +
 4 files changed, 153 insertions(+)
 create mode 100644 pyramid/scaffolds/starter/+package+/static/pyramid-16x16.png
 create mode 100644 pyramid/scaffolds/starter/+package+/static/pyramid.png
 create mode 100644 pyramid/scaffolds/starter/+package+/static/theme.css
 create mode 100644 pyramid/scaffolds/starter/+package+/static/theme.min.css

diff --git a/pyramid/scaffolds/starter/+package+/static/pyramid-16x16.png b/pyramid/scaffolds/starter/+package+/static/pyramid-16x16.png
new file mode 100644
index 000000000..979203112
Binary files /dev/null and b/pyramid/scaffolds/starter/+package+/static/pyramid-16x16.png differ
diff --git a/pyramid/scaffolds/starter/+package+/static/pyramid.png b/pyramid/scaffolds/starter/+package+/static/pyramid.png
new file mode 100644
index 000000000..4ab837be9
Binary files /dev/null and b/pyramid/scaffolds/starter/+package+/static/pyramid.png differ
diff --git a/pyramid/scaffolds/starter/+package+/static/theme.css b/pyramid/scaffolds/starter/+package+/static/theme.css
new file mode 100644
index 000000000..be50ad420
--- /dev/null
+++ b/pyramid/scaffolds/starter/+package+/static/theme.css
@@ -0,0 +1,152 @@
+@import url(//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700);
+body {
+  font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: 300;
+  color: #ffffff;
+  background: #bc2131;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: 300;
+}
+p {
+  font-weight: 300;
+}
+.font-normal {
+  font-weight: 400;
+}
+.font-semi-bold {
+  font-weight: 600;
+}
+.font-bold {
+  font-weight: 700;
+}
+.starter-template {
+  margin-top: 250px;
+}
+.starter-template .content {
+  margin-left: 10px;
+}
+.starter-template .content h1 {
+  margin-top: 10px;
+  font-size: 60px;
+}
+.starter-template .content h1 .smaller {
+  font-size: 40px;
+  color: #f2b7bd;
+}
+.starter-template .content .lead {
+  font-size: 25px;
+  color: #f2b7bd;
+}
+.starter-template .content .lead .font-normal {
+  color: #ffffff;
+}
+.starter-template .links {
+  float: right;
+  right: 0;
+  margin-top: 125px;
+}
+.starter-template .links ul {
+  display: block;
+  padding: 0;
+  margin: 0;
+}
+.starter-template .links ul li {
+  list-style: none;
+  display: inline;
+  margin: 0 10px;
+}
+.starter-template .links ul li:first-child {
+  margin-left: 0;
+}
+.starter-template .links ul li:last-child {
+  margin-right: 0;
+}
+.starter-template .links ul li.current-version {
+  color: #f2b7bd;
+  font-weight: 400;
+}
+.starter-template .links ul li a {
+  color: #ffffff;
+}
+.starter-template .links ul li a:hover {
+  text-decoration: underline;
+}
+.starter-template .links ul li .icon-muted {
+  color: #eb8b95;
+  margin-right: 5px;
+}
+.starter-template .links ul li:hover .icon-muted {
+  color: #ffffff;
+}
+.starter-template .copyright {
+  margin-top: 10px;
+  font-size: 0.9em;
+  color: #f2b7bd;
+  text-transform: lowercase;
+  float: right;
+  right: 0;
+}
+@media (max-width: 1199px) {
+  .starter-template .content h1 {
+    font-size: 45px;
+  }
+  .starter-template .content h1 .smaller {
+    font-size: 30px;
+  }
+  .starter-template .content .lead {
+    font-size: 20px;
+  }
+}
+@media (max-width: 991px) {
+  .starter-template {
+    margin-top: 0;
+  }
+  .starter-template .logo {
+    margin: 40px auto;
+  }
+  .starter-template .content {
+    margin-left: 0;
+    text-align: center;
+  }
+  .starter-template .content h1 {
+    margin-bottom: 20px;
+  }
+  .starter-template .links {
+    float: none;
+    text-align: center;
+    margin-top: 60px;
+  }
+  .starter-template .copyright {
+    float: none;
+    text-align: center;
+  }
+}
+@media (max-width: 767px) {
+  .starter-template .content h1 .smaller {
+    font-size: 25px;
+    display: block;
+  }
+  .starter-template .content .lead {
+    font-size: 16px;
+  }
+  .starter-template .links {
+    margin-top: 40px;
+  }
+  .starter-template .links ul li {
+    display: block;
+    margin: 0;
+  }
+  .starter-template .links ul li .icon-muted {
+    display: none;
+  }
+  .starter-template .copyright {
+    margin-top: 20px;
+  }
+}
diff --git a/pyramid/scaffolds/starter/+package+/static/theme.min.css b/pyramid/scaffolds/starter/+package+/static/theme.min.css
new file mode 100644
index 000000000..2f924bcc5
--- /dev/null
+++ b/pyramid/scaffolds/starter/+package+/static/theme.min.css
@@ -0,0 +1 @@
+@import url(//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700);body{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:300;color:#fff;background:#bc2131}h1,h2,h3,h4,h5,h6{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:300}p{font-weight:300}.font-normal{font-weight:400}.font-semi-bold{font-weight:600}.font-bold{font-weight:700}.starter-template{margin-top:250px}.starter-template .content{margin-left:10px}.starter-template .content h1{margin-top:10px;font-size:60px}.starter-template .content h1 .smaller{font-size:40px;color:#f2b7bd}.starter-template .content .lead{font-size:25px;color:#f2b7bd}.starter-template .content .lead .font-normal{color:#fff}.starter-template .links{float:right;right:0;margin-top:125px}.starter-template .links ul{display:block;padding:0;margin:0}.starter-template .links ul li{list-style:none;display:inline;margin:0 10px}.starter-template .links ul li:first-child{margin-left:0}.starter-template .links ul li:last-child{margin-right:0}.starter-template .links ul li.current-version{color:#f2b7bd;font-weight:400}.starter-template .links ul li a{color:#fff}.starter-template .links ul li a:hover{text-decoration:underline}.starter-template .links ul li .icon-muted{color:#eb8b95;margin-right:5px}.starter-template .links ul li:hover .icon-muted{color:#fff}.starter-template .copyright{margin-top:10px;font-size:.9em;color:#f2b7bd;text-transform:lowercase;float:right;right:0}@media (max-width:1199px){.starter-template .content h1{font-size:45px}.starter-template .content h1 .smaller{font-size:30px}.starter-template .content .lead{font-size:20px}}@media (max-width:991px){.starter-template{margin-top:0}.starter-template .logo{margin:40px auto}.starter-template .content{margin-left:0;text-align:center}.starter-template .content h1{margin-bottom:20px}.starter-template .links{float:none;text-align:center;margin-top:60px}.starter-template .copyright{float:none;text-align:center}}@media (max-width:767px){.starter-template .content h1 .smaller{font-size:25px;display:block}.starter-template .content .lead{font-size:16px}.starter-template .links{margin-top:40px}.starter-template .links ul li{display:block;margin:0}.starter-template .links ul li .icon-muted{display:none}.starter-template .copyright{margin-top:20px}}
\ No newline at end of file
-- 
cgit v1.2.3


From 3f4be54d2504858e459d4cd25851a253c337d709 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 3 Jan 2014 22:49:59 -0500
Subject: changed starter template

---
 .../starter/+package+/templates/mytemplate.pt      | 66 +++++++++++++++++++
 .../starter/+package+/templates/mytemplate.pt_tmpl | 73 ----------------------
 2 files changed, 66 insertions(+), 73 deletions(-)
 create mode 100644 pyramid/scaffolds/starter/+package+/templates/mytemplate.pt
 delete mode 100644 pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl

diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt
new file mode 100644
index 000000000..1c2771a0d
--- /dev/null
+++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html lang="${request.locale_name}">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="pyramid web application">
+    <meta name="author" content="Pylons Project">
+    <link rel="shortcut icon" href="${request.static_url('pst:static/pyramid-16x16.png')}">
+
+    <title>Starter Template for The Pyramid Web Framework</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="${request.static_url('pst:static/theme.css')}" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+      <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+      <script src="//oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+    <![endif]-->
+  </head>
+
+  <body>
+
+    <div class="starter-template">
+      <div class="container">
+        <div class="row">
+          <div class="col-md-2">
+            <img class="logo img-responsive" src="${request.static_url('pst:static/pyramid.png')}" alt="pyramid web framework">
+          </div>
+          <div class="col-md-10">
+            <div class="content">
+              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">starter template</span></h1>
+              <p class="lead">Welcome to <span class="font-normal">${project}</span>, an&nbsp;application generated&nbsp;by<br>the <span class="font-normal">Pyramid Web Framework</span>.</p>
+            </div>
+          </div>
+        </div>
+        <div class="row">
+          <div class="links">
+            <ul>
+              <li class="current-version">Currently vX.X</li>
+              <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org">Docs</a></li>
+              <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li>
+              <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li>
+              <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="http://pylonsproject.org">Pylons Project</a></li>
+          </div>
+        </div>
+        <div class="row">
+          <div class="copyright">
+            Copyright © Pylons Project
+          </div>
+        </div>
+      </div>
+    </div>
+
+
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="//oss.maxcdn.com/libs/jquery/1.10.2/jquery.min.js"></script>
+    <script src="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/js/bootstrap.min.js"></script>
+  </body>
+</html>
diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
deleted file mode 100644
index c9a211935..000000000
--- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
-<head>
-  <title>The Pyramid Web Framework</title>
-  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-  <meta name="keywords" content="python web application" />
-  <meta name="description" content="pyramid web application" />
-  <link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" />
-  <link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/nobile/stylesheet.css" media="screen" />
-  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/neuton/stylesheet.css" media="screen" />
-  <!--[if lte IE 6]>
-  <link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
-  <![endif]-->
-</head>
-<body>
-  <div id="wrap">
-    <div id="top">
-      <div class="top align-center">
-          <div><img src="${request.static_url('{{package}}:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div>
-      </div>
-    </div>
-    <div id="middle">
-      <div class="middle align-center">
-        <p class="app-welcome">
-          Welcome to <span class="app-name">${project}</span>, an application generated by<br/>
-          the Pyramid Web Framework.
-        </p>
-      </div>
-    </div>
-    <div id="bottom">
-      <div class="bottom">
-        <div id="left" class="align-right">
-          <h2>Search documentation</h2>
-          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/search.html">
-                <input type="text" id="q" name="q" value="" />
-                <input type="submit" id="x" value="Go" />
-            </form>
-        </div>
-        <div id="right" class="align-left">
-          <h2>Pyramid links</h2>
-          <ul class="links">
-            <li>
-              <a href="http://pylonsproject.org">Pylons Website</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#narrative-documentation">Narrative Documentation</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#reference-material">API Documentation</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#tutorials">Tutorials</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#detailed-change-history">Change History</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#sample-applications">Sample Applications</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#support-and-development">Support and Development</a>
-            </li>
-            <li>
-              <a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
-            </li>
-            </ul>
-        </div>
-      </div>
-    </div>
-  </div>
-</body>
-</html>
-- 
cgit v1.2.3


From fd0a81bb885c264cdcfa713c9afd2682e6202789 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 3 Jan 2014 22:51:07 -0500
Subject: removed zodb assets

---
 .../scaffolds/zodb/+package+/static/favicon.ico    | Bin 1406 -> 0 bytes
 .../scaffolds/zodb/+package+/static/footerbg.png   | Bin 333 -> 0 bytes
 .../scaffolds/zodb/+package+/static/headerbg.png   | Bin 203 -> 0 bytes
 pyramid/scaffolds/zodb/+package+/static/ie6.css    |   8 -
 .../scaffolds/zodb/+package+/static/middlebg.png   | Bin 2797 -> 0 bytes
 pyramid/scaffolds/zodb/+package+/static/pylons.css | 372 ---------------------
 .../scaffolds/zodb/+package+/static/pyramid.png    | Bin 33055 -> 0 bytes
 .../zodb/+package+/static/transparent.gif          | Bin 49 -> 0 bytes
 8 files changed, 380 deletions(-)
 delete mode 100644 pyramid/scaffolds/zodb/+package+/static/favicon.ico
 delete mode 100644 pyramid/scaffolds/zodb/+package+/static/footerbg.png
 delete mode 100644 pyramid/scaffolds/zodb/+package+/static/headerbg.png
 delete mode 100644 pyramid/scaffolds/zodb/+package+/static/ie6.css
 delete mode 100644 pyramid/scaffolds/zodb/+package+/static/middlebg.png
 delete mode 100644 pyramid/scaffolds/zodb/+package+/static/pylons.css
 delete mode 100644 pyramid/scaffolds/zodb/+package+/static/pyramid.png
 delete mode 100644 pyramid/scaffolds/zodb/+package+/static/transparent.gif

diff --git a/pyramid/scaffolds/zodb/+package+/static/favicon.ico b/pyramid/scaffolds/zodb/+package+/static/favicon.ico
deleted file mode 100644
index 71f837c9e..000000000
Binary files a/pyramid/scaffolds/zodb/+package+/static/favicon.ico and /dev/null differ
diff --git a/pyramid/scaffolds/zodb/+package+/static/footerbg.png b/pyramid/scaffolds/zodb/+package+/static/footerbg.png
deleted file mode 100644
index 1fbc873da..000000000
Binary files a/pyramid/scaffolds/zodb/+package+/static/footerbg.png and /dev/null differ
diff --git a/pyramid/scaffolds/zodb/+package+/static/headerbg.png b/pyramid/scaffolds/zodb/+package+/static/headerbg.png
deleted file mode 100644
index 0596f2020..000000000
Binary files a/pyramid/scaffolds/zodb/+package+/static/headerbg.png and /dev/null differ
diff --git a/pyramid/scaffolds/zodb/+package+/static/ie6.css b/pyramid/scaffolds/zodb/+package+/static/ie6.css
deleted file mode 100644
index b7c8493d8..000000000
--- a/pyramid/scaffolds/zodb/+package+/static/ie6.css
+++ /dev/null
@@ -1,8 +0,0 @@
-* html img,
-* html .png{position:relative;behavior:expression((this.runtimeStyle.behavior="none")&&(this.pngSet?this.pngSet=true:(this.nodeName == "IMG" && this.src.toLowerCase().indexOf('.png')>-1?(this.runtimeStyle.backgroundImage = "none",
-this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.src + "',sizingMethod='image')",
-this.src = "static/transparent.gif"):(this.origBg = this.origBg? this.origBg :this.currentStyle.backgroundImage.toString().replace('url("','').replace('")',''),
-this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.origBg + "',sizingMethod='crop')",
-this.runtimeStyle.backgroundImage = "none")),this.pngSet=true)
-);}
-#wrap{display:table;height:100%}
diff --git a/pyramid/scaffolds/zodb/+package+/static/middlebg.png b/pyramid/scaffolds/zodb/+package+/static/middlebg.png
deleted file mode 100644
index 2369cfb7d..000000000
Binary files a/pyramid/scaffolds/zodb/+package+/static/middlebg.png and /dev/null differ
diff --git a/pyramid/scaffolds/zodb/+package+/static/pylons.css b/pyramid/scaffolds/zodb/+package+/static/pylons.css
deleted file mode 100644
index 4b1c017cd..000000000
--- a/pyramid/scaffolds/zodb/+package+/static/pylons.css
+++ /dev/null
@@ -1,372 +0,0 @@
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td
-{
-  margin: 0;
-  padding: 0;
-  border: 0;
-  outline: 0;
-  font-size: 100%; /* 16px */
-  vertical-align: baseline;
-  background: transparent;
-}
-
-body
-{
-  line-height: 1;
-}
-
-ol, ul
-{
-  list-style: none;
-}
-
-blockquote, q
-{
-  quotes: none;
-}
-
-blockquote:before, blockquote:after, q:before, q:after
-{
-  content: '';
-  content: none;
-}
-
-:focus
-{
-  outline: 0;
-}
-
-ins
-{
-  text-decoration: none;
-}
-
-del
-{
-  text-decoration: line-through;
-}
-
-table
-{
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-sub
-{
-  vertical-align: sub;
-  font-size: smaller;
-  line-height: normal;
-}
-
-sup
-{
-  vertical-align: super;
-  font-size: smaller;
-  line-height: normal;
-}
-
-ul, menu, dir
-{
-  display: block;
-  list-style-type: disc;
-  margin: 1em 0;
-  padding-left: 40px;
-}
-
-ol
-{
-  display: block;
-  list-style-type: decimal-leading-zero;
-  margin: 1em 0;
-  padding-left: 40px;
-}
-
-li
-{
-  display: list-item;
-}
-
-ul ul, ul ol, ul dir, ul menu, ul dl, ol ul, ol ol, ol dir, ol menu, ol dl, dir ul, dir ol, dir dir, dir menu, dir dl, menu ul, menu ol, menu dir, menu menu, menu dl, dl ul, dl ol, dl dir, dl menu, dl dl
-{
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-ol ul, ul ul, menu ul, dir ul, ol menu, ul menu, menu menu, dir menu, ol dir, ul dir, menu dir, dir dir
-{
-  list-style-type: circle;
-}
-
-ol ol ul, ol ul ul, ol menu ul, ol dir ul, ol ol menu, ol ul menu, ol menu menu, ol dir menu, ol ol dir, ol ul dir, ol menu dir, ol dir dir, ul ol ul, ul ul ul, ul menu ul, ul dir ul, ul ol menu, ul ul menu, ul menu menu, ul dir menu, ul ol dir, ul ul dir, ul menu dir, ul dir dir, menu ol ul, menu ul ul, menu menu ul, menu dir ul, menu ol menu, menu ul menu, menu menu menu, menu dir menu, menu ol dir, menu ul dir, menu menu dir, menu dir dir, dir ol ul, dir ul ul, dir menu ul, dir dir ul, dir ol menu, dir ul menu, dir menu menu, dir dir menu, dir ol dir, dir ul dir, dir menu dir, dir dir dir
-{
-  list-style-type: square;
-}
-
-.hidden
-{
-  display: none;
-}
-
-p
-{
-  line-height: 1.5em;
-}
-
-h1
-{
-  font-size: 1.75em;
-  line-height: 1.7em;
-  font-family: helvetica, verdana;
-}
-
-h2
-{
-  font-size: 1.5em;
-  line-height: 1.7em;
-  font-family: helvetica, verdana;
-}
-
-h3
-{
-  font-size: 1.25em;
-  line-height: 1.7em;
-  font-family: helvetica, verdana;
-}
-
-h4
-{
-  font-size: 1em;
-  line-height: 1.7em;
-  font-family: helvetica, verdana;
-}
-
-html, body
-{
-  width: 100%;
-  height: 100%;
-}
-
-body
-{
-  margin: 0;
-  padding: 0;
-  background-color: #fff;
-  position: relative;
-  font: 16px/24px NobileRegular, "Lucida Grande", Lucida, Verdana, sans-serif;
-}
-
-a
-{
-  color: #1b61d6;
-  text-decoration: none;
-}
-
-a:hover
-{
-  color: #e88f00;
-  text-decoration: underline;
-}
-
-body h1, body h2, body h3, body h4, body h5, body h6
-{
-  font-family: NeutonRegular, "Lucida Grande", Lucida, Verdana, sans-serif;
-  font-weight: 400;
-  color: #373839;
-  font-style: normal;
-}
-
-#wrap
-{
-  min-height: 100%;
-}
-
-#header, #footer
-{
-  width: 100%;
-  color: #fff;
-  height: 40px;
-  position: absolute;
-  text-align: center;
-  line-height: 40px;
-  overflow: hidden;
-  font-size: 12px;
-  vertical-align: middle;
-}
-
-#header
-{
-  background: #000;
-  top: 0;
-  font-size: 14px;
-}
-
-#footer
-{
-  bottom: 0;
-  background: #000 url(footerbg.png) repeat-x 0 top;
-  position: relative;
-  margin-top: -40px;
-  clear: both;
-}
-
-.header, .footer
-{
-  width: 750px;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-.wrapper
-{
-  width: 100%;
-}
-
-#top, #top-small, #bottom
-{
-  width: 100%;
-}
-
-#top
-{
-  color: #000;
-  height: 230px;
-  background: #fff url(headerbg.png) repeat-x 0 top;
-  position: relative;
-}
-
-#top-small
-{
-  color: #000;
-  height: 60px;
-  background: #fff url(headerbg.png) repeat-x 0 top;
-  position: relative;
-}
-
-#bottom
-{
-  color: #222;
-  background-color: #fff;
-}
-
-.top, .top-small, .middle, .bottom
-{
-  width: 750px;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-.top
-{
-  padding-top: 40px;
-}
-
-.top-small
-{
-  padding-top: 10px;
-}
-
-#middle
-{
-  width: 100%;
-  height: 100px;
-  background: url(middlebg.png) repeat-x;
-  border-top: 2px solid #fff;
-  border-bottom: 2px solid #b2b2b2;
-}
-
-.app-welcome
-{
-  margin-top: 25px;
-}
-
-.app-name
-{
-  color: #000;
-  font-weight: 700;
-}
-
-.bottom
-{
-  padding-top: 50px;
-}
-
-#left
-{
-  width: 350px;
-  float: left;
-  padding-right: 25px;
-}
-
-#right
-{
-  width: 350px;
-  float: right;
-  padding-left: 25px;
-}
-
-.align-left
-{
-  text-align: left;
-}
-
-.align-right
-{
-  text-align: right;
-}
-
-.align-center
-{
-  text-align: center;
-}
-
-ul.links
-{
-  margin: 0;
-  padding: 0;
-}
-
-ul.links li
-{
-  list-style-type: none;
-  font-size: 14px;
-}
-
-form
-{
-  border-style: none;
-}
-
-fieldset
-{
-  border-style: none;
-}
-
-input
-{
-  color: #222;
-  border: 1px solid #ccc;
-  font-family: sans-serif;
-  font-size: 12px;
-  line-height: 16px;
-}
-
-input[type=text], input[type=password]
-{
-  width: 205px;
-}
-
-input[type=submit]
-{
-  background-color: #ddd;
-  font-weight: 700;
-}
-
-/*Opera Fix*/
-body:before
-{
-  content: "";
-  height: 100%;
-  float: left;
-  width: 0;
-  margin-top: -32767px;
-}
diff --git a/pyramid/scaffolds/zodb/+package+/static/pyramid.png b/pyramid/scaffolds/zodb/+package+/static/pyramid.png
deleted file mode 100644
index 347e05549..000000000
Binary files a/pyramid/scaffolds/zodb/+package+/static/pyramid.png and /dev/null differ
diff --git a/pyramid/scaffolds/zodb/+package+/static/transparent.gif b/pyramid/scaffolds/zodb/+package+/static/transparent.gif
deleted file mode 100644
index 0341802e5..000000000
Binary files a/pyramid/scaffolds/zodb/+package+/static/transparent.gif and /dev/null differ
-- 
cgit v1.2.3


From c567fb01069e560ef12a494f07920ea688e3316a Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 3 Jan 2014 22:51:26 -0500
Subject: added new assets

---
 .../zodb/+package+/static/pyramid-16x16.png        | Bin 0 -> 1319 bytes
 .../scaffolds/zodb/+package+/static/pyramid.png    | Bin 0 -> 12901 bytes
 pyramid/scaffolds/zodb/+package+/static/theme.css  | 152 +++++++++++++++++++++
 .../scaffolds/zodb/+package+/static/theme.min.css  |   1 +
 4 files changed, 153 insertions(+)
 create mode 100644 pyramid/scaffolds/zodb/+package+/static/pyramid-16x16.png
 create mode 100644 pyramid/scaffolds/zodb/+package+/static/pyramid.png
 create mode 100644 pyramid/scaffolds/zodb/+package+/static/theme.css
 create mode 100644 pyramid/scaffolds/zodb/+package+/static/theme.min.css

diff --git a/pyramid/scaffolds/zodb/+package+/static/pyramid-16x16.png b/pyramid/scaffolds/zodb/+package+/static/pyramid-16x16.png
new file mode 100644
index 000000000..979203112
Binary files /dev/null and b/pyramid/scaffolds/zodb/+package+/static/pyramid-16x16.png differ
diff --git a/pyramid/scaffolds/zodb/+package+/static/pyramid.png b/pyramid/scaffolds/zodb/+package+/static/pyramid.png
new file mode 100644
index 000000000..4ab837be9
Binary files /dev/null and b/pyramid/scaffolds/zodb/+package+/static/pyramid.png differ
diff --git a/pyramid/scaffolds/zodb/+package+/static/theme.css b/pyramid/scaffolds/zodb/+package+/static/theme.css
new file mode 100644
index 000000000..be50ad420
--- /dev/null
+++ b/pyramid/scaffolds/zodb/+package+/static/theme.css
@@ -0,0 +1,152 @@
+@import url(//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700);
+body {
+  font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: 300;
+  color: #ffffff;
+  background: #bc2131;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: 300;
+}
+p {
+  font-weight: 300;
+}
+.font-normal {
+  font-weight: 400;
+}
+.font-semi-bold {
+  font-weight: 600;
+}
+.font-bold {
+  font-weight: 700;
+}
+.starter-template {
+  margin-top: 250px;
+}
+.starter-template .content {
+  margin-left: 10px;
+}
+.starter-template .content h1 {
+  margin-top: 10px;
+  font-size: 60px;
+}
+.starter-template .content h1 .smaller {
+  font-size: 40px;
+  color: #f2b7bd;
+}
+.starter-template .content .lead {
+  font-size: 25px;
+  color: #f2b7bd;
+}
+.starter-template .content .lead .font-normal {
+  color: #ffffff;
+}
+.starter-template .links {
+  float: right;
+  right: 0;
+  margin-top: 125px;
+}
+.starter-template .links ul {
+  display: block;
+  padding: 0;
+  margin: 0;
+}
+.starter-template .links ul li {
+  list-style: none;
+  display: inline;
+  margin: 0 10px;
+}
+.starter-template .links ul li:first-child {
+  margin-left: 0;
+}
+.starter-template .links ul li:last-child {
+  margin-right: 0;
+}
+.starter-template .links ul li.current-version {
+  color: #f2b7bd;
+  font-weight: 400;
+}
+.starter-template .links ul li a {
+  color: #ffffff;
+}
+.starter-template .links ul li a:hover {
+  text-decoration: underline;
+}
+.starter-template .links ul li .icon-muted {
+  color: #eb8b95;
+  margin-right: 5px;
+}
+.starter-template .links ul li:hover .icon-muted {
+  color: #ffffff;
+}
+.starter-template .copyright {
+  margin-top: 10px;
+  font-size: 0.9em;
+  color: #f2b7bd;
+  text-transform: lowercase;
+  float: right;
+  right: 0;
+}
+@media (max-width: 1199px) {
+  .starter-template .content h1 {
+    font-size: 45px;
+  }
+  .starter-template .content h1 .smaller {
+    font-size: 30px;
+  }
+  .starter-template .content .lead {
+    font-size: 20px;
+  }
+}
+@media (max-width: 991px) {
+  .starter-template {
+    margin-top: 0;
+  }
+  .starter-template .logo {
+    margin: 40px auto;
+  }
+  .starter-template .content {
+    margin-left: 0;
+    text-align: center;
+  }
+  .starter-template .content h1 {
+    margin-bottom: 20px;
+  }
+  .starter-template .links {
+    float: none;
+    text-align: center;
+    margin-top: 60px;
+  }
+  .starter-template .copyright {
+    float: none;
+    text-align: center;
+  }
+}
+@media (max-width: 767px) {
+  .starter-template .content h1 .smaller {
+    font-size: 25px;
+    display: block;
+  }
+  .starter-template .content .lead {
+    font-size: 16px;
+  }
+  .starter-template .links {
+    margin-top: 40px;
+  }
+  .starter-template .links ul li {
+    display: block;
+    margin: 0;
+  }
+  .starter-template .links ul li .icon-muted {
+    display: none;
+  }
+  .starter-template .copyright {
+    margin-top: 20px;
+  }
+}
diff --git a/pyramid/scaffolds/zodb/+package+/static/theme.min.css b/pyramid/scaffolds/zodb/+package+/static/theme.min.css
new file mode 100644
index 000000000..2f924bcc5
--- /dev/null
+++ b/pyramid/scaffolds/zodb/+package+/static/theme.min.css
@@ -0,0 +1 @@
+@import url(//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700);body{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:300;color:#fff;background:#bc2131}h1,h2,h3,h4,h5,h6{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:300}p{font-weight:300}.font-normal{font-weight:400}.font-semi-bold{font-weight:600}.font-bold{font-weight:700}.starter-template{margin-top:250px}.starter-template .content{margin-left:10px}.starter-template .content h1{margin-top:10px;font-size:60px}.starter-template .content h1 .smaller{font-size:40px;color:#f2b7bd}.starter-template .content .lead{font-size:25px;color:#f2b7bd}.starter-template .content .lead .font-normal{color:#fff}.starter-template .links{float:right;right:0;margin-top:125px}.starter-template .links ul{display:block;padding:0;margin:0}.starter-template .links ul li{list-style:none;display:inline;margin:0 10px}.starter-template .links ul li:first-child{margin-left:0}.starter-template .links ul li:last-child{margin-right:0}.starter-template .links ul li.current-version{color:#f2b7bd;font-weight:400}.starter-template .links ul li a{color:#fff}.starter-template .links ul li a:hover{text-decoration:underline}.starter-template .links ul li .icon-muted{color:#eb8b95;margin-right:5px}.starter-template .links ul li:hover .icon-muted{color:#fff}.starter-template .copyright{margin-top:10px;font-size:.9em;color:#f2b7bd;text-transform:lowercase;float:right;right:0}@media (max-width:1199px){.starter-template .content h1{font-size:45px}.starter-template .content h1 .smaller{font-size:30px}.starter-template .content .lead{font-size:20px}}@media (max-width:991px){.starter-template{margin-top:0}.starter-template .logo{margin:40px auto}.starter-template .content{margin-left:0;text-align:center}.starter-template .content h1{margin-bottom:20px}.starter-template .links{float:none;text-align:center;margin-top:60px}.starter-template .copyright{float:none;text-align:center}}@media (max-width:767px){.starter-template .content h1 .smaller{font-size:25px;display:block}.starter-template .content .lead{font-size:16px}.starter-template .links{margin-top:40px}.starter-template .links ul li{display:block;margin:0}.starter-template .links ul li .icon-muted{display:none}.starter-template .copyright{margin-top:20px}}
\ No newline at end of file
-- 
cgit v1.2.3


From 2a5d4ee086978f5b14c73f2b349893cdb1ab9b91 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 3 Jan 2014 22:52:15 -0500
Subject: changed zodb template

---
 .../zodb/+package+/templates/mytemplate.pt         | 129 ++++++++++-----------
 1 file changed, 61 insertions(+), 68 deletions(-)

diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt
index 5a2ce2bd7..1c2771a0d 100644
--- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt
+++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt
@@ -1,73 +1,66 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
-<head>
-  <title>The Pyramid Web Framework</title>
-  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-  <meta name="keywords" content="python web application" />
-  <meta name="description" content="pyramid web application" />
-  <link rel="shortcut icon" href="/static/favicon.ico" />
-  <link rel="stylesheet" href="/static/pylons.css" type="text/css" media="screen" charset="utf-8" />
-  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/nobile/stylesheet.css" media="screen" />
-  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/neuton/stylesheet.css" media="screen" />
-  <!--[if lte IE 6]>
-  <link rel="stylesheet" href="/static/ie6.css" type="text/css" media="screen" charset="utf-8" />
-  <![endif]-->
-</head>
-<body>
-  <div id="wrap">
-    <div id="top">
-      <div class="top align-center">
-        <div><img src="/static/pyramid.png" width="750" height="169" alt="pyramid"/></div>
-      </div>
-    </div>
-    <div id="middle">
-      <div class="middle align-center">
-        <p class="app-welcome">
-          Welcome to <span class="app-name">${project}</span>, an application generated by<br/>
-          the Pyramid Web Framework.
-        </p>
-      </div>
-    </div>
-    <div id="bottom">
-      <div class="bottom">
-        <div id="left" class="align-right">
-          <h2>Search documentation</h2>
-          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/search.html">
-                <input type="text" id="q" name="q" value="" />
-                <input type="submit" id="x" value="Go" />
-            </form>
+<!DOCTYPE html>
+<html lang="${request.locale_name}">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="pyramid web application">
+    <meta name="author" content="Pylons Project">
+    <link rel="shortcut icon" href="${request.static_url('pst:static/pyramid-16x16.png')}">
+
+    <title>Starter Template for The Pyramid Web Framework</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="${request.static_url('pst:static/theme.css')}" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+      <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+      <script src="//oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+    <![endif]-->
+  </head>
+
+  <body>
+
+    <div class="starter-template">
+      <div class="container">
+        <div class="row">
+          <div class="col-md-2">
+            <img class="logo img-responsive" src="${request.static_url('pst:static/pyramid.png')}" alt="pyramid web framework">
+          </div>
+          <div class="col-md-10">
+            <div class="content">
+              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">starter template</span></h1>
+              <p class="lead">Welcome to <span class="font-normal">${project}</span>, an&nbsp;application generated&nbsp;by<br>the <span class="font-normal">Pyramid Web Framework</span>.</p>
+            </div>
+          </div>
+        </div>
+        <div class="row">
+          <div class="links">
+            <ul>
+              <li class="current-version">Currently vX.X</li>
+              <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org">Docs</a></li>
+              <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li>
+              <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li>
+              <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="http://pylonsproject.org">Pylons Project</a></li>
+          </div>
         </div>
-        <div id="right" class="align-left">
-          <h2>Pyramid links</h2>
-          <ul class="links">
-            <li>
-              <a href="http://pylonsproject.org">Pylons Website</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#narrative-documentation">Narrative Documentation</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#reference-material">API Documentation</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#tutorials">Tutorials</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#detailed-change-history">Change History</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#sample-applications">Sample Applications</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#support-and-development">Support and Development</a>
-            </li>
-            <li>
-              <a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
-            </li>
-            </ul>
+        <div class="row">
+          <div class="copyright">
+            Copyright © Pylons Project
+          </div>
         </div>
       </div>
     </div>
-  </div>
-</body>
+
+
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="//oss.maxcdn.com/libs/jquery/1.10.2/jquery.min.js"></script>
+    <script src="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/js/bootstrap.min.js"></script>
+  </body>
 </html>
-- 
cgit v1.2.3


From f5d007eb292636aeafa78ed66c72ce43317299ad Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 3 Jan 2014 22:53:06 -0500
Subject: removed alchemy assets

---
 .../scaffolds/alchemy/+package+/static/favicon.ico | Bin 1406 -> 0 bytes
 .../alchemy/+package+/static/footerbg.png          | Bin 333 -> 0 bytes
 .../alchemy/+package+/static/headerbg.png          | Bin 203 -> 0 bytes
 pyramid/scaffolds/alchemy/+package+/static/ie6.css |   8 -
 .../alchemy/+package+/static/middlebg.png          | Bin 2797 -> 0 bytes
 .../scaffolds/alchemy/+package+/static/pylons.css  | 372 ---------------------
 .../scaffolds/alchemy/+package+/static/pyramid.png | Bin 33055 -> 0 bytes
 .../alchemy/+package+/static/transparent.gif       | Bin 49 -> 0 bytes
 8 files changed, 380 deletions(-)
 delete mode 100644 pyramid/scaffolds/alchemy/+package+/static/favicon.ico
 delete mode 100644 pyramid/scaffolds/alchemy/+package+/static/footerbg.png
 delete mode 100644 pyramid/scaffolds/alchemy/+package+/static/headerbg.png
 delete mode 100644 pyramid/scaffolds/alchemy/+package+/static/ie6.css
 delete mode 100644 pyramid/scaffolds/alchemy/+package+/static/middlebg.png
 delete mode 100644 pyramid/scaffolds/alchemy/+package+/static/pylons.css
 delete mode 100644 pyramid/scaffolds/alchemy/+package+/static/pyramid.png
 delete mode 100644 pyramid/scaffolds/alchemy/+package+/static/transparent.gif

diff --git a/pyramid/scaffolds/alchemy/+package+/static/favicon.ico b/pyramid/scaffolds/alchemy/+package+/static/favicon.ico
deleted file mode 100644
index 71f837c9e..000000000
Binary files a/pyramid/scaffolds/alchemy/+package+/static/favicon.ico and /dev/null differ
diff --git a/pyramid/scaffolds/alchemy/+package+/static/footerbg.png b/pyramid/scaffolds/alchemy/+package+/static/footerbg.png
deleted file mode 100644
index 1fbc873da..000000000
Binary files a/pyramid/scaffolds/alchemy/+package+/static/footerbg.png and /dev/null differ
diff --git a/pyramid/scaffolds/alchemy/+package+/static/headerbg.png b/pyramid/scaffolds/alchemy/+package+/static/headerbg.png
deleted file mode 100644
index 0596f2020..000000000
Binary files a/pyramid/scaffolds/alchemy/+package+/static/headerbg.png and /dev/null differ
diff --git a/pyramid/scaffolds/alchemy/+package+/static/ie6.css b/pyramid/scaffolds/alchemy/+package+/static/ie6.css
deleted file mode 100644
index b7c8493d8..000000000
--- a/pyramid/scaffolds/alchemy/+package+/static/ie6.css
+++ /dev/null
@@ -1,8 +0,0 @@
-* html img,
-* html .png{position:relative;behavior:expression((this.runtimeStyle.behavior="none")&&(this.pngSet?this.pngSet=true:(this.nodeName == "IMG" && this.src.toLowerCase().indexOf('.png')>-1?(this.runtimeStyle.backgroundImage = "none",
-this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.src + "',sizingMethod='image')",
-this.src = "static/transparent.gif"):(this.origBg = this.origBg? this.origBg :this.currentStyle.backgroundImage.toString().replace('url("','').replace('")',''),
-this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.origBg + "',sizingMethod='crop')",
-this.runtimeStyle.backgroundImage = "none")),this.pngSet=true)
-);}
-#wrap{display:table;height:100%}
diff --git a/pyramid/scaffolds/alchemy/+package+/static/middlebg.png b/pyramid/scaffolds/alchemy/+package+/static/middlebg.png
deleted file mode 100644
index 2369cfb7d..000000000
Binary files a/pyramid/scaffolds/alchemy/+package+/static/middlebg.png and /dev/null differ
diff --git a/pyramid/scaffolds/alchemy/+package+/static/pylons.css b/pyramid/scaffolds/alchemy/+package+/static/pylons.css
deleted file mode 100644
index 4b1c017cd..000000000
--- a/pyramid/scaffolds/alchemy/+package+/static/pylons.css
+++ /dev/null
@@ -1,372 +0,0 @@
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td
-{
-  margin: 0;
-  padding: 0;
-  border: 0;
-  outline: 0;
-  font-size: 100%; /* 16px */
-  vertical-align: baseline;
-  background: transparent;
-}
-
-body
-{
-  line-height: 1;
-}
-
-ol, ul
-{
-  list-style: none;
-}
-
-blockquote, q
-{
-  quotes: none;
-}
-
-blockquote:before, blockquote:after, q:before, q:after
-{
-  content: '';
-  content: none;
-}
-
-:focus
-{
-  outline: 0;
-}
-
-ins
-{
-  text-decoration: none;
-}
-
-del
-{
-  text-decoration: line-through;
-}
-
-table
-{
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-sub
-{
-  vertical-align: sub;
-  font-size: smaller;
-  line-height: normal;
-}
-
-sup
-{
-  vertical-align: super;
-  font-size: smaller;
-  line-height: normal;
-}
-
-ul, menu, dir
-{
-  display: block;
-  list-style-type: disc;
-  margin: 1em 0;
-  padding-left: 40px;
-}
-
-ol
-{
-  display: block;
-  list-style-type: decimal-leading-zero;
-  margin: 1em 0;
-  padding-left: 40px;
-}
-
-li
-{
-  display: list-item;
-}
-
-ul ul, ul ol, ul dir, ul menu, ul dl, ol ul, ol ol, ol dir, ol menu, ol dl, dir ul, dir ol, dir dir, dir menu, dir dl, menu ul, menu ol, menu dir, menu menu, menu dl, dl ul, dl ol, dl dir, dl menu, dl dl
-{
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-ol ul, ul ul, menu ul, dir ul, ol menu, ul menu, menu menu, dir menu, ol dir, ul dir, menu dir, dir dir
-{
-  list-style-type: circle;
-}
-
-ol ol ul, ol ul ul, ol menu ul, ol dir ul, ol ol menu, ol ul menu, ol menu menu, ol dir menu, ol ol dir, ol ul dir, ol menu dir, ol dir dir, ul ol ul, ul ul ul, ul menu ul, ul dir ul, ul ol menu, ul ul menu, ul menu menu, ul dir menu, ul ol dir, ul ul dir, ul menu dir, ul dir dir, menu ol ul, menu ul ul, menu menu ul, menu dir ul, menu ol menu, menu ul menu, menu menu menu, menu dir menu, menu ol dir, menu ul dir, menu menu dir, menu dir dir, dir ol ul, dir ul ul, dir menu ul, dir dir ul, dir ol menu, dir ul menu, dir menu menu, dir dir menu, dir ol dir, dir ul dir, dir menu dir, dir dir dir
-{
-  list-style-type: square;
-}
-
-.hidden
-{
-  display: none;
-}
-
-p
-{
-  line-height: 1.5em;
-}
-
-h1
-{
-  font-size: 1.75em;
-  line-height: 1.7em;
-  font-family: helvetica, verdana;
-}
-
-h2
-{
-  font-size: 1.5em;
-  line-height: 1.7em;
-  font-family: helvetica, verdana;
-}
-
-h3
-{
-  font-size: 1.25em;
-  line-height: 1.7em;
-  font-family: helvetica, verdana;
-}
-
-h4
-{
-  font-size: 1em;
-  line-height: 1.7em;
-  font-family: helvetica, verdana;
-}
-
-html, body
-{
-  width: 100%;
-  height: 100%;
-}
-
-body
-{
-  margin: 0;
-  padding: 0;
-  background-color: #fff;
-  position: relative;
-  font: 16px/24px NobileRegular, "Lucida Grande", Lucida, Verdana, sans-serif;
-}
-
-a
-{
-  color: #1b61d6;
-  text-decoration: none;
-}
-
-a:hover
-{
-  color: #e88f00;
-  text-decoration: underline;
-}
-
-body h1, body h2, body h3, body h4, body h5, body h6
-{
-  font-family: NeutonRegular, "Lucida Grande", Lucida, Verdana, sans-serif;
-  font-weight: 400;
-  color: #373839;
-  font-style: normal;
-}
-
-#wrap
-{
-  min-height: 100%;
-}
-
-#header, #footer
-{
-  width: 100%;
-  color: #fff;
-  height: 40px;
-  position: absolute;
-  text-align: center;
-  line-height: 40px;
-  overflow: hidden;
-  font-size: 12px;
-  vertical-align: middle;
-}
-
-#header
-{
-  background: #000;
-  top: 0;
-  font-size: 14px;
-}
-
-#footer
-{
-  bottom: 0;
-  background: #000 url(footerbg.png) repeat-x 0 top;
-  position: relative;
-  margin-top: -40px;
-  clear: both;
-}
-
-.header, .footer
-{
-  width: 750px;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-.wrapper
-{
-  width: 100%;
-}
-
-#top, #top-small, #bottom
-{
-  width: 100%;
-}
-
-#top
-{
-  color: #000;
-  height: 230px;
-  background: #fff url(headerbg.png) repeat-x 0 top;
-  position: relative;
-}
-
-#top-small
-{
-  color: #000;
-  height: 60px;
-  background: #fff url(headerbg.png) repeat-x 0 top;
-  position: relative;
-}
-
-#bottom
-{
-  color: #222;
-  background-color: #fff;
-}
-
-.top, .top-small, .middle, .bottom
-{
-  width: 750px;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-.top
-{
-  padding-top: 40px;
-}
-
-.top-small
-{
-  padding-top: 10px;
-}
-
-#middle
-{
-  width: 100%;
-  height: 100px;
-  background: url(middlebg.png) repeat-x;
-  border-top: 2px solid #fff;
-  border-bottom: 2px solid #b2b2b2;
-}
-
-.app-welcome
-{
-  margin-top: 25px;
-}
-
-.app-name
-{
-  color: #000;
-  font-weight: 700;
-}
-
-.bottom
-{
-  padding-top: 50px;
-}
-
-#left
-{
-  width: 350px;
-  float: left;
-  padding-right: 25px;
-}
-
-#right
-{
-  width: 350px;
-  float: right;
-  padding-left: 25px;
-}
-
-.align-left
-{
-  text-align: left;
-}
-
-.align-right
-{
-  text-align: right;
-}
-
-.align-center
-{
-  text-align: center;
-}
-
-ul.links
-{
-  margin: 0;
-  padding: 0;
-}
-
-ul.links li
-{
-  list-style-type: none;
-  font-size: 14px;
-}
-
-form
-{
-  border-style: none;
-}
-
-fieldset
-{
-  border-style: none;
-}
-
-input
-{
-  color: #222;
-  border: 1px solid #ccc;
-  font-family: sans-serif;
-  font-size: 12px;
-  line-height: 16px;
-}
-
-input[type=text], input[type=password]
-{
-  width: 205px;
-}
-
-input[type=submit]
-{
-  background-color: #ddd;
-  font-weight: 700;
-}
-
-/*Opera Fix*/
-body:before
-{
-  content: "";
-  height: 100%;
-  float: left;
-  width: 0;
-  margin-top: -32767px;
-}
diff --git a/pyramid/scaffolds/alchemy/+package+/static/pyramid.png b/pyramid/scaffolds/alchemy/+package+/static/pyramid.png
deleted file mode 100644
index 347e05549..000000000
Binary files a/pyramid/scaffolds/alchemy/+package+/static/pyramid.png and /dev/null differ
diff --git a/pyramid/scaffolds/alchemy/+package+/static/transparent.gif b/pyramid/scaffolds/alchemy/+package+/static/transparent.gif
deleted file mode 100644
index 0341802e5..000000000
Binary files a/pyramid/scaffolds/alchemy/+package+/static/transparent.gif and /dev/null differ
-- 
cgit v1.2.3


From 73bd0f490c6ea46bf42dcbfb16894aa89fb99e19 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 3 Jan 2014 22:53:27 -0500
Subject: added new assets

---
 .../alchemy/+package+/static/pyramid-16x16.png     | Bin 0 -> 1319 bytes
 .../scaffolds/alchemy/+package+/static/pyramid.png | Bin 0 -> 12901 bytes
 .../scaffolds/alchemy/+package+/static/theme.css   | 152 +++++++++++++++++++++
 .../alchemy/+package+/static/theme.min.css         |   1 +
 4 files changed, 153 insertions(+)
 create mode 100644 pyramid/scaffolds/alchemy/+package+/static/pyramid-16x16.png
 create mode 100644 pyramid/scaffolds/alchemy/+package+/static/pyramid.png
 create mode 100644 pyramid/scaffolds/alchemy/+package+/static/theme.css
 create mode 100644 pyramid/scaffolds/alchemy/+package+/static/theme.min.css

diff --git a/pyramid/scaffolds/alchemy/+package+/static/pyramid-16x16.png b/pyramid/scaffolds/alchemy/+package+/static/pyramid-16x16.png
new file mode 100644
index 000000000..979203112
Binary files /dev/null and b/pyramid/scaffolds/alchemy/+package+/static/pyramid-16x16.png differ
diff --git a/pyramid/scaffolds/alchemy/+package+/static/pyramid.png b/pyramid/scaffolds/alchemy/+package+/static/pyramid.png
new file mode 100644
index 000000000..4ab837be9
Binary files /dev/null and b/pyramid/scaffolds/alchemy/+package+/static/pyramid.png differ
diff --git a/pyramid/scaffolds/alchemy/+package+/static/theme.css b/pyramid/scaffolds/alchemy/+package+/static/theme.css
new file mode 100644
index 000000000..be50ad420
--- /dev/null
+++ b/pyramid/scaffolds/alchemy/+package+/static/theme.css
@@ -0,0 +1,152 @@
+@import url(//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700);
+body {
+  font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: 300;
+  color: #ffffff;
+  background: #bc2131;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: 300;
+}
+p {
+  font-weight: 300;
+}
+.font-normal {
+  font-weight: 400;
+}
+.font-semi-bold {
+  font-weight: 600;
+}
+.font-bold {
+  font-weight: 700;
+}
+.starter-template {
+  margin-top: 250px;
+}
+.starter-template .content {
+  margin-left: 10px;
+}
+.starter-template .content h1 {
+  margin-top: 10px;
+  font-size: 60px;
+}
+.starter-template .content h1 .smaller {
+  font-size: 40px;
+  color: #f2b7bd;
+}
+.starter-template .content .lead {
+  font-size: 25px;
+  color: #f2b7bd;
+}
+.starter-template .content .lead .font-normal {
+  color: #ffffff;
+}
+.starter-template .links {
+  float: right;
+  right: 0;
+  margin-top: 125px;
+}
+.starter-template .links ul {
+  display: block;
+  padding: 0;
+  margin: 0;
+}
+.starter-template .links ul li {
+  list-style: none;
+  display: inline;
+  margin: 0 10px;
+}
+.starter-template .links ul li:first-child {
+  margin-left: 0;
+}
+.starter-template .links ul li:last-child {
+  margin-right: 0;
+}
+.starter-template .links ul li.current-version {
+  color: #f2b7bd;
+  font-weight: 400;
+}
+.starter-template .links ul li a {
+  color: #ffffff;
+}
+.starter-template .links ul li a:hover {
+  text-decoration: underline;
+}
+.starter-template .links ul li .icon-muted {
+  color: #eb8b95;
+  margin-right: 5px;
+}
+.starter-template .links ul li:hover .icon-muted {
+  color: #ffffff;
+}
+.starter-template .copyright {
+  margin-top: 10px;
+  font-size: 0.9em;
+  color: #f2b7bd;
+  text-transform: lowercase;
+  float: right;
+  right: 0;
+}
+@media (max-width: 1199px) {
+  .starter-template .content h1 {
+    font-size: 45px;
+  }
+  .starter-template .content h1 .smaller {
+    font-size: 30px;
+  }
+  .starter-template .content .lead {
+    font-size: 20px;
+  }
+}
+@media (max-width: 991px) {
+  .starter-template {
+    margin-top: 0;
+  }
+  .starter-template .logo {
+    margin: 40px auto;
+  }
+  .starter-template .content {
+    margin-left: 0;
+    text-align: center;
+  }
+  .starter-template .content h1 {
+    margin-bottom: 20px;
+  }
+  .starter-template .links {
+    float: none;
+    text-align: center;
+    margin-top: 60px;
+  }
+  .starter-template .copyright {
+    float: none;
+    text-align: center;
+  }
+}
+@media (max-width: 767px) {
+  .starter-template .content h1 .smaller {
+    font-size: 25px;
+    display: block;
+  }
+  .starter-template .content .lead {
+    font-size: 16px;
+  }
+  .starter-template .links {
+    margin-top: 40px;
+  }
+  .starter-template .links ul li {
+    display: block;
+    margin: 0;
+  }
+  .starter-template .links ul li .icon-muted {
+    display: none;
+  }
+  .starter-template .copyright {
+    margin-top: 20px;
+  }
+}
diff --git a/pyramid/scaffolds/alchemy/+package+/static/theme.min.css b/pyramid/scaffolds/alchemy/+package+/static/theme.min.css
new file mode 100644
index 000000000..2f924bcc5
--- /dev/null
+++ b/pyramid/scaffolds/alchemy/+package+/static/theme.min.css
@@ -0,0 +1 @@
+@import url(//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700);body{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:300;color:#fff;background:#bc2131}h1,h2,h3,h4,h5,h6{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:300}p{font-weight:300}.font-normal{font-weight:400}.font-semi-bold{font-weight:600}.font-bold{font-weight:700}.starter-template{margin-top:250px}.starter-template .content{margin-left:10px}.starter-template .content h1{margin-top:10px;font-size:60px}.starter-template .content h1 .smaller{font-size:40px;color:#f2b7bd}.starter-template .content .lead{font-size:25px;color:#f2b7bd}.starter-template .content .lead .font-normal{color:#fff}.starter-template .links{float:right;right:0;margin-top:125px}.starter-template .links ul{display:block;padding:0;margin:0}.starter-template .links ul li{list-style:none;display:inline;margin:0 10px}.starter-template .links ul li:first-child{margin-left:0}.starter-template .links ul li:last-child{margin-right:0}.starter-template .links ul li.current-version{color:#f2b7bd;font-weight:400}.starter-template .links ul li a{color:#fff}.starter-template .links ul li a:hover{text-decoration:underline}.starter-template .links ul li .icon-muted{color:#eb8b95;margin-right:5px}.starter-template .links ul li:hover .icon-muted{color:#fff}.starter-template .copyright{margin-top:10px;font-size:.9em;color:#f2b7bd;text-transform:lowercase;float:right;right:0}@media (max-width:1199px){.starter-template .content h1{font-size:45px}.starter-template .content h1 .smaller{font-size:30px}.starter-template .content .lead{font-size:20px}}@media (max-width:991px){.starter-template{margin-top:0}.starter-template .logo{margin:40px auto}.starter-template .content{margin-left:0;text-align:center}.starter-template .content h1{margin-bottom:20px}.starter-template .links{float:none;text-align:center;margin-top:60px}.starter-template .copyright{float:none;text-align:center}}@media (max-width:767px){.starter-template .content h1 .smaller{font-size:25px;display:block}.starter-template .content .lead{font-size:16px}.starter-template .links{margin-top:40px}.starter-template .links ul li{display:block;margin:0}.starter-template .links ul li .icon-muted{display:none}.starter-template .copyright{margin-top:20px}}
\ No newline at end of file
-- 
cgit v1.2.3


From f1fee9646c88373c6affd5058be91c7c0df4b8a4 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 3 Jan 2014 22:56:19 -0500
Subject: changed alchemy template

---
 .../alchemy/+package+/templates/mytemplate.pt_tmpl | 129 ++++++++++-----------
 1 file changed, 61 insertions(+), 68 deletions(-)

diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
index 24651643c..1c2771a0d 100644
--- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
@@ -1,73 +1,66 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
-<head>
-  <title>The Pyramid Web Framework</title>
-  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-  <meta name="keywords" content="python web application" />
-  <meta name="description" content="pyramid web application" />
-  <link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" />
-  <link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/nobile/stylesheet.css" media="screen" />
-  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/neuton/stylesheet.css" media="screen" />
-  <!--[if lte IE 6]>
-  <link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
-  <![endif]-->
-</head>
-<body>
-  <div id="wrap">
-    <div id="top">
-      <div class="top align-center">
-        <div><img src="${request.static_url('{{package}}:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div>
-      </div>
-    </div>
-    <div id="middle">
-      <div class="middle align-center">
-        <p class="app-welcome">
-          Welcome to <span class="app-name">${project}</span>, an application generated by<br/>
-          the Pyramid Web Framework.
-        </p>
-      </div>
-    </div>
-    <div id="bottom">
-      <div class="bottom">
-        <div id="left" class="align-right">
-          <h2>Search documentation</h2>
-          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/search.html">
-                <input type="text" id="q" name="q" value="" />
-                <input type="submit" id="x" value="Go" />
-            </form>
+<!DOCTYPE html>
+<html lang="${request.locale_name}">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="pyramid web application">
+    <meta name="author" content="Pylons Project">
+    <link rel="shortcut icon" href="${request.static_url('pst:static/pyramid-16x16.png')}">
+
+    <title>Starter Template for The Pyramid Web Framework</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="${request.static_url('pst:static/theme.css')}" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+      <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+      <script src="//oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+    <![endif]-->
+  </head>
+
+  <body>
+
+    <div class="starter-template">
+      <div class="container">
+        <div class="row">
+          <div class="col-md-2">
+            <img class="logo img-responsive" src="${request.static_url('pst:static/pyramid.png')}" alt="pyramid web framework">
+          </div>
+          <div class="col-md-10">
+            <div class="content">
+              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">starter template</span></h1>
+              <p class="lead">Welcome to <span class="font-normal">${project}</span>, an&nbsp;application generated&nbsp;by<br>the <span class="font-normal">Pyramid Web Framework</span>.</p>
+            </div>
+          </div>
+        </div>
+        <div class="row">
+          <div class="links">
+            <ul>
+              <li class="current-version">Currently vX.X</li>
+              <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org">Docs</a></li>
+              <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li>
+              <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li>
+              <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="http://pylonsproject.org">Pylons Project</a></li>
+          </div>
         </div>
-        <div id="right" class="align-left">
-          <h2>Pyramid links</h2>
-          <ul class="links">
-            <li>
-              <a href="http://pylonsproject.org">Pylons Website</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#narrative-documentation">Narrative Documentation</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#reference-material">API Documentation</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#tutorials">Tutorials</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#detailed-change-history">Change History</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#sample-applications">Sample Applications</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#support-and-development">Support and Development</a>
-            </li>
-            <li>
-              <a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
-            </li>
-            </ul>
+        <div class="row">
+          <div class="copyright">
+            Copyright © Pylons Project
+          </div>
         </div>
       </div>
     </div>
-  </div>
-</body>
+
+
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="//oss.maxcdn.com/libs/jquery/1.10.2/jquery.min.js"></script>
+    <script src="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/js/bootstrap.min.js"></script>
+  </body>
 </html>
-- 
cgit v1.2.3


From 2abf2d04a0fb5dd79eee76c0677b175d0310a388 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 3 Jan 2014 22:57:25 -0500
Subject: fixed package ref

---
 pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
index 1c2771a0d..f64083aff 100644
--- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="pyramid web application">
     <meta name="author" content="Pylons Project">
-    <link rel="shortcut icon" href="${request.static_url('pst:static/pyramid-16x16.png')}">
+    <link rel="shortcut icon" href="${request.static_url('{{package}}:static/pyramid-16x16.png')}">
 
     <title>Starter Template for The Pyramid Web Framework</title>
 
@@ -14,7 +14,7 @@
     <link href="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
-    <link href="${request.static_url('pst:static/theme.css')}" rel="stylesheet">
+    <link href="${request.static_url('{{package}}:static/theme.css')}" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -29,7 +29,7 @@
       <div class="container">
         <div class="row">
           <div class="col-md-2">
-            <img class="logo img-responsive" src="${request.static_url('pst:static/pyramid.png')}" alt="pyramid web framework">
+            <img class="logo img-responsive" src="${request.static_url('{{package}}:static/pyramid.png')}" alt="pyramid web framework">
           </div>
           <div class="col-md-10">
             <div class="content">
-- 
cgit v1.2.3


From cdbef974f30f4f4b002ad42711f0153c98cfb0f5 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 3 Jan 2014 23:04:10 -0500
Subject: fixed zodb template package ref

---
 .../zodb/+package+/templates/mytemplate.pt         | 66 ----------------------
 .../zodb/+package+/templates/mytemplate.pt_tmpl    | 66 ++++++++++++++++++++++
 2 files changed, 66 insertions(+), 66 deletions(-)
 delete mode 100644 pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt
 create mode 100644 pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl

diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt
deleted file mode 100644
index 1c2771a0d..000000000
--- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html lang="${request.locale_name}">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="pyramid web application">
-    <meta name="author" content="Pylons Project">
-    <link rel="shortcut icon" href="${request.static_url('pst:static/pyramid-16x16.png')}">
-
-    <title>Starter Template for The Pyramid Web Framework</title>
-
-    <!-- Bootstrap core CSS -->
-    <link href="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- Custom styles for this template -->
-    <link href="${request.static_url('pst:static/theme.css')}" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!--[if lt IE 9]>
-      <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-      <script src="//oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
-    <![endif]-->
-  </head>
-
-  <body>
-
-    <div class="starter-template">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-2">
-            <img class="logo img-responsive" src="${request.static_url('pst:static/pyramid.png')}" alt="pyramid web framework">
-          </div>
-          <div class="col-md-10">
-            <div class="content">
-              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">starter template</span></h1>
-              <p class="lead">Welcome to <span class="font-normal">${project}</span>, an&nbsp;application generated&nbsp;by<br>the <span class="font-normal">Pyramid Web Framework</span>.</p>
-            </div>
-          </div>
-        </div>
-        <div class="row">
-          <div class="links">
-            <ul>
-              <li class="current-version">Currently vX.X</li>
-              <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org">Docs</a></li>
-              <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li>
-              <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li>
-              <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="http://pylonsproject.org">Pylons Project</a></li>
-          </div>
-        </div>
-        <div class="row">
-          <div class="copyright">
-            Copyright © Pylons Project
-          </div>
-        </div>
-      </div>
-    </div>
-
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="//oss.maxcdn.com/libs/jquery/1.10.2/jquery.min.js"></script>
-    <script src="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
new file mode 100644
index 000000000..f64083aff
--- /dev/null
+++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html lang="${request.locale_name}">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="pyramid web application">
+    <meta name="author" content="Pylons Project">
+    <link rel="shortcut icon" href="${request.static_url('{{package}}:static/pyramid-16x16.png')}">
+
+    <title>Starter Template for The Pyramid Web Framework</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="${request.static_url('{{package}}:static/theme.css')}" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+      <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+      <script src="//oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+    <![endif]-->
+  </head>
+
+  <body>
+
+    <div class="starter-template">
+      <div class="container">
+        <div class="row">
+          <div class="col-md-2">
+            <img class="logo img-responsive" src="${request.static_url('{{package}}:static/pyramid.png')}" alt="pyramid web framework">
+          </div>
+          <div class="col-md-10">
+            <div class="content">
+              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">starter template</span></h1>
+              <p class="lead">Welcome to <span class="font-normal">${project}</span>, an&nbsp;application generated&nbsp;by<br>the <span class="font-normal">Pyramid Web Framework</span>.</p>
+            </div>
+          </div>
+        </div>
+        <div class="row">
+          <div class="links">
+            <ul>
+              <li class="current-version">Currently vX.X</li>
+              <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org">Docs</a></li>
+              <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li>
+              <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li>
+              <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="http://pylonsproject.org">Pylons Project</a></li>
+          </div>
+        </div>
+        <div class="row">
+          <div class="copyright">
+            Copyright © Pylons Project
+          </div>
+        </div>
+      </div>
+    </div>
+
+
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="//oss.maxcdn.com/libs/jquery/1.10.2/jquery.min.js"></script>
+    <script src="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/js/bootstrap.min.js"></script>
+  </body>
+</html>
-- 
cgit v1.2.3


From 590bf52b30e820aad169b2848b6ae1a27d6d2c61 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 3 Jan 2014 23:04:22 -0500
Subject: fixed starter template package ref

---
 .../starter/+package+/templates/mytemplate.pt      | 66 ----------------------
 .../starter/+package+/templates/mytemplate.pt_tmpl | 66 ++++++++++++++++++++++
 2 files changed, 66 insertions(+), 66 deletions(-)
 delete mode 100644 pyramid/scaffolds/starter/+package+/templates/mytemplate.pt
 create mode 100644 pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl

diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt
deleted file mode 100644
index 1c2771a0d..000000000
--- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html lang="${request.locale_name}">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="pyramid web application">
-    <meta name="author" content="Pylons Project">
-    <link rel="shortcut icon" href="${request.static_url('pst:static/pyramid-16x16.png')}">
-
-    <title>Starter Template for The Pyramid Web Framework</title>
-
-    <!-- Bootstrap core CSS -->
-    <link href="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- Custom styles for this template -->
-    <link href="${request.static_url('pst:static/theme.css')}" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!--[if lt IE 9]>
-      <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-      <script src="//oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
-    <![endif]-->
-  </head>
-
-  <body>
-
-    <div class="starter-template">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-2">
-            <img class="logo img-responsive" src="${request.static_url('pst:static/pyramid.png')}" alt="pyramid web framework">
-          </div>
-          <div class="col-md-10">
-            <div class="content">
-              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">starter template</span></h1>
-              <p class="lead">Welcome to <span class="font-normal">${project}</span>, an&nbsp;application generated&nbsp;by<br>the <span class="font-normal">Pyramid Web Framework</span>.</p>
-            </div>
-          </div>
-        </div>
-        <div class="row">
-          <div class="links">
-            <ul>
-              <li class="current-version">Currently vX.X</li>
-              <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org">Docs</a></li>
-              <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li>
-              <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li>
-              <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="http://pylonsproject.org">Pylons Project</a></li>
-          </div>
-        </div>
-        <div class="row">
-          <div class="copyright">
-            Copyright © Pylons Project
-          </div>
-        </div>
-      </div>
-    </div>
-
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="//oss.maxcdn.com/libs/jquery/1.10.2/jquery.min.js"></script>
-    <script src="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
new file mode 100644
index 000000000..f64083aff
--- /dev/null
+++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html lang="${request.locale_name}">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="pyramid web application">
+    <meta name="author" content="Pylons Project">
+    <link rel="shortcut icon" href="${request.static_url('{{package}}:static/pyramid-16x16.png')}">
+
+    <title>Starter Template for The Pyramid Web Framework</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="${request.static_url('{{package}}:static/theme.css')}" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+      <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+      <script src="//oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+    <![endif]-->
+  </head>
+
+  <body>
+
+    <div class="starter-template">
+      <div class="container">
+        <div class="row">
+          <div class="col-md-2">
+            <img class="logo img-responsive" src="${request.static_url('{{package}}:static/pyramid.png')}" alt="pyramid web framework">
+          </div>
+          <div class="col-md-10">
+            <div class="content">
+              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">starter template</span></h1>
+              <p class="lead">Welcome to <span class="font-normal">${project}</span>, an&nbsp;application generated&nbsp;by<br>the <span class="font-normal">Pyramid Web Framework</span>.</p>
+            </div>
+          </div>
+        </div>
+        <div class="row">
+          <div class="links">
+            <ul>
+              <li class="current-version">Currently vX.X</li>
+              <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org">Docs</a></li>
+              <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li>
+              <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li>
+              <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="http://pylonsproject.org">Pylons Project</a></li>
+          </div>
+        </div>
+        <div class="row">
+          <div class="copyright">
+            Copyright © Pylons Project
+          </div>
+        </div>
+      </div>
+    </div>
+
+
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="//oss.maxcdn.com/libs/jquery/1.10.2/jquery.min.js"></script>
+    <script src="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/js/bootstrap.min.js"></script>
+  </body>
+</html>
-- 
cgit v1.2.3


From 2c81fcfd67304ed353b212b4492f3473e9dcd61a Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 3 Jan 2014 23:08:05 -0500
Subject: updated version in scaffolds

---
 pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl | 2 +-
 pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl | 2 +-
 pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
index f64083aff..76451f9b5 100644
--- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
@@ -41,7 +41,7 @@
         <div class="row">
           <div class="links">
             <ul>
-              <li class="current-version">Currently vX.X</li>
+              <li class="current-version">Currently v1.5</li>
               <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org">Docs</a></li>
               <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li>
               <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li>
diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
index f64083aff..76451f9b5 100644
--- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
@@ -41,7 +41,7 @@
         <div class="row">
           <div class="links">
             <ul>
-              <li class="current-version">Currently vX.X</li>
+              <li class="current-version">Currently v1.5</li>
               <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org">Docs</a></li>
               <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li>
               <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li>
diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
index f64083aff..76451f9b5 100644
--- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
@@ -41,7 +41,7 @@
         <div class="row">
           <div class="links">
             <ul>
-              <li class="current-version">Currently vX.X</li>
+              <li class="current-version">Currently v1.5</li>
               <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org">Docs</a></li>
               <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li>
               <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li>
-- 
cgit v1.2.3


From 41cd98df2eea454a43af37cc2cf070a2ea275af9 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 3 Jan 2014 23:18:40 -0500
Subject: changed project image refs

---
 docs/narr/project-debug.png | Bin 153807 -> 106878 bytes
 docs/narr/project.png       | Bin 128727 -> 91662 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/narr/project-debug.png b/docs/narr/project-debug.png
index d13a91736..4f8e441ef 100644
Binary files a/docs/narr/project-debug.png and b/docs/narr/project-debug.png differ
diff --git a/docs/narr/project.png b/docs/narr/project.png
index fc00ec086..5d46df0dd 100644
Binary files a/docs/narr/project.png and b/docs/narr/project.png differ
-- 
cgit v1.2.3


From 59882984b368f8e0c81411283a121359083099e0 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 3 Jan 2014 23:29:35 -0500
Subject: updated myproject docs

---
 docs/narr/project.rst | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index d7292d187..f1bee9efd 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -487,23 +487,24 @@ structure:
 .. code-block:: text
 
   MyProject/
-  |-- CHANGES.txt
-  |-- development.ini
-  |-- MANIFEST.in
-  |-- myproject
-  |   |-- __init__.py
-  |   |-- static
-  |   |   |-- favicon.ico
-  |   |   |-- logo.png
-  |   |   `-- pylons.css
-  |   |-- templates
-  |   |   `-- mytemplate.pt
-  |   |-- tests.py
-  |   `-- views.py
-  |-- production.ini
-  |-- README.txt
-  |-- setup.cfg
-  `-- setup.py
+  ├── CHANGES.txt
+  ├── MANIFEST.in
+  ├── README.txt
+  ├── development.ini
+  ├── myproject
+  │   ├── __init__.py
+  │   ├── static
+  │   │   ├── pyramid-16x16.png
+  │   │   ├── pyramid.png
+  │   │   ├── theme.css
+  │   │   └── theme.min.css
+  │   ├── templates
+  │   │   └── mytemplate.pt
+  │   ├── tests.py
+  │   └── views.py
+  ├── production.ini
+  ├── setup.cfg
+  └── setup.py
 
 The ``MyProject`` :term:`Project`
 ---------------------------------
-- 
cgit v1.2.3


From 7bffb5889cddec7ed8eea505004c30d01513c767 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 3 Jan 2014 23:29:50 -0500
Subject: modified MyProject src

---
 docs/narr/MyProject/development.ini                |  22 +-
 docs/narr/MyProject/myproject/static/favicon.ico   | Bin 1406 -> 0 bytes
 docs/narr/MyProject/myproject/static/footerbg.png  | Bin 333 -> 0 bytes
 docs/narr/MyProject/myproject/static/headerbg.png  | Bin 203 -> 0 bytes
 docs/narr/MyProject/myproject/static/ie6.css       |   8 -
 docs/narr/MyProject/myproject/static/middlebg.png  | Bin 2797 -> 0 bytes
 docs/narr/MyProject/myproject/static/pylons.css    | 372 ---------------------
 .../MyProject/myproject/static/pyramid-16x16.png   | Bin 0 -> 1319 bytes
 .../MyProject/myproject/static/pyramid-small.png   | Bin 7044 -> 0 bytes
 docs/narr/MyProject/myproject/static/pyramid.png   | Bin 33055 -> 12901 bytes
 docs/narr/MyProject/myproject/static/theme.css     | 152 +++++++++
 docs/narr/MyProject/myproject/static/theme.min.css |   1 +
 .../MyProject/myproject/static/transparent.gif     | Bin 49 -> 0 bytes
 .../MyProject/myproject/templates/mytemplate.pt    | 132 ++++----
 docs/narr/MyProject/production.ini                 |  16 +-
 docs/narr/MyProject/setup.py                       |   1 -
 16 files changed, 245 insertions(+), 459 deletions(-)
 delete mode 100644 docs/narr/MyProject/myproject/static/favicon.ico
 delete mode 100644 docs/narr/MyProject/myproject/static/footerbg.png
 delete mode 100644 docs/narr/MyProject/myproject/static/headerbg.png
 delete mode 100644 docs/narr/MyProject/myproject/static/ie6.css
 delete mode 100644 docs/narr/MyProject/myproject/static/middlebg.png
 delete mode 100644 docs/narr/MyProject/myproject/static/pylons.css
 create mode 100644 docs/narr/MyProject/myproject/static/pyramid-16x16.png
 delete mode 100644 docs/narr/MyProject/myproject/static/pyramid-small.png
 create mode 100644 docs/narr/MyProject/myproject/static/theme.css
 create mode 100644 docs/narr/MyProject/myproject/static/theme.min.css
 delete mode 100644 docs/narr/MyProject/myproject/static/transparent.gif

diff --git a/docs/narr/MyProject/development.ini b/docs/narr/MyProject/development.ini
index 84e08c2d0..a9a26e56b 100644
--- a/docs/narr/MyProject/development.ini
+++ b/docs/narr/MyProject/development.ini
@@ -1,3 +1,8 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:MyProject
 
@@ -6,15 +11,26 @@ pyramid.debug_authorization = false
 pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.default_locale_name = en
-pyramid.includes =
+pyramid.includes = 
     pyramid_debugtoolbar
 
+# By default, the toolbar only appears for clients from IP addresses
+# '127.0.0.1' and '::1'.
+# debugtoolbar.hosts = 127.0.0.1 ::1
+
+###
+# wsgi server configuration
+###
+
 [server:main]
 use = egg:waitress#main
 host = 0.0.0.0
 port = 6543
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
 keys = root, myproject
@@ -42,5 +58,3 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/narr/MyProject/myproject/static/favicon.ico b/docs/narr/MyProject/myproject/static/favicon.ico
deleted file mode 100644
index 71f837c9e..000000000
Binary files a/docs/narr/MyProject/myproject/static/favicon.ico and /dev/null differ
diff --git a/docs/narr/MyProject/myproject/static/footerbg.png b/docs/narr/MyProject/myproject/static/footerbg.png
deleted file mode 100644
index 1fbc873da..000000000
Binary files a/docs/narr/MyProject/myproject/static/footerbg.png and /dev/null differ
diff --git a/docs/narr/MyProject/myproject/static/headerbg.png b/docs/narr/MyProject/myproject/static/headerbg.png
deleted file mode 100644
index 0596f2020..000000000
Binary files a/docs/narr/MyProject/myproject/static/headerbg.png and /dev/null differ
diff --git a/docs/narr/MyProject/myproject/static/ie6.css b/docs/narr/MyProject/myproject/static/ie6.css
deleted file mode 100644
index b7c8493d8..000000000
--- a/docs/narr/MyProject/myproject/static/ie6.css
+++ /dev/null
@@ -1,8 +0,0 @@
-* html img,
-* html .png{position:relative;behavior:expression((this.runtimeStyle.behavior="none")&&(this.pngSet?this.pngSet=true:(this.nodeName == "IMG" && this.src.toLowerCase().indexOf('.png')>-1?(this.runtimeStyle.backgroundImage = "none",
-this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.src + "',sizingMethod='image')",
-this.src = "static/transparent.gif"):(this.origBg = this.origBg? this.origBg :this.currentStyle.backgroundImage.toString().replace('url("','').replace('")',''),
-this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.origBg + "',sizingMethod='crop')",
-this.runtimeStyle.backgroundImage = "none")),this.pngSet=true)
-);}
-#wrap{display:table;height:100%}
diff --git a/docs/narr/MyProject/myproject/static/middlebg.png b/docs/narr/MyProject/myproject/static/middlebg.png
deleted file mode 100644
index 2369cfb7d..000000000
Binary files a/docs/narr/MyProject/myproject/static/middlebg.png and /dev/null differ
diff --git a/docs/narr/MyProject/myproject/static/pylons.css b/docs/narr/MyProject/myproject/static/pylons.css
deleted file mode 100644
index 4b1c017cd..000000000
--- a/docs/narr/MyProject/myproject/static/pylons.css
+++ /dev/null
@@ -1,372 +0,0 @@
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td
-{
-  margin: 0;
-  padding: 0;
-  border: 0;
-  outline: 0;
-  font-size: 100%; /* 16px */
-  vertical-align: baseline;
-  background: transparent;
-}
-
-body
-{
-  line-height: 1;
-}
-
-ol, ul
-{
-  list-style: none;
-}
-
-blockquote, q
-{
-  quotes: none;
-}
-
-blockquote:before, blockquote:after, q:before, q:after
-{
-  content: '';
-  content: none;
-}
-
-:focus
-{
-  outline: 0;
-}
-
-ins
-{
-  text-decoration: none;
-}
-
-del
-{
-  text-decoration: line-through;
-}
-
-table
-{
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-sub
-{
-  vertical-align: sub;
-  font-size: smaller;
-  line-height: normal;
-}
-
-sup
-{
-  vertical-align: super;
-  font-size: smaller;
-  line-height: normal;
-}
-
-ul, menu, dir
-{
-  display: block;
-  list-style-type: disc;
-  margin: 1em 0;
-  padding-left: 40px;
-}
-
-ol
-{
-  display: block;
-  list-style-type: decimal-leading-zero;
-  margin: 1em 0;
-  padding-left: 40px;
-}
-
-li
-{
-  display: list-item;
-}
-
-ul ul, ul ol, ul dir, ul menu, ul dl, ol ul, ol ol, ol dir, ol menu, ol dl, dir ul, dir ol, dir dir, dir menu, dir dl, menu ul, menu ol, menu dir, menu menu, menu dl, dl ul, dl ol, dl dir, dl menu, dl dl
-{
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-ol ul, ul ul, menu ul, dir ul, ol menu, ul menu, menu menu, dir menu, ol dir, ul dir, menu dir, dir dir
-{
-  list-style-type: circle;
-}
-
-ol ol ul, ol ul ul, ol menu ul, ol dir ul, ol ol menu, ol ul menu, ol menu menu, ol dir menu, ol ol dir, ol ul dir, ol menu dir, ol dir dir, ul ol ul, ul ul ul, ul menu ul, ul dir ul, ul ol menu, ul ul menu, ul menu menu, ul dir menu, ul ol dir, ul ul dir, ul menu dir, ul dir dir, menu ol ul, menu ul ul, menu menu ul, menu dir ul, menu ol menu, menu ul menu, menu menu menu, menu dir menu, menu ol dir, menu ul dir, menu menu dir, menu dir dir, dir ol ul, dir ul ul, dir menu ul, dir dir ul, dir ol menu, dir ul menu, dir menu menu, dir dir menu, dir ol dir, dir ul dir, dir menu dir, dir dir dir
-{
-  list-style-type: square;
-}
-
-.hidden
-{
-  display: none;
-}
-
-p
-{
-  line-height: 1.5em;
-}
-
-h1
-{
-  font-size: 1.75em;
-  line-height: 1.7em;
-  font-family: helvetica, verdana;
-}
-
-h2
-{
-  font-size: 1.5em;
-  line-height: 1.7em;
-  font-family: helvetica, verdana;
-}
-
-h3
-{
-  font-size: 1.25em;
-  line-height: 1.7em;
-  font-family: helvetica, verdana;
-}
-
-h4
-{
-  font-size: 1em;
-  line-height: 1.7em;
-  font-family: helvetica, verdana;
-}
-
-html, body
-{
-  width: 100%;
-  height: 100%;
-}
-
-body
-{
-  margin: 0;
-  padding: 0;
-  background-color: #fff;
-  position: relative;
-  font: 16px/24px NobileRegular, "Lucida Grande", Lucida, Verdana, sans-serif;
-}
-
-a
-{
-  color: #1b61d6;
-  text-decoration: none;
-}
-
-a:hover
-{
-  color: #e88f00;
-  text-decoration: underline;
-}
-
-body h1, body h2, body h3, body h4, body h5, body h6
-{
-  font-family: NeutonRegular, "Lucida Grande", Lucida, Verdana, sans-serif;
-  font-weight: 400;
-  color: #373839;
-  font-style: normal;
-}
-
-#wrap
-{
-  min-height: 100%;
-}
-
-#header, #footer
-{
-  width: 100%;
-  color: #fff;
-  height: 40px;
-  position: absolute;
-  text-align: center;
-  line-height: 40px;
-  overflow: hidden;
-  font-size: 12px;
-  vertical-align: middle;
-}
-
-#header
-{
-  background: #000;
-  top: 0;
-  font-size: 14px;
-}
-
-#footer
-{
-  bottom: 0;
-  background: #000 url(footerbg.png) repeat-x 0 top;
-  position: relative;
-  margin-top: -40px;
-  clear: both;
-}
-
-.header, .footer
-{
-  width: 750px;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-.wrapper
-{
-  width: 100%;
-}
-
-#top, #top-small, #bottom
-{
-  width: 100%;
-}
-
-#top
-{
-  color: #000;
-  height: 230px;
-  background: #fff url(headerbg.png) repeat-x 0 top;
-  position: relative;
-}
-
-#top-small
-{
-  color: #000;
-  height: 60px;
-  background: #fff url(headerbg.png) repeat-x 0 top;
-  position: relative;
-}
-
-#bottom
-{
-  color: #222;
-  background-color: #fff;
-}
-
-.top, .top-small, .middle, .bottom
-{
-  width: 750px;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-.top
-{
-  padding-top: 40px;
-}
-
-.top-small
-{
-  padding-top: 10px;
-}
-
-#middle
-{
-  width: 100%;
-  height: 100px;
-  background: url(middlebg.png) repeat-x;
-  border-top: 2px solid #fff;
-  border-bottom: 2px solid #b2b2b2;
-}
-
-.app-welcome
-{
-  margin-top: 25px;
-}
-
-.app-name
-{
-  color: #000;
-  font-weight: 700;
-}
-
-.bottom
-{
-  padding-top: 50px;
-}
-
-#left
-{
-  width: 350px;
-  float: left;
-  padding-right: 25px;
-}
-
-#right
-{
-  width: 350px;
-  float: right;
-  padding-left: 25px;
-}
-
-.align-left
-{
-  text-align: left;
-}
-
-.align-right
-{
-  text-align: right;
-}
-
-.align-center
-{
-  text-align: center;
-}
-
-ul.links
-{
-  margin: 0;
-  padding: 0;
-}
-
-ul.links li
-{
-  list-style-type: none;
-  font-size: 14px;
-}
-
-form
-{
-  border-style: none;
-}
-
-fieldset
-{
-  border-style: none;
-}
-
-input
-{
-  color: #222;
-  border: 1px solid #ccc;
-  font-family: sans-serif;
-  font-size: 12px;
-  line-height: 16px;
-}
-
-input[type=text], input[type=password]
-{
-  width: 205px;
-}
-
-input[type=submit]
-{
-  background-color: #ddd;
-  font-weight: 700;
-}
-
-/*Opera Fix*/
-body:before
-{
-  content: "";
-  height: 100%;
-  float: left;
-  width: 0;
-  margin-top: -32767px;
-}
diff --git a/docs/narr/MyProject/myproject/static/pyramid-16x16.png b/docs/narr/MyProject/myproject/static/pyramid-16x16.png
new file mode 100644
index 000000000..979203112
Binary files /dev/null and b/docs/narr/MyProject/myproject/static/pyramid-16x16.png differ
diff --git a/docs/narr/MyProject/myproject/static/pyramid-small.png b/docs/narr/MyProject/myproject/static/pyramid-small.png
deleted file mode 100644
index a5bc0ade7..000000000
Binary files a/docs/narr/MyProject/myproject/static/pyramid-small.png and /dev/null differ
diff --git a/docs/narr/MyProject/myproject/static/pyramid.png b/docs/narr/MyProject/myproject/static/pyramid.png
index 347e05549..4ab837be9 100644
Binary files a/docs/narr/MyProject/myproject/static/pyramid.png and b/docs/narr/MyProject/myproject/static/pyramid.png differ
diff --git a/docs/narr/MyProject/myproject/static/theme.css b/docs/narr/MyProject/myproject/static/theme.css
new file mode 100644
index 000000000..be50ad420
--- /dev/null
+++ b/docs/narr/MyProject/myproject/static/theme.css
@@ -0,0 +1,152 @@
+@import url(//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700);
+body {
+  font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: 300;
+  color: #ffffff;
+  background: #bc2131;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: 300;
+}
+p {
+  font-weight: 300;
+}
+.font-normal {
+  font-weight: 400;
+}
+.font-semi-bold {
+  font-weight: 600;
+}
+.font-bold {
+  font-weight: 700;
+}
+.starter-template {
+  margin-top: 250px;
+}
+.starter-template .content {
+  margin-left: 10px;
+}
+.starter-template .content h1 {
+  margin-top: 10px;
+  font-size: 60px;
+}
+.starter-template .content h1 .smaller {
+  font-size: 40px;
+  color: #f2b7bd;
+}
+.starter-template .content .lead {
+  font-size: 25px;
+  color: #f2b7bd;
+}
+.starter-template .content .lead .font-normal {
+  color: #ffffff;
+}
+.starter-template .links {
+  float: right;
+  right: 0;
+  margin-top: 125px;
+}
+.starter-template .links ul {
+  display: block;
+  padding: 0;
+  margin: 0;
+}
+.starter-template .links ul li {
+  list-style: none;
+  display: inline;
+  margin: 0 10px;
+}
+.starter-template .links ul li:first-child {
+  margin-left: 0;
+}
+.starter-template .links ul li:last-child {
+  margin-right: 0;
+}
+.starter-template .links ul li.current-version {
+  color: #f2b7bd;
+  font-weight: 400;
+}
+.starter-template .links ul li a {
+  color: #ffffff;
+}
+.starter-template .links ul li a:hover {
+  text-decoration: underline;
+}
+.starter-template .links ul li .icon-muted {
+  color: #eb8b95;
+  margin-right: 5px;
+}
+.starter-template .links ul li:hover .icon-muted {
+  color: #ffffff;
+}
+.starter-template .copyright {
+  margin-top: 10px;
+  font-size: 0.9em;
+  color: #f2b7bd;
+  text-transform: lowercase;
+  float: right;
+  right: 0;
+}
+@media (max-width: 1199px) {
+  .starter-template .content h1 {
+    font-size: 45px;
+  }
+  .starter-template .content h1 .smaller {
+    font-size: 30px;
+  }
+  .starter-template .content .lead {
+    font-size: 20px;
+  }
+}
+@media (max-width: 991px) {
+  .starter-template {
+    margin-top: 0;
+  }
+  .starter-template .logo {
+    margin: 40px auto;
+  }
+  .starter-template .content {
+    margin-left: 0;
+    text-align: center;
+  }
+  .starter-template .content h1 {
+    margin-bottom: 20px;
+  }
+  .starter-template .links {
+    float: none;
+    text-align: center;
+    margin-top: 60px;
+  }
+  .starter-template .copyright {
+    float: none;
+    text-align: center;
+  }
+}
+@media (max-width: 767px) {
+  .starter-template .content h1 .smaller {
+    font-size: 25px;
+    display: block;
+  }
+  .starter-template .content .lead {
+    font-size: 16px;
+  }
+  .starter-template .links {
+    margin-top: 40px;
+  }
+  .starter-template .links ul li {
+    display: block;
+    margin: 0;
+  }
+  .starter-template .links ul li .icon-muted {
+    display: none;
+  }
+  .starter-template .copyright {
+    margin-top: 20px;
+  }
+}
diff --git a/docs/narr/MyProject/myproject/static/theme.min.css b/docs/narr/MyProject/myproject/static/theme.min.css
new file mode 100644
index 000000000..2f924bcc5
--- /dev/null
+++ b/docs/narr/MyProject/myproject/static/theme.min.css
@@ -0,0 +1 @@
+@import url(//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700);body{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:300;color:#fff;background:#bc2131}h1,h2,h3,h4,h5,h6{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:300}p{font-weight:300}.font-normal{font-weight:400}.font-semi-bold{font-weight:600}.font-bold{font-weight:700}.starter-template{margin-top:250px}.starter-template .content{margin-left:10px}.starter-template .content h1{margin-top:10px;font-size:60px}.starter-template .content h1 .smaller{font-size:40px;color:#f2b7bd}.starter-template .content .lead{font-size:25px;color:#f2b7bd}.starter-template .content .lead .font-normal{color:#fff}.starter-template .links{float:right;right:0;margin-top:125px}.starter-template .links ul{display:block;padding:0;margin:0}.starter-template .links ul li{list-style:none;display:inline;margin:0 10px}.starter-template .links ul li:first-child{margin-left:0}.starter-template .links ul li:last-child{margin-right:0}.starter-template .links ul li.current-version{color:#f2b7bd;font-weight:400}.starter-template .links ul li a{color:#fff}.starter-template .links ul li a:hover{text-decoration:underline}.starter-template .links ul li .icon-muted{color:#eb8b95;margin-right:5px}.starter-template .links ul li:hover .icon-muted{color:#fff}.starter-template .copyright{margin-top:10px;font-size:.9em;color:#f2b7bd;text-transform:lowercase;float:right;right:0}@media (max-width:1199px){.starter-template .content h1{font-size:45px}.starter-template .content h1 .smaller{font-size:30px}.starter-template .content .lead{font-size:20px}}@media (max-width:991px){.starter-template{margin-top:0}.starter-template .logo{margin:40px auto}.starter-template .content{margin-left:0;text-align:center}.starter-template .content h1{margin-bottom:20px}.starter-template .links{float:none;text-align:center;margin-top:60px}.starter-template .copyright{float:none;text-align:center}}@media (max-width:767px){.starter-template .content h1 .smaller{font-size:25px;display:block}.starter-template .content .lead{font-size:16px}.starter-template .links{margin-top:40px}.starter-template .links ul li{display:block;margin:0}.starter-template .links ul li .icon-muted{display:none}.starter-template .copyright{margin-top:20px}}
\ No newline at end of file
diff --git a/docs/narr/MyProject/myproject/static/transparent.gif b/docs/narr/MyProject/myproject/static/transparent.gif
deleted file mode 100644
index 0341802e5..000000000
Binary files a/docs/narr/MyProject/myproject/static/transparent.gif and /dev/null differ
diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt
index 0fccba624..d1af4f42c 100644
--- a/docs/narr/MyProject/myproject/templates/mytemplate.pt
+++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt
@@ -1,76 +1,66 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
-<head>
-  <title>The Pyramid Web Framework</title>
-  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-  <meta name="keywords" content="python web application" />
-  <meta name="description" content="pyramid web application" />
-  <link rel="shortcut icon" href="/static/favicon.ico" />
-  <link rel="stylesheet" href="/static/pylons.css" type="text/css" media="screen" charset="utf-8" />
-  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/nobile/stylesheet.css" media="screen" />
-  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/neuton/stylesheet.css" media="screen" />
-  <!--[if lte IE 6]>
-  <link rel="stylesheet" href="/static/ie6.css" type="text/css" media="screen" charset="utf-8" />
-  <![endif]-->
-</head>
-<body>
-  <div id="wrap">
-    <div id="top">
-      <div class="top align-center">
-        <div><img src="/static/pyramid.png" width="750" height="169" alt="pyramid"/></div>
-      </div>
-    </div>
-    <div id="middle">
-      <div class="middle align-center">
-        <p class="app-welcome">
-          Welcome to <span class="app-name">${project}</span>, an application generated by<br/>
-          the Pyramid Web Framework.
-        </p>
-      </div>
-    </div>
-    <div id="bottom">
-      <div class="bottom">
-        <div id="left" class="align-right">
-          <h2>Search documentation</h2>
-          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/current/search.html">
-                <input type="text" id="q" name="q" value="" />
-                <input type="submit" id="x" value="Go" />
-            </form>
+<!DOCTYPE html>
+<html lang="${request.locale_name}">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="pyramid web application">
+    <meta name="author" content="Pylons Project">
+    <link rel="shortcut icon" href="${request.static_url('myproject:static/pyramid-16x16.png')}">
+
+    <title>Starter Template for The Pyramid Web Framework</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="${request.static_url('myproject:static/theme.css')}" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+      <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+      <script src="//oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+    <![endif]-->
+  </head>
+
+  <body>
+
+    <div class="starter-template">
+      <div class="container">
+        <div class="row">
+          <div class="col-md-2">
+            <img class="logo img-responsive" src="${request.static_url('myproject:static/pyramid.png')}" alt="pyramid web framework">
+          </div>
+          <div class="col-md-10">
+            <div class="content">
+              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">starter template</span></h1>
+              <p class="lead">Welcome to <span class="font-normal">${project}</span>, an&nbsp;application generated&nbsp;by<br>the <span class="font-normal">Pyramid Web Framework</span>.</p>
+            </div>
+          </div>
+        </div>
+        <div class="row">
+          <div class="links">
+            <ul>
+              <li class="current-version">Currently v1.5</li>
+              <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org">Docs</a></li>
+              <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li>
+              <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li>
+              <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="http://pylonsproject.org">Pylons Project</a></li>
+          </div>
         </div>
-        <div id="right" class="align-left">
-          <h2>Pyramid links</h2>
-          <ul class="links">
-            <li>
-              <a href="http://pylonsproject.org">Pylons Website</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.3-branch/#narrative-documentation">Narrative Documentation</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.3-branch/#reference-material">API Documentation</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.3-branch/#tutorials">Tutorials</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.3-branch/#detailed-change-history">Change History</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.3-branch/#sample-applications">Sample Applications</a>
-            </li>
-            <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.3-branch/#support-and-development">Support and Development</a>
-            </li>
-            <li>
-              <a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
-            </li>
-            </ul>
+        <div class="row">
+          <div class="copyright">
+            Copyright © Pylons Project
+          </div>
         </div>
       </div>
     </div>
-  </div>
-  <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-  </div>
-</body>
+
+
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="//oss.maxcdn.com/libs/jquery/1.10.2/jquery.min.js"></script>
+    <script src="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/js/bootstrap.min.js"></script>
+  </body>
 </html>
diff --git a/docs/narr/MyProject/production.ini b/docs/narr/MyProject/production.ini
index 3396125f2..9eae9e03f 100644
--- a/docs/narr/MyProject/production.ini
+++ b/docs/narr/MyProject/production.ini
@@ -1,3 +1,8 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:MyProject
 
@@ -7,12 +12,19 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.default_locale_name = en
 
+###
+# wsgi server configuration
+###
+
 [server:main]
 use = egg:waitress#main
 host = 0.0.0.0
 port = 6543
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
 keys = root, myproject
@@ -40,5 +52,3 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/narr/MyProject/setup.py b/docs/narr/MyProject/setup.py
index a23f46c91..8c019af51 100644
--- a/docs/narr/MyProject/setup.py
+++ b/docs/narr/MyProject/setup.py
@@ -40,4 +40,3 @@ setup(name='MyProject',
       main = myproject:main
       """,
       )
-
-- 
cgit v1.2.3


From 4803666d788c7416fbfba93a967ed9290d366bf2 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 3 Jan 2014 23:32:28 -0500
Subject: updated changes

---
 CHANGES.txt | 103 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 54 insertions(+), 49 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9d877c0ac..9c38bf814 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Next release
 ============
 
+Features
+--------
+
+- Updated scaffolds with new theme, fixed documentation and sample project.
+
 Bug Fixes
 ---------
 
@@ -86,14 +91,14 @@ Features
 Bug Fixes
 ---------
 
-- Fix the ``pcreate`` script so that when the target directory name ends with a 
-  slash it does not produce a non-working project directory structure.  
-  Previously saying ``pcreate -s starter /foo/bar/`` produced different output 
+- Fix the ``pcreate`` script so that when the target directory name ends with a
+  slash it does not produce a non-working project directory structure.
+  Previously saying ``pcreate -s starter /foo/bar/`` produced different output
   than  saying ``pcreate -s starter /foo/bar``.  The former did not work
   properly.
 
-- Fix the ``principals_allowed_by_permission`` method of 
-  ``ACLAuthorizationPolicy`` so it anticipates a callable ``__acl__`` 
+- Fix the ``principals_allowed_by_permission`` method of
+  ``ACLAuthorizationPolicy`` so it anticipates a callable ``__acl__``
   on resources.  Previously it did not try to call the ``__acl__``
   if it was callable.
 
@@ -120,7 +125,7 @@ Documentation
 
 - Added a "Quick Tutorial" to go with the Quick Tour
 
-- Removed mention of ``pyramid_beaker`` from docs.  Beaker is no longer 
+- Removed mention of ``pyramid_beaker`` from docs.  Beaker is no longer
   maintained.  Point people at ``pyramid_redis_sessions`` instead.
 
 - Add documentation for ``pyramid.interfaces.IRendererFactory`` and
@@ -143,12 +148,12 @@ Deprecations
   ill-defined and became unused when Mako and Chameleon template bindings were
   split into their own packages.
 
-- The ``pyramid.session.UnencryptedCookieSessionFactoryConfig`` API has been 
-  deprecated and is superseded by the 
+- The ``pyramid.session.UnencryptedCookieSessionFactoryConfig`` API has been
+  deprecated and is superseded by the
   ``pyramid.session.SignedCookieSessionFactory``.  Note that while the cookies
   generated by the ``UnencryptedCookieSessionFactoryConfig``
   are compatible with cookies generated by old releases, cookies generated by
-  the SignedCookieSessionFactory are not. See 
+  the SignedCookieSessionFactory are not. See
   https://github.com/Pylons/pyramid/pull/1142
 
 - The ``pyramid.security.has_permission`` API is now deprecated.  Instead, use
@@ -179,8 +184,8 @@ Features
 --------
 
 - Users can now provide dotted Python names to as the ``factory`` argument
-  the Configurator methods named ``add_{view,route,subscriber}_predicate`` 
-  (instead of passing the predicate factory directly, you can pass a 
+  the Configurator methods named ``add_{view,route,subscriber}_predicate``
+  (instead of passing the predicate factory directly, you can pass a
   dotted name which refers to the factory).
 
 Bug Fixes
@@ -216,10 +221,10 @@ Backwards Incompatibilities
 
      ValueError: No such renderer factory .mak
 
-  Support for Mako templating has been moved into an add-on package named 
-  ``pyramid_mako``, and support for Chameleon templating has been moved into 
-  an add-on package named ``pyramid_chameleon``.  These packages are drop-in 
-  replacements for the old built-in support for these templating langauges. 
+  Support for Mako templating has been moved into an add-on package named
+  ``pyramid_mako``, and support for Chameleon templating has been moved into
+  an add-on package named ``pyramid_chameleon``.  These packages are drop-in
+  replacements for the old built-in support for these templating langauges.
   All you have to do is install them and make them active in your configuration
   to register renderer factories for ``.pt`` and/or ``.mako`` (or ``.mak``) to
   make your application work again.
@@ -242,9 +247,9 @@ Backwards Incompatibilities
             ],
         )
 
-  * Within the portion of your application which instantiates a Pyramid 
-    ``pyramid.config.Configurator`` (often the ``main()`` function in 
-    your project's ``__init__.py`` file), tell Pyramid to include the 
+  * Within the portion of your application which instantiates a Pyramid
+    ``pyramid.config.Configurator`` (often the ``main()`` function in
+    your project's ``__init__.py`` file), tell Pyramid to include the
     ``pyramid_mako`` includeme::
 
         config = Configurator(.....)
@@ -254,7 +259,7 @@ Backwards Incompatibilities
 
   * Make sure the ``pyramid_chameleon`` package is installed.  One way to do
     this is by adding ``pyramid_chameleon`` to the ``install_requires`` section
-    of your package's ``setup.py`` file and afterwards rerunning 
+    of your package's ``setup.py`` file and afterwards rerunning
     ``setup.py develop``::
 
         setup(
@@ -266,9 +271,9 @@ Backwards Incompatibilities
             ],
         )
 
-  * Within the portion of your application which instantiates a Pyramid 
-    ``~pyramid.config.Configurator`` (often the ``main()`` function in 
-    your project's ``__init__.py`` file), tell Pyramid to include the 
+  * Within the portion of your application which instantiates a Pyramid
+    ``~pyramid.config.Configurator`` (often the ``main()`` function in
+    your project's ``__init__.py`` file), tell Pyramid to include the
     ``pyramid_chameleon`` includeme::
 
         config = Configurator(.....)
@@ -281,10 +286,10 @@ Backwards Incompatibilities
   compatibility when you eventually do upgrade to Pyramid 1.5.
 
   With the removal of Mako and Chameleon support from the core, some
-  unit tests that use the ``pyramid.renderers.render*`` methods may begin to 
-  fail.  If any of your unit tests are invoking either 
+  unit tests that use the ``pyramid.renderers.render*`` methods may begin to
+  fail.  If any of your unit tests are invoking either
   ``pyramid.renderers.render()``  or ``pyramid.renderers.render_to_response()``
-  with either Mako or Chameleon templates then the 
+  with either Mako or Chameleon templates then the
   ``pyramid.config.Configurator`` instance in effect during
   the unit test should be also be updated to include the addons, as shown
   above. For example::
@@ -308,17 +313,17 @@ Backwards Incompatibilities
                 result = pyramid.renderers.render('mypkg:templates/home.pt', {})
 
 - If you're using the Pyramid debug toolbar, when you upgrade Pyramid to
-  1.5a2+, you'll also need to upgrade the ``pyramid_debugtoolbar`` package to 
-  at least version 1.0.8, as older toolbar versions are not compatible with 
-  Pyramid 1.5a2+ due to the removal of Mako support from the core.  It's 
+  1.5a2+, you'll also need to upgrade the ``pyramid_debugtoolbar`` package to
+  at least version 1.0.8, as older toolbar versions are not compatible with
+  Pyramid 1.5a2+ due to the removal of Mako support from the core.  It's
   fine to use this newer version of the toolbar code with older Pyramids too.
 
 - Removed the ``request.response_*`` varying attributes. These attributes
   have been deprecated since Pyramid 1.1, and as per the deprecation policy,
   have now been removed.
 
-- ``request.response`` will no longer be mutated when using the 
-  ``pyramid.renderers.render()`` API.  Almost all renderers mutate the 
+- ``request.response`` will no longer be mutated when using the
+  ``pyramid.renderers.render()`` API.  Almost all renderers mutate the
   ``request.response`` response object (for example, the JSON renderer sets
   ``request.response.content_type`` to ``application/json``), but this is
   only necessary when the renderer is generating a response; it was a bug
@@ -326,7 +331,7 @@ Backwards Incompatibilities
 
 - Removed the ``bfg2pyramid`` fixer script.
 
-- The ``pyramid.events.NewResponse`` event is now sent **after** response 
+- The ``pyramid.events.NewResponse`` event is now sent **after** response
   callbacks are executed.  It previously executed before response callbacks
   were executed.  Rationale: it's more useful to be able to inspect the response
   after response callbacks have done their jobs instead of before.
@@ -385,24 +390,24 @@ Features
 
 - A new http exception subclass named ``pyramid.httpexceptions.HTTPSuccessful``
   was added.  You can use this class as the ``context`` of an exception
-  view to catch all 200-series "exceptions" (e.g. "raise HTTPOk").  This 
+  view to catch all 200-series "exceptions" (e.g. "raise HTTPOk").  This
   also allows you to catch *only* the ``HTTPOk`` exception itself; previously
-  this was impossible because a number of other exceptions 
+  this was impossible because a number of other exceptions
   (such as ``HTTPNoContent``) inherited from ``HTTPOk``, but now they do not.
 
 - You can now generate "hybrid" urldispatch/traversal URLs more easily
-  by using the new ``route_name``, ``route_kw`` and ``route_remainder_name`` 
+  by using the new ``route_name``, ``route_kw`` and ``route_remainder_name``
   arguments to  ``request.resource_url`` and ``request.resource_path``.  See
-  the new section of the "Combining Traversal and URL Dispatch" documentation 
+  the new section of the "Combining Traversal and URL Dispatch" documentation
   chapter entitled  "Hybrid URL Generation".
 
-- It is now possible to escape double braces in Pyramid scaffolds (unescaped, 
+- It is now possible to escape double braces in Pyramid scaffolds (unescaped,
   these represent replacement values).  You can use ``\{\{a\}\}`` to
-  represent a "bare" ``{{a}}``.  See 
+  represent a "bare" ``{{a}}``.  See
   https://github.com/Pylons/pyramid/pull/862
 
 - Add ``localizer`` and ``locale_name`` properties (reified) to the request.
-  See https://github.com/Pylons/pyramid/issues/508.  Note that the 
+  See https://github.com/Pylons/pyramid/issues/508.  Note that the
   ``pyramid.i18n.get_localizer`` and ``pyramid.i18n.get_locale_name`` functions
   now simply look up these properties on the request.
 
@@ -452,7 +457,7 @@ Features
   externally-hosted static URLs to be generated based on the current protocol.
 
 - The ``AuthTktAuthenticationPolicy`` has two new options to configure its
-  domain usage: 
+  domain usage:
 
   * ``parent_domain``: if set the authentication cookie is set on
     the parent domain. This is useful if you have multiple sites sharing the
@@ -541,7 +546,7 @@ Features
 
 - The ``pyramid.config.Configurator.add_route`` method now supports being
   called with an external URL as pattern. See
-  https://github.com/Pylons/pyramid/issues/611 and the documentation section 
+  https://github.com/Pylons/pyramid/issues/611 and the documentation section
   in the "URL Dispatch" chapter entitled "External Routes" for more information.
 
 Bug Fixes
@@ -549,17 +554,17 @@ Bug Fixes
 
 - It was not possible to use ``pyramid.httpexceptions.HTTPException`` as
   the ``context`` of an exception view as very general catchall for
-  http-related exceptions when you wanted that exception view to override the 
+  http-related exceptions when you wanted that exception view to override the
   default exception view.  See https://github.com/Pylons/pyramid/issues/985
 
-- When the ``pyramid.reload_templates`` setting was true, and a Chameleon 
-  template was reloaded, and the renderer specification named a macro 
+- When the ``pyramid.reload_templates`` setting was true, and a Chameleon
+  template was reloaded, and the renderer specification named a macro
   (e.g. ``foo#macroname.pt``), renderings of the template after the template
-  was reloaded due to a file change would produce the entire template body 
-  instead of just a rendering of the macro.  See 
+  was reloaded due to a file change would produce the entire template body
+  instead of just a rendering of the macro.  See
   https://github.com/Pylons/pyramid/issues/1013.
 
-- Fix an obscure problem when combining a virtual root with a route with a 
+- Fix an obscure problem when combining a virtual root with a route with a
   ``*traverse`` in its pattern.  Now the traversal path generated in
   such a configuration will be correct, instead of an element missing
   a leading slash.
@@ -617,12 +622,12 @@ Backwards Incompatibilities
   previously returned the URL without the query string by default, it now does
   attach the query string unless it is overriden.
 
-- The ``route_url`` and ``route_path`` APIs no longer quote ``/`` 
+- The ``route_url`` and ``route_path`` APIs no longer quote ``/``
   to ``%2F`` when a replacement value contains a ``/``.  This was pointless,
-  as WSGI servers always unquote the slash anyway, and Pyramid never sees the 
+  as WSGI servers always unquote the slash anyway, and Pyramid never sees the
   quoted value.
 
-- It is no longer possible to set a ``locale_name`` attribute of the request, 
+- It is no longer possible to set a ``locale_name`` attribute of the request,
   nor is it possible to set a ``localizer`` attribute of the request.  These
   are now "reified" properties that look up a locale name and localizer
   respectively using the machinery described in the "Internationalization"
-- 
cgit v1.2.3


From df6065fb1c3724649ac6e75cfcabc273ef6fd0d9 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Sun, 19 Jan 2014 16:46:24 -0600
Subject: update narrative docs about iterable decorator argument

---
 docs/narr/viewconfig.rst | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index e5a2c1ade..84fde3f01 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -217,7 +217,21 @@ Non-Predicate Arguments
   decorator function will be called with the view callable as a single
   argument.  The view callable it is passed will accept ``(context,
   request)``.  The decorator must return a replacement view callable which
-  also accepts ``(context, request)``.
+  also accepts ``(context, request)``. The ``decorator`` may also be an
+  iterable of decorators, in which case they will be applied one after the
+  other to the view, in reverse order. For example::
+
+    @view_config(..., decorator=(decorator2, decorator1))
+    def myview(request):
+      ...
+
+  Is similar to doing::
+
+    @view_config(...)
+    @decorator2
+    @decorator1
+    def myview(request):
+      ...
 
 ``mapper``
   A Python object or :term:`dotted Python name` which refers to a :term:`view
-- 
cgit v1.2.3