From 0a2ea908f35f245b1c4750d8d97ffe645ce29a57 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Wed, 13 Nov 2013 17:36:35 -0800
Subject: tox.ini: Add py34

Useful for testing with the new Python 3.4 alpha versions.
---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index b50e56544..2bf213ca4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist = 
-    py26,py27,py32,py33,pypy,cover
+    py26,py27,py32,py33,py34,pypy,cover
 
 [testenv]
 commands = 
-- 
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


From f58977a38ac65dce742dac38fe1179f61bfc3efc Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 22 Jan 2014 03:09:29 -0500
Subject: - Fix a memory leak when the configurator's ``set_request_property``
 method was   used or when the configurator's ``add_request_method`` method
 was used with   the ``property=True`` attribute.  See  
 https://github.com/Pylons/pyramid/issues/1212 .

Closes #1212
---
 CHANGES.txt     |  5 +++++
 pyramid/util.py | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9c38bf814..8a340f320 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,11 @@ 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 a memory leak when the configurator's ``set_request_property`` method was
+  used or when the configurator's ``add_request_method`` method was used with
+  the ``property=True`` attribute.  See
+  https://github.com/Pylons/pyramid/issues/1212 .
+
 1.5a3 (2013-12-10)
 ==================
 
diff --git a/pyramid/util.py b/pyramid/util.py
index 73f3ebdb0..6b92f17fc 100644
--- a/pyramid/util.py
+++ b/pyramid/util.py
@@ -26,6 +26,8 @@ class DottedNameResolver(_DottedNameResolver):
     def __init__(self, package=None): # default to package = None for bw compat
         return _DottedNameResolver.__init__(self, package)
 
+_marker = object()
+
 class InstancePropertyMixin(object):
     """ Mixin that will allow an instance to add properties at
     run-time as if they had been defined via @property or @reify
@@ -80,6 +82,25 @@ class InstancePropertyMixin(object):
         if attrs:
             parent = self.__class__
             cls = type(parent.__name__, (parent, object), attrs)
+            # We assign __provides__, __implemented__ and __providedBy__ below
+            # to prevent a memory leak that results from from the usage of this
+            # instance's eventual use in an adapter lookup.  Adapter lookup
+            # results in ``zope.interface.implementedBy`` being called with the
+            # newly-created class as an argument.  Because the newly-created
+            # class has no interface specification data of its own, lookup
+            # causes new ClassProvides and Implements instances related to our
+            # just-generated class to be created and set into the newly-created
+            # class' __dict__.  We don't want these instances to be created; we
+            # want this new class to behave exactly like it is the parent class
+            # instead.  See https://github.com/Pylons/pyramid/issues/1212 for
+            # more information.
+            for name in ('__implemented__', '__providedBy__', '__provides__'):
+                # we assign these attributes conditionally to make it possible
+                # to test this class in isolation without having any interfaces
+                # attached to it
+                val = getattr(parent, name, _marker)
+                if val is not _marker:
+                    setattr(cls, name, val)
             self.__class__ = cls
 
     def _set_extensions(self, extensions):
-- 
cgit v1.2.3


From 0dd16dd2abf25e3f1a1e73ff6a3e206ed9a18fd9 Mon Sep 17 00:00:00 2001
From: amitvmane <amitvmane@gmail.com>
Date: Thu, 23 Jan 2014 21:56:45 +0530
Subject: Update project.rst

Document fix for issue 1226
---
 docs/narr/project.rst | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index f1bee9efd..cab7cbec7 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -74,6 +74,11 @@ In :ref:`installing_chapter` we called the virtualenv directory ``env``; the
 following commands assume that our current working directory is the ``env``
 directory.
 
+The below command uses the ``pcreate`` command to create a project with the
+``starter`` scaffold.
+
+For example,
+
 On UNIX:
 
 .. code-block:: text
@@ -85,21 +90,7 @@ Or on Windows:
 .. code-block:: text
 
    > %VENV%\Scripts\pcreate -s starter MyProject
-
-The above command uses the ``pcreate`` command to create a project with the
-``starter`` scaffold.  To use a different scaffold, such as
-``alchemy``, you'd just change the ``-s`` argument value.  For example,
-on UNIX:
-
-.. code-block:: text
-
-   $ $VENV/bin/pcreate -s alchemy MyProject
-
-Or on Windows:
-
-.. code-block:: text
-
-   > %VENV%\Scripts\pcreate -s alchemy MyProject
+   
 
 Here's sample output from a run of ``pcreate`` on UNIX for a project we name
 ``MyProject``:
-- 
cgit v1.2.3


From cf8bff6f0176f955bf61fb9832b7ec6da888cd33 Mon Sep 17 00:00:00 2001
From: amitvmane <amitvmane@gmail.com>
Date: Thu, 23 Jan 2014 22:12:00 +0530
Subject: Update project.rst

Updated text as per feedback from Michael M. Thanks.
---
 docs/narr/project.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index cab7cbec7..eb12f67ef 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -74,11 +74,9 @@ In :ref:`installing_chapter` we called the virtualenv directory ``env``; the
 following commands assume that our current working directory is the ``env``
 directory.
 
-The below command uses the ``pcreate`` command to create a project with the
+The below example uses the ``pcreate`` command to create a project with the
 ``starter`` scaffold.
 
-For example,
-
 On UNIX:
 
 .. code-block:: text
-- 
cgit v1.2.3


From 706ce8ed60b2074999f6925980825273e94fd6e8 Mon Sep 17 00:00:00 2001
From: amitvmane <amitvmane@gmail.com>
Date: Thu, 23 Jan 2014 22:44:15 +0530
Subject: Update CONTRIBUTORS.txt

Added as a contributor.
---
 CONTRIBUTORS.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 63528e662..d1ac72df5 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -228,3 +228,5 @@ Contributors
 - Matthew Russell, 2013/10/14
 
 - Antti Haapala, 2013/11/15
+
+- Amit Mane, 2014/01/23
-- 
cgit v1.2.3


From d11d30c43c7178363504997310bc9a2bf9f1a7a9 Mon Sep 17 00:00:00 2001
From: Dan Jacka <danjacka@gmail.com>
Date: Wed, 29 Jan 2014 14:41:01 +1300
Subject: Wee typo fix

---
 docs/designdefense.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index 2f3c14881..418ceb08f 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -419,7 +419,7 @@ hierarchical: sections within sections within sections, ad infinitum.  If you
 want your URLs to indicate this structure, and the structure is indefinite
 (the number of nested sections can be "N" instead of some fixed number), a
 resource tree is an excellent way to model this, even if the backend is a
-relational database.  In this situation, the resource tree a just a site
+relational database.  In this situation, the resource tree is just a site
 structure.
 
 Traversal also offers better composability of applications than URL dispatch,
-- 
cgit v1.2.3


From e49670c7af253e14782d37c6c5e38295d75cc772 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 28 Jan 2014 21:19:29 -0500
Subject: add scaffolding changes to whatsnew

---
 docs/whatsnew-1.5.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/whatsnew-1.5.rst b/docs/whatsnew-1.5.rst
index 9ccf097a8..9b32b42a9 100644
--- a/docs/whatsnew-1.5.rst
+++ b/docs/whatsnew-1.5.rst
@@ -501,6 +501,11 @@ Documentation Enhancements
 
 - Many other enhancements.
 
+Scaffolding Enhancements
+------------------------
+
+- All scaffolds have a new HTML + CSS theme.
+
 
 Dependency Changes
 ------------------
-- 
cgit v1.2.3


From 2c205f7477275f47fcf59ddcf755697fb695fc8e Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 28 Jan 2014 21:32:31 -0500
Subject: prep for 1.5a4 release

---
 CHANGES.txt | 4 ++--
 setup.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8a340f320..d82b3b641 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.5a4 (2014-01-28)
+==================
 
 Features
 --------
diff --git a/setup.py b/setup.py
index 5bf096622..bf6101533 100644
--- a/setup.py
+++ b/setup.py
@@ -69,7 +69,7 @@ testing_extras = tests_require + [
     ]
 
 setup(name='pyramid',
-      version='1.5a3',
+      version='1.5a4',
       description='The Pyramid Web Framework, a Pylons project',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
-- 
cgit v1.2.3


From 896c7730b3d8bd95b9767866f3e6105b1862b24d Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 6 Feb 2014 15:29:12 -0600
Subject: rst syntax

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

diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index 72dc3f414..cdad7e85e 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -916,7 +916,7 @@ class ViewsConfiguratorMixin(object):
           A view declaration with this argument ensures that the view will
           only be called when the :term:`request` has key/value pairs in its
           :term:`matchdict` that equal those supplied in the predicate.
-          e.g. ``match_param="action=edit" would require the ``action``
+          e.g. ``match_param="action=edit"`` would require the ``action``
           parameter in the :term:`matchdict` match the right hand side of
           the expression (``edit``) for the view to "match" the current
           request.
-- 
cgit v1.2.3


From 579a5f47523ada48497994f0c70152f617d6af2a Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 8 Feb 2014 15:27:27 -0500
Subject: - We no longer eagerly clear ``request.exception`` and
 ``request.exc_info`` in   the exception view tween.  This makes it possible
 to inspect exception   information within a finished callback.  See  
 https://github.com/Pylons/pyramid/issues/1223.

Closes #1223.
---
 CHANGES.txt                  | 11 +++++++++++
 pyramid/tests/test_router.py | 11 +++++++----
 pyramid/tweens.py            | 16 ++++++++--------
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d82b3b641..ed70d7036 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,14 @@
+Next release
+============
+
+Features
+--------
+
+- We no longer eagerly clear ``request.exception`` and ``request.exc_info`` in
+  the exception view tween.  This makes it possible to inspect exception
+  information within a finished callback.  See
+  https://github.com/Pylons/pyramid/issues/1223.
+
 1.5a4 (2014-01-28)
 ==================
 
diff --git a/pyramid/tests/test_router.py b/pyramid/tests/test_router.py
index b836d7d72..838e52db0 100644
--- a/pyramid/tests/test_router.py
+++ b/pyramid/tests/test_router.py
@@ -830,7 +830,8 @@ class TestRouter(unittest.TestCase):
         self._registerTraverserFactory(context, subpath=[''])
         response = DummyResponse()
         response.app_iter = ['OK']
-        view = DummyView(response, raise_exception=RuntimeError)
+        error = RuntimeError()
+        view = DummyView(response, raise_exception=error)
         environ = self._makeEnviron()
         def exception_view(context, request):
             self.assertEqual(request.exc_info[0], RuntimeError)
@@ -842,9 +843,11 @@ class TestRouter(unittest.TestCase):
         start_response = DummyStartResponse()
         result = router(environ, start_response)
         self.assertEqual(result, ['OK'])
-        # we clean up the exc_info and exception after the request
-        self.assertEqual(request.exception, None)
-        self.assertEqual(request.exc_info, None)
+        # exc_info and exception should still be around on the request after
+        # the excview tween has run (see
+        # https://github.com/Pylons/pyramid/issues/1223)
+        self.assertEqual(request.exception, error)
+        self.assertEqual(request.exc_info[:2], (RuntimeError, error,))
         
     def test_call_view_raises_exception_view(self):
         from pyramid.interfaces import IViewClassifier
diff --git a/pyramid/tweens.py b/pyramid/tweens.py
index cf2238deb..831de8481 100644
--- a/pyramid/tweens.py
+++ b/pyramid/tweens.py
@@ -20,8 +20,14 @@ def excview_tween_factory(handler, registry):
         try:
             response = handler(request)
         except Exception as exc:
-            # WARNING: do not assign the result of sys.exc_info() to a
-            # local var here, doing so will cause a leak
+            # WARNING: do not assign the result of sys.exc_info() to a local
+            # var here, doing so will cause a leak.  We used to actually
+            # explicitly delete both "exception" and "exc_info" from ``attrs``
+            # in a ``finally:`` clause below, but now we do not because these
+            # attributes are useful to upstream tweens.  This actually still
+            # apparently causes a reference cycle, but it is broken
+            # successfully by the garbage collector (see
+            # https://github.com/Pylons/pyramid/issues/1223).
             attrs['exc_info'] = sys.exc_info()
             attrs['exception'] = exc
             # clear old generated request.response, if any; it may
@@ -38,12 +44,6 @@ def excview_tween_factory(handler, registry):
             if view_callable is None:
                 raise
             response = view_callable(exc, request)
-        finally:
-            # prevent leakage (wrt exc_info)
-            if 'exc_info' in attrs:
-                del attrs['exc_info']
-            if 'exception' in attrs:
-                del attrs['exception']
 
         return response
 
-- 
cgit v1.2.3


From f8ebde9e5ba1719737099cef12aad641a39120d9 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 8 Feb 2014 16:11:03 -0500
Subject: nose-selecttests is not py3 compat, so we cant really rely on it in
 testing requirements

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

diff --git a/setup.py b/setup.py
index bf6101533..ebdcc7b1f 100644
--- a/setup.py
+++ b/setup.py
@@ -63,7 +63,6 @@ docs_extras = [
 
 testing_extras = tests_require + [
     'nose',
-    'nose-selecttests',
     'coverage',
     'virtualenv', # for scaffolding tests
     ]
-- 
cgit v1.2.3


From d7b647d27ebde9bc8203629b651e69d6e7ac7c38 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 8 Feb 2014 16:27:42 -0500
Subject: prep for 1.5b1

---
 CHANGES.txt           | 4 ++--
 docs/whatsnew-1.5.rst | 5 +++++
 setup.py              | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ed70d7036..cefb2318d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.5b1 (2014-02-08)
+==================
 
 Features
 --------
diff --git a/docs/whatsnew-1.5.rst b/docs/whatsnew-1.5.rst
index 9b32b42a9..2f73af661 100644
--- a/docs/whatsnew-1.5.rst
+++ b/docs/whatsnew-1.5.rst
@@ -360,6 +360,11 @@ The feature additions in Pyramid 1.5 follow.
   timeouts, and conformance with the ``ISession`` API.
   See https://github.com/Pylons/pyramid/pull/1142
 
+- We no longer eagerly clear ``request.exception`` and ``request.exc_info`` in
+  the exception view tween.  This makes it possible to inspect exception
+  information within a finished callback.  See
+  https://github.com/Pylons/pyramid/issues/1223.
+
 
 Other Backwards Incompatibilities
 ---------------------------------
diff --git a/setup.py b/setup.py
index ebdcc7b1f..3c17af20d 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ testing_extras = tests_require + [
     ]
 
 setup(name='pyramid',
-      version='1.5a4',
+      version='1.5b1',
       description='The Pyramid Web Framework, a Pylons project',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
-- 
cgit v1.2.3


From d773d0a7664dfce23ae9d766e4be529f3cd4faee Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sun, 9 Feb 2014 21:51:18 -0600
Subject: add docs/_themes

---
 docs/_themes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_themes b/docs/_themes
index 267326456..3bec9280a 160000
--- a/docs/_themes
+++ b/docs/_themes
@@ -1 +1 @@
-Subproject commit 26732645619b372764097e5e8086f89871d90c04
+Subproject commit 3bec9280a6cedb15e97e5899021aa8d723c25388
-- 
cgit v1.2.3


From 4f9eb3b50a363e86aa38f9c497983adca0264cb9 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sun, 9 Feb 2014 22:01:07 -0600
Subject: - correct error when building docs in Sphinx: Warning, treated as
 error: ~/projects/pyramid/pyramid/docs/api/i18n.rst:6: WARNING: error while
 formatting arguments for pyramid.i18n.TranslationStringFactory: 'function'
 object has no attribute '__bases__'

---
 docs/api/i18n.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/i18n.rst b/docs/api/i18n.rst
index 53e8c8a9b..3b9abbc1d 100644
--- a/docs/api/i18n.rst
+++ b/docs/api/i18n.rst
@@ -7,7 +7,7 @@
 
   .. autoclass:: TranslationString
  
-  .. autoclass:: TranslationStringFactory
+  .. autofunction:: TranslationStringFactory
 
   .. autoclass:: Localizer
      :members:
-- 
cgit v1.2.3


From b5655e2e35c6fc57dd54684b1c71b1e11f672a14 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Sun, 9 Feb 2014 23:13:27 -0500
Subject: Apply change from #1221 manually.

Avoid the unintentional slight in OPs commit message.
---
 docs/narr/startup.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/narr/startup.rst b/docs/narr/startup.rst
index 1affa1758..7b4a7ea08 100644
--- a/docs/narr/startup.rst
+++ b/docs/narr/startup.rst
@@ -123,7 +123,7 @@ Here's a high-level time-ordered overview of what happens when you press
    populated by other methods run against the Configurator.  The router is a
    WSGI application.
 
-#. A :class:`~pyramid.events.ApplicationCreated` event is emitted (see
+#. An :class:`~pyramid.events.ApplicationCreated` event is emitted (see
    :ref:`events_chapter` for more information about events).
 
 #. Assuming there were no errors, the ``main`` function in ``myproject``
-- 
cgit v1.2.3


From 93b6cd09e08055061722bc619092a4f061e1634d Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sun, 9 Feb 2014 22:46:57 -0600
Subject: - Add more git submodule instructions - Add steps to fork and clone
 Pyramid to GitHub repo, then clone user GitHub repo to local machine.

---
 HACKING.txt | 81 ++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 53 insertions(+), 28 deletions(-)

diff --git a/HACKING.txt b/HACKING.txt
index 12f2d68e2..460d02047 100644
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -1,26 +1,45 @@
 Hacking on Pyramid
 ==================
 
-Here are some guidelines about hacking on Pyramid.
+Here are some guidelines for hacking on Pyramid.
 
 Using a Development Checkout
 ----------------------------
 
 You'll have to create a development environment to hack on Pyramid, using a
-Pyramid checkout.   You can either do this by hand or, if you have ``tox``
-installed (it's on PyPI), you can (ab)use tox to get a working development
+Pyramid checkout.  You can either do this by hand, or if you have ``tox``
+installed (it's on PyPI), you can use tox to set up a working development
 environment.  Each installation method is described below.
 
 By Hand
 +++++++
 
-- Check out Pyramid from source::
+- While logged into your GitHub account, navigate to the Pyramid repo on
+  GitHub.
+  
+  https://github.com/Pylons/pyramid
+
+- Fork and clone the Pyramid repository to your GitHub account by clicking
+  the "Fork" button.
+
+- Clone your fork of Pyramid from your GitHub account to your local computer,
+  substituting your account username and specifying the destination as
+  "hack-on-pyramid".
 
    $ cd ~
-   $ git clone git://github.com/Pylons/pyramid.git hack-on-pyramid
+   $ git clone git@github.com:USERNAME/pyramid.git hack-on-pyramid
    $ cd hack-on-pyramid
+   # Configure remotes such that you can pull changes from the Pyramid
+   # repository into your local repository.
+   $ git remote add upstream git@github.com:Pylons/pyramid.git
+   # fetch and merge changes from upstream into master
+   $ git fetch upstream
+   $ git merge upstream/master
+
+Now your local repo is set up such that you will push changes to your GitHub
+repo, from which you can submit a pull request.
 
-- Create a virtualenv in which to install Pyramid::
+- Create a virtualenv in which to install Pyramid:
 
    $ cd ~/hack-on-pyramid
    $ virtualenv -ppython2.7 env
@@ -39,7 +58,7 @@ By Hand
   ``export VENV=~/hack-on-pyramid/env`` command.
 
 - Install ``setuptools-git`` into the virtualenv (for good measure, as we're
-  using git to do version control)::
+  using git to do version control):
 
    $ $VENV/bin/easy_install setuptools-git
 
@@ -47,19 +66,18 @@ By Hand
   dev``.  ``setup.py dev`` is an alias for "setup.py develop" which also
   installs testing requirements such as nose and coverage.  Running
   ``setup.py dev`` *must* be done while the current working directory is the
-  ``pyramid`` checkout directory::
+  ``pyramid`` checkout directory:
 
    $ cd ~/hack-on-pyramid
    $ $VENV/bin/python setup.py dev
 
-- At that point, you should be able to create new Pyramid projects by using
-  ``pcreate``::
+- Optionally create a new Pyramid project using ``pcreate``:
 
   $ cd $VENV
   $ bin/pcreate -s starter starter
 
-- And install those projects (also using ``setup.py develop``) into the
-  virtualenv::
+- ...and install the new project (also using ``setup.py develop``) into the
+  virtualenv:
 
   $ cd $VENV/starter
   $ $VENV/bin/python setup.py develop
@@ -70,12 +88,12 @@ Using Tox
 Alternatively, if you already have ``tox`` installed, there is an easier
 way to get going.
 
-- Create a new directory somewhere and ``cd`` to it::
+- Create a new directory somewhere and ``cd`` to it:
 
    $ mkdir ~/hack-on-pyramid
    $ cd ~/hack-on-pyramid
 
-- Check out a read-only copy of the Pyramid source::
+- Check out a read-only copy of the Pyramid source:
 
    $ git clone git://github.com/Pylons/pyramid.git .
 
@@ -85,14 +103,14 @@ Since Pyramid is a framework and not an application, it can be
 convenient to work against a sample application, preferably in its own
 virtualenv. A quick way to achieve this is to (ab-)use ``tox``
 (http://tox.readthedocs.org/en/latest/) with a custom configuration
-file that's part of the checkout::
+file that's part of the checkout:
 
   tox -c hacking-tox.ini
 
 This will create a python-2.7 based virtualenv named ``env27`` (Pyramid's
 ``.gitconfig` ignores all top-level folders that start with ``env`` specifically
 for this use case) and inside that a simple pyramid application named
-``hacking`` that you can then fire up like so::
+``hacking`` that you can then fire up like so:
 
   cd env27/hacking
   ../bin/pserve development.ini
@@ -159,7 +177,7 @@ Running Tests
   invoke the ``tox`` console script.  This will read the ``tox.ini`` file and
   execute the tests on multiple Python versions and platforms; while it runs,
   it creates a virtualenv for each version/platform combination.  For
-  example::
+  example:
 
    $ sudo /usr/bin/easy_install tox
    $ cd ~/hack-on-pyramid/
@@ -167,7 +185,7 @@ Running Tests
 
 - The tests can also be run using ``pytest`` (http://pytest.org/).  This is
   intended as a convenience for people who are more used or fond of ``pytest``.
-  Run the tests like so::
+  Run the tests like so:
 
    $ $VENV/bin/easy_install pytest
    $ py.test --strict pyramid/
@@ -184,30 +202,38 @@ Documentation Coverage and Building HTML Documentation
 ------------------------------------------------------
 
 If you fix a bug, and the bug requires an API or behavior modification, all
-documentation in this package which references that API or behavior must
-change to reflect the bug fix, ideally in the same commit that fixes the bug
+documentation in this package which references that API or behavior must be
+changed to reflect the bug fix, ideally in the same commit that fixes the bug
 or adds the feature.
 
 To build and review docs (where ``$VENV`` refers to the virtualenv you're
 using to develop Pyramid):
 
-1. After following the steps above in "Using a Development Checkout", cause
-   Sphinx and all development requirements to be installed in your
-   virtualenv::
+1. After following the steps above in "Using a Development Checkout", install
+   Sphinx and all development requirements in your virtualenv:
 
      $ cd ~/hack-on-pyramid
      $ $VENV/bin/python setup.py docs
 
 2. Update all git submodules from the top-level of your Pyramid checkout, like
-   so::
+   so:
 
      $ git submodule update --init --recursive
 
    This will checkout theme subrepositories and prevent error conditions when
    HTML docs are generated.
 
-3. cd to the ``docs`` directory within your Pyramid checkout and execute
-   the ``make`` command with some flags::
+3. Next change into the submodule's directory and switch to a branch so that
+   the submodule repositories are no longer "headless".  Then update the
+   repository to ensure that we have the latest updates.
+   See http://chrisjean.com/2009/04/20/git-submodules-adding-using-removing-and-updating/
+
+    $ cd docs/_themes
+    $ git checkout master
+    $ git pull
+
+4. Change into the ``docs`` directory within your Pyramid checkout and execute
+   the ``make`` command with some flags:
 
      $ cd ~/hack-on-pyramid/pyramid/docs
      $ make clean html SPHINXBUILD=$VENV/bin/sphinx-build
@@ -216,7 +242,7 @@ using to develop Pyramid):
    which will have both Sphinx and Pyramid (for API documentation generation)
    installed.
 
-4. Open the ``docs/_build/html/index.html`` file to see the resulting HTML
+5. Open the ``docs/_build/html/index.html`` file to see the resulting HTML
    rendering.
 
 Change Log
@@ -227,4 +253,3 @@ Change Log
   descriptive, not cryptic.  Other developers should be able to know
   what your changelog entry means.
 
-
-- 
cgit v1.2.3


From 561a7edd3f3a2b25ca4a8f1393abf01be99fbbe3 Mon Sep 17 00:00:00 2001
From: Hari haran <hariharan.uno@gmail.com>
Date: Mon, 14 Oct 2013 01:50:13 +0530
Subject: Specified installation instructions for pyramid_chameleon

---
 docs/quick_tour.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 2db18c8a7..cdc70681c 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -246,6 +246,23 @@ languages. That said, the Pylons Project officially supports bindings for
 Chameleon, Jinja2 and Mako, so in this step, let's use Chameleon as an
 example:
 
+Let's add ``pyramid_chameleon``,
+a Pyramid :term:`add-on` which enables Chameleon as a :term:`renderer` in
+our Pyramid applications:
+
+.. code-block:: bash
+
+    $ easy_install pyramid_chameleon
+
+With the package installed, we can include the template bindings into
+our configuration:
+
+.. code-block:: python
+
+    config.include('pyramid_chameleon')
+    
+Now lets change our views.py file:
+
 .. literalinclude:: quick_tour/templating/views.py
     :start-after: Start View 1
     :end-before: End View 1
-- 
cgit v1.2.3


From 039d12ad4f736548ff05e0626f16f314ec10ba21 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sun, 9 Feb 2014 23:10:03 -0600
Subject: - Clean up PR #1163

---
 docs/quick_tour.rst | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index cdc70681c..0a8f58fd0 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -243,12 +243,10 @@ Pyramid doesn't mandate a particular database system, form library,
 etc. It encourages replaceability. This applies equally to templating,
 which is fortunate: developers have strong views about template
 languages. That said, the Pylons Project officially supports bindings for
-Chameleon, Jinja2 and Mako, so in this step, let's use Chameleon as an
-example:
+Chameleon, Jinja2, and Mako, so in this step, let's use Chameleon.
 
-Let's add ``pyramid_chameleon``,
-a Pyramid :term:`add-on` which enables Chameleon as a :term:`renderer` in
-our Pyramid applications:
+Let's add ``pyramid_chameleon``, a Pyramid :term:`add-on` which enables
+Chameleon as a :term:`renderer` in our Pyramid applications:
 
 .. code-block:: bash
 
-- 
cgit v1.2.3


From 5ac519452613b7bd5df22293c2ccb3b9c3597ef4 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Mon, 10 Feb 2014 01:10:05 -0600
Subject: - Update list of session packages - Update Quick Tour section on
 sessions - Closes PR #1150

---
 docs/narr/sessions.rst | 22 ++++++++++++++++++----
 docs/quick_tour.rst    |  6 +++---
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/docs/narr/sessions.rst b/docs/narr/sessions.rst
index fb5035373..8da743a01 100644
--- a/docs/narr/sessions.rst
+++ b/docs/narr/sessions.rst
@@ -158,10 +158,24 @@ Some gotchas:
 Using Alternate Session Factories
 ---------------------------------
 
-At the time of this writing, exactly one project-endorsed alternate session
-factory exists named :term:`pyramid_redis_sessions`.  It can be downloaded from
-PyPI.  It uses the Redis database as a backend.  It is the recommended 
-persistent session solution at the time of this writing.
+The following session factories exist at the time of this writing.
+
+======================= ======= =============================
+Session Factory         Backend   Description
+======================= ======= =============================
+pyramid_redis_sessions_ Redis_  Server-side session library
+                                for Pyramid, using Redis for
+                                storage.
+pyramid_beaker_         Beaker_ Session factory for Pyramid
+                                backed by the Beaker
+                                sessioning system.
+======================= ======= =============================
+
+.. _pyramid_redis_sessions: https://pypi.python.org/pypi/pyramid_redis_sessions
+.. _Redis: http://redis.io/
+
+.. _pyramid_beaker: https://pypi.python.org/pypi/pyramid_beaker
+.. _Beaker: http://beaker.readthedocs.org/en/latest/
 
 .. index::
    single: session factory (custom)
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 0a8f58fd0..65fd002d5 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -743,9 +743,9 @@ When people use your web application, they frequently perform a task
 that requires semi-permanent data to be saved. For example, a shopping
 cart. This is called a :term:`session`.
 
-Pyramid has basic built-in support for sessions, with add-ons such as
-``pyramid_redis_sessions`` (or your own custom sessioning engine) that provide 
-richer session support. Let's take a look at the
+Pyramid has basic built-in support for sessions.  Third party packages such as
+``pyramid_redis_sessions`` provide richer session support.  Or you can create
+your own custom sessioning engine.  Let's take a look at the
 :doc:`built-in sessioning support <../narr/sessions>`. In our
 ``__init__.py`` we first import the kind of sessioning we want:
 
-- 
cgit v1.2.3


From 2033eeb3602f330930585678aac926749b9c22f7 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Mon, 10 Feb 2014 03:22:33 -0600
Subject: - Garden PR #1121

---
 docs/api/registry.rst                     |  5 ++-
 docs/api/request.rst                      | 13 ++++--
 docs/designdefense.rst                    |  6 ++-
 docs/glossary.rst                         | 66 +++++++++++++++++++++++--------
 docs/narr/advconfig.rst                   |  8 +++-
 docs/narr/environment.rst                 | 38 ++++++++++++++----
 docs/narr/events.rst                      |  6 ++-
 docs/narr/hellotraversal.rst              | 10 ++---
 docs/narr/introduction.rst                | 29 ++++++++++----
 docs/narr/project.rst                     | 19 ++++++---
 docs/narr/resources.rst                   |  7 +++-
 docs/narr/security.rst                    | 18 ++++++---
 docs/narr/templates.rst                   |  6 ++-
 docs/narr/testing.rst                     |  6 ++-
 docs/narr/urldispatch.rst                 |  5 ++-
 docs/narr/viewconfig.rst                  |  5 ++-
 docs/quick_tour.rst                       | 38 +++++++++---------
 docs/quick_tutorial/authentication.rst    |  4 +-
 docs/quick_tutorial/debugtoolbar.rst      |  2 +-
 docs/quick_tutorial/logging.rst           |  2 +-
 docs/quick_tutorial/requirements.rst      |  2 +-
 docs/quick_tutorial/tutorial_approach.rst |  6 +--
 docs/quick_tutorial/unit_testing.rst      |  2 +-
 docs/whatsnew-1.0.rst                     |  7 +++-
 docs/whatsnew-1.1.rst                     | 19 ++++++---
 pyramid/config/__init__.py                |  7 +++-
 pyramid/config/factories.py               |  6 +--
 pyramid/config/routes.py                  | 31 +++++++--------
 pyramid/config/security.py                |  4 +-
 pyramid/config/views.py                   | 30 ++++++++------
 pyramid/events.py                         |  4 +-
 pyramid/i18n.py                           | 25 +++++++-----
 pyramid/interfaces.py                     | 10 +++--
 pyramid/renderers.py                      |  4 +-
 pyramid/request.py                        |  8 +++-
 pyramid/router.py                         | 36 ++---------------
 pyramid/security.py                       | 16 ++++----
 pyramid/session.py                        | 10 ++---
 pyramid/url.py                            |  7 +++-
 pyramid/view.py                           | 18 ++++++---
 40 files changed, 338 insertions(+), 207 deletions(-)

diff --git a/docs/api/registry.rst b/docs/api/registry.rst
index 7736cf075..bab3e26ba 100644
--- a/docs/api/registry.rst
+++ b/docs/api/registry.rst
@@ -21,7 +21,10 @@
      When a registry is set up (or created) by a :term:`Configurator`, the
      registry will be decorated with an instance named ``introspector``
      implementing the :class:`pyramid.interfaces.IIntrospector` interface.
-     See also :attr:`pyramid.config.Configurator.introspector`.
+
+     .. seealso::
+
+        See also :attr:`pyramid.config.Configurator.introspector`.
 
      When a registry is created "by hand", however, this attribute will not
      exist until set up by a configurator.
diff --git a/docs/api/request.rst b/docs/api/request.rst
index b7604020e..343d0c022 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -250,8 +250,11 @@
       ``invoke_subrequest`` isn't *actually* a method of the Request object;
       it's a callable added when the Pyramid router is invoked, or when a
       subrequest is invoked.  This means that it's not available for use on a
-      request provided by e.g. the ``pshell`` environment.  For more
-      information, see :ref:`subrequest_chapter`.
+      request provided by e.g. the ``pshell`` environment.
+
+      .. seealso::
+
+          See also :ref:`subrequest_chapter`.
 
    .. automethod:: has_permission
 
@@ -280,7 +283,11 @@
        This property will return the JSON-decoded variant of the request
        body.  If the request body is not well-formed JSON, or there is no
        body associated with this request, this property will raise an
-       exception.  See also :ref:`request_json_body`.
+       exception.
+       
+       .. seealso::
+       
+           See also :ref:`request_json_body`.
 
    .. method:: set_property(callable, name=None, reify=False)
 
diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index 418ceb08f..1ed4f65a4 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -537,7 +537,11 @@ text indexing.  It does not dictate how you arrange your code.
 
 Such opinionated functionality exists in applications and frameworks built
 *on top* of :app:`Pyramid`.  It's intended that higher-level systems emerge
-built using :app:`Pyramid` as a base.  See also :ref:`apps_are_extensible`.
+built using :app:`Pyramid` as a base.
+
+.. seealso::
+
+    See also :ref:`apps_are_extensible`.
 
 Pyramid Provides Too Many "Rails"
 ---------------------------------
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 406b81778..0e340491b 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -54,8 +54,12 @@ Glossary
      provides an API for addressing "asset files" within a Python
      :term:`package`.  Asset files are static files, template files, etc;
      basically anything non-Python-source that lives in a Python package can
-     be considered a asset file.  See also `PkgResources
-     <http://peak.telecommunity.com/DevCenter/PkgResources>`_
+     be considered a asset file.
+     
+     .. seealso::
+         
+         See also `PkgResources
+         <http://peak.telecommunity.com/DevCenter/PkgResources>`_.
 
    asset
      Any file contained within a Python :term:`package` which is *not*
@@ -242,7 +246,11 @@ Glossary
      be effectively amended with a ``permission`` argument that will
      require that the executing user possess the default permission in
      order to successfully execute the associated :term:`view
-     callable` See also :ref:`setting_a_default_permission`.
+     callable`.
+
+     .. seealso::
+        
+        See also :ref:`setting_a_default_permission`.
 
    ACE
      An *access control entry*.  An access control entry is one element
@@ -380,7 +388,11 @@ Glossary
    route
      A single pattern matched by the :term:`url dispatch` subsystem,
      which generally resolves to a :term:`root factory` (and then
-     ultimately a :term:`view`).  See also :term:`url dispatch`.
+     ultimately a :term:`view`).
+
+     .. seealso::
+
+        See also :term:`url dispatch`.
 
    route configuration
      Route configuration is the act of associating request parameters with a
@@ -580,8 +592,11 @@ Glossary
      A wrapper around a Python function or class which accepts the
      function or class as its first argument and which returns an
      arbitrary object.  :app:`Pyramid` provides several decorators,
-     used for configuration and return value modification purposes.  See
-     also `PEP 318 <http://www.python.org/dev/peps/pep-0318/>`_.
+     used for configuration and return value modification purposes.
+
+     .. seealso::
+     
+        See also `PEP 318 <http://www.python.org/dev/peps/pep-0318/>`_.
 
    configuration declaration
      An individual method call made to a :term:`configuration directive`,
@@ -646,8 +661,11 @@ Glossary
    HTTP Exception
       The set of exception classes defined in :mod:`pyramid.httpexceptions`.
       These can be used to generate responses with various status codes when
-      raised or returned from a :term:`view callable`.  See also
-      :ref:`http_exceptions`.
+      raised or returned from a :term:`view callable`.
+
+      .. seealso::
+
+          See also :ref:`http_exceptions`.
 
    thread local
       A thread-local variable is one which is essentially a global variable
@@ -656,8 +674,11 @@ Glossary
       application may have a different value for this same "global" variable.
       :app:`Pyramid` uses a small number of thread local variables, as
       described in :ref:`threadlocals_chapter`.
-      See also the :class:`stdlib documentation <threading.local>`
-      for more information.
+
+      .. seealso::
+
+          See also the :class:`stdlib documentation <threading.local>`
+          for more information.
 
    multidict
      An ordered dictionary that can have multiple values for each key. Adds
@@ -671,7 +692,11 @@ Glossary
 
    Agendaless Consulting
      A consulting organization formed by Paul Everitt, Tres Seaver,
-     and Chris McDonough.  See also http://agendaless.com .
+     and Chris McDonough.
+
+     .. seealso::
+
+         See also `Agendaless Consulting <http://agendaless.com>`_.
 
    Jython
      A `Python implementation <http://www.jython.org/>`_ written for
@@ -792,15 +817,21 @@ Glossary
      The act of creating software with a user interface that can
      potentially be displayed in more than one language or cultural
      context.  Often shortened to "i18n" (because the word
-     "internationalization" is I, 18 letters, then N).  See also:
-     :term:`Localization`.
+     "internationalization" is I, 18 letters, then N).
+
+     .. seealso::
+
+         See also :term:`Localization`.
 
    Localization
      The process of displaying the user interface of an
      internationalized application in a particular language or
      cultural context.  Often shortened to "l10" (because the word
-     "localization" is L, 10 letters, then N).  See also:
-     :term:`Internationalization`.
+     "localization" is L, 10 letters, then N).
+
+     .. seealso::
+     
+         See also :term:`Internationalization`.
 
    renderer globals
       Values injected as names into a renderer by a
@@ -809,7 +840,10 @@ Glossary
    response callback
       A user-defined callback executed by the :term:`router` at a
       point after a :term:`response` object is successfully created.
-      See :ref:`using_response_callbacks`.
+
+      .. seealso::
+
+          See also :ref:`using_response_callbacks`.
 
    finished callback
       A user-defined callback executed by the :term:`router`
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst
index d3431e39e..9ceaaa495 100644
--- a/docs/narr/advconfig.rst
+++ b/docs/narr/advconfig.rst
@@ -158,8 +158,12 @@ use :meth:`pyramid.config.Configurator.include`:
 Using :meth:`~pyramid.config.Configurator.include` instead of calling the
 function directly provides a modicum of automated conflict resolution, with
 the configuration statements you define in the calling code overriding those
-of the included function.  See also :ref:`automatic_conflict_resolution` and
-:ref:`including_configuration`.
+of the included function.
+
+.. seealso::
+
+    See also :ref:`automatic_conflict_resolution` and
+    :ref:`including_configuration`.
 
 Using ``config.commit()``
 +++++++++++++++++++++++++
diff --git a/docs/narr/environment.rst b/docs/narr/environment.rst
index f0c0c18fe..412635f08 100644
--- a/docs/narr/environment.rst
+++ b/docs/narr/environment.rst
@@ -59,8 +59,11 @@ third-party template rendering extensions.
 Reloading Assets
 ----------------
 
-Don't cache any asset file data when this value is true.  See
-also :ref:`overriding_assets_section`.
+Don't cache any asset file data when this value is true.
+
+.. seealso::
+
+    See also :ref:`overriding_assets_section`.
 
 +---------------------------------+-----------------------------+
 | Environment Variable Name       | Config File Setting Name    |
@@ -79,7 +82,11 @@ Debugging Authorization
 -----------------------
 
 Print view authorization failure and success information to stderr
-when this value is true.  See also :ref:`debug_authorization_section`.
+when this value is true.
+
+.. seealso::
+
+    See also :ref:`debug_authorization_section`.
 
 +---------------------------------+-----------------------------------+
 | Environment Variable Name       | Config File Setting Name          |
@@ -94,7 +101,11 @@ Debugging Not Found Errors
 --------------------------
 
 Print view-related ``NotFound`` debug messages to stderr
-when this value is true.  See also :ref:`debug_notfound_section`.
+when this value is true.
+
+.. seealso::
+
+    See also :ref:`debug_notfound_section`.
 
 +---------------------------------+------------------------------+
 | Environment Variable Name       | Config File Setting Name     |
@@ -109,7 +120,11 @@ Debugging Route Matching
 ------------------------
 
 Print debugging messages related to :term:`url dispatch` route matching when
-this value is true.  See also :ref:`debug_routematch_section`.
+this value is true.
+
+.. seealso::
+
+    See also :ref:`debug_routematch_section`.
 
 +---------------------------------+--------------------------------+
 | Environment Variable Name       | Config File Setting Name       |
@@ -128,7 +143,11 @@ Preventing HTTP Caching
 Prevent the ``http_cache`` view configuration argument from having any effect
 globally in this process when this value is true.  No http caching-related
 response headers will be set by the Pyramid ``http_cache`` view configuration
-feature when this is true.  See also :ref:`influencing_http_caching`.
+feature when this is true.
+
+.. seealso::
+
+    See also :ref:`influencing_http_caching`.
 
 +---------------------------------+----------------------------------+
 | Environment Variable Name       | Config File Setting Name         |
@@ -173,8 +192,11 @@ Default Locale Name
 --------------------
 
 The value supplied here is used as the default locale name when a
-:term:`locale negotiator` is not registered.  See also
-:ref:`localization_deployment_settings`.
+:term:`locale negotiator` is not registered.
+
+.. seealso::
+
+    See also :ref:`localization_deployment_settings`.
 
 +---------------------------------+-----------------------------------+
 | Environment Variable Name       | Config File Setting Name          |
diff --git a/docs/narr/events.rst b/docs/narr/events.rst
index 50484761d..09caac898 100644
--- a/docs/narr/events.rst
+++ b/docs/narr/events.rst
@@ -44,7 +44,7 @@ Configuring an Event Listener Imperatively
 You can imperatively configure a subscriber function to be called
 for some event type via the
 :meth:`~pyramid.config.Configurator.add_subscriber`
-method (see also :term:`Configurator`):
+method:
 
 .. code-block:: python
   :linenos:
@@ -63,6 +63,10 @@ The first argument to
 subscriber function (or a :term:`dotted Python name` which refers
 to a subscriber callable); the second argument is the event type.
 
+.. seealso::
+
+    See also :term:`Configurator`.
+
 Configuring an Event Listener Using a Decorator
 -----------------------------------------------
 
diff --git a/docs/narr/hellotraversal.rst b/docs/narr/hellotraversal.rst
index 142c24f54..0a93b8f16 100644
--- a/docs/narr/hellotraversal.rst
+++ b/docs/narr/hellotraversal.rst
@@ -60,10 +60,10 @@ A more complicated application could have many types of resources,
 with different view callables defined for each type, and even multiple
 views for each type.
 
-See Also
----------
+.. seealso::
 
-Full technical details may be found in :doc:`traversal`.
-
-For more about *why* you might use traversal, see :doc:`muchadoabouttraversal`.
+    Full technical details may be found in :doc:`traversal`.
+    
+    For more about *why* you might use traversal, see
+    :doc:`muchadoabouttraversal`.
 
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 8acbab3a0..a37d74c9b 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -121,7 +121,9 @@ ways.
 
 .. literalinclude:: helloworld.py
 
-See also :ref:`firstapp_chapter`.
+.. seealso::
+
+    See also :ref:`firstapp_chapter`.
 
 Decorator-based configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -271,7 +273,9 @@ Here's a few views defined as methods of a class instead:
        def view_two(self):
            return Response('two')
 
-See also :ref:`view_config_placement`.
+.. seealso::
+
+    See also :ref:`view_config_placement`.
 
 .. _intro_asset_specs:
 
@@ -572,7 +576,10 @@ For example:
       config.include('pyramid_exclog')
       config.include('some.other.guys.package', route_prefix='/someotherguy')
 
-See also :ref:`including_configuration` and :ref:`building_an_extensible_app`
+.. seealso::
+
+    See also :ref:`including_configuration` and
+    :ref:`building_an_extensible_app`.
 
 Flexible authentication and authorization
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -730,7 +737,9 @@ Pyramid defaults to explicit behavior, because it's the most generally
 useful, but provides hooks that allow you to adapt the framework to localized
 aesthetic desires.
 
-See also :ref:`using_iresponse`.
+.. seealso::
+
+    See also :ref:`using_iresponse`.
 
 "Global" response object
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -748,7 +757,9 @@ section," you say.  Fine.  Be that way:
        response.content_type = 'text/plain'
        return response
 
-See also :ref:`request_response_attr`.
+.. seealso::
+
+    See also :ref:`request_response_attr`.
 
 Automating repetitive configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -811,7 +822,9 @@ it up and calling :meth:`~pyramid.config.Configurator.add_directive` from
 within a function called when another user uses the
 :meth:`~pyramid.config.Configurator.include` method against your code.
 
-See also :ref:`add_directive`.
+.. seealso::
+
+    See also :ref:`add_directive`.
 
 Programmatic Introspection
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -839,7 +852,9 @@ callable:
         route_intr = introspector.get('routes', route_name)
         return Response(str(route_intr['pattern']))
 
-See also :ref:`using_introspection`.
+.. seealso::
+
+    See also :ref:`using_introspection`.
 
 Python 3 Compatibility
 ~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index eb12f67ef..62b91de0e 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -898,15 +898,22 @@ returns the HTML in a :term:`response`.
      a server restart to reload them.  Production applications should use
      ``pyramid.reload_templates = False``.
 
-.. seealso:: See also :ref:`views_which_use_a_renderer` for more information
+.. seealso::
+
+    See also :ref:`views_which_use_a_renderer` for more information
     about how views, renderers, and templates relate and cooperate.
 
-.. seealso:: Pyramid can also dynamically reload changed Python files.  For
-    more on this see :ref:`reloading_code`.
+.. seealso::
+
+    Pyramid can also dynamically reload changed Python files.  See also
+    :ref:`reloading_code`.
+
+.. seealso::
 
-.. seealso:: The :ref:`debug_toolbar` provides interactive access to your
-   application's internals and, should an exception occur, allows interactive
-   access to traceback execution stack frames from the Python interpreter.
+    See also the :ref:`debug_toolbar`, which provides interactive access to
+    your application's internals and, should an exception occur, allows
+    interactive access to traceback execution stack frames from the Python
+    interpreter.
 
 .. index::
    single: static directory
diff --git a/docs/narr/resources.rst b/docs/narr/resources.rst
index f3ff1dc4c..6139154ff 100644
--- a/docs/narr/resources.rst
+++ b/docs/narr/resources.rst
@@ -673,8 +673,11 @@ Calling ``find_interface(b, Thing2)`` will return the ``b`` resource.
 The second argument to find_interface may also be a :term:`interface` instead
 of a class.  If it is an interface, each resource in the lineage is checked
 to see if the resource implements the specificed interface (instead of seeing
-if the resource is of a class).  See also
-:ref:`resources_which_implement_interfaces`.
+if the resource is of a class).
+
+.. seealso::
+
+    See also :ref:`resources_which_implement_interfaces`.
 
 .. index::
    single: resource API functions
diff --git a/docs/narr/security.rst b/docs/narr/security.rst
index 9e6fb6c82..8db23a33b 100644
--- a/docs/narr/security.rst
+++ b/docs/narr/security.rst
@@ -113,9 +113,11 @@ authorization policies, it is an error to configure a Pyramid application
 with an authentication policy but without the authorization policy or vice
 versa.  If you do this, you'll receive an error at application startup time.
 
-See also the :mod:`pyramid.authorization` and
-:mod:`pyramid.authentication` modules for alternate implementations
-of authorization and authentication policies.  
+.. seealso::
+
+    See also the :mod:`pyramid.authorization` and
+    :mod:`pyramid.authentication` modules for alternate implementations of
+    authorization and authentication policies.
 
 .. index::
    single: permissions
@@ -495,8 +497,14 @@ is said to be *location-aware*.  Location-aware objects define an
 ``__parent__`` attribute which points at their parent object.  The
 root object's ``__parent__`` is ``None``.
 
-See :ref:`location_module` for documentations of functions which use
-location-awareness.  See also :ref:`location_aware`.
+.. seealso::
+
+    See also :ref:`location_module` for documentations of functions which use
+    location-awareness.
+
+.. seealso::
+
+    See also :ref:`location_aware`.
 
 .. index::
    single: forbidden view
diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index 00fc21634..038dd2594 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -320,7 +320,11 @@ template renderer:
    in Chameleon, not in Mako templates.
 
 Similar renderer configuration can be done imperatively.  See
-:ref:`views_which_use_a_renderer`.  See also :ref:`built_in_renderers`.
+:ref:`views_which_use_a_renderer`.
+
+.. seealso::
+
+    See also :ref:`built_in_renderers`.
 
 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
diff --git a/docs/narr/testing.rst b/docs/narr/testing.rst
index 5a5bf8fad..e001ad81c 100644
--- a/docs/narr/testing.rst
+++ b/docs/narr/testing.rst
@@ -319,8 +319,10 @@ registering resources at paths, registering event listeners, registering
 views and view permissions, and classes representing "dummy" implementations
 of a request and a resource.
 
-See also the various methods of the :term:`Configurator` documented in
-:ref:`configuration_module` that begin with the ``testing_`` prefix.
+.. seealso::
+
+    See also the various methods of the :term:`Configurator` documented in
+    :ref:`configuration_module` that begin with the ``testing_`` prefix.
 
 .. index::
    single: integration tests
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index 96ee5758e..87a962a9a 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -1183,9 +1183,10 @@ still easily do it by wrapping it in classmethod call.
 Same will work with staticmethod, just use ``staticmethod`` instead of
 ``classmethod``.
 
+.. seealso::
 
-See also :class:`pyramid.interfaces.IRoute` for more API documentation about
-route objects.
+    See also :class:`pyramid.interfaces.IRoute` for more API documentation
+    about route objects.
 
 .. index::
    single: route factory
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index 84fde3f01..adc53bd11 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -118,8 +118,9 @@ Non-Predicate Arguments
 
 ``renderer``
   Denotes the :term:`renderer` implementation which will be used to construct
-  a :term:`response` from the associated view callable's return value. (see
-  also :ref:`renderers_chapter`).
+  a :term:`response` from the associated view callable's return value.
+  
+  .. seealso:: See also :ref:`renderers_chapter`.
 
   This is either a single string term (e.g. ``json``) or a string implying a
   path or :term:`asset specification` (e.g. ``templates/views.pt``) naming a
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 65fd002d5..2d4e679f8 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -49,7 +49,7 @@ production support in October 2011.)
     some optional C extensions for performance. With ``easy_install``, Windows
     users can get these extensions without needing a C compiler.
 
-.. seealso:: See Also:
+.. seealso:: See also:
     :ref:`Quick Tutorial section on Requirements <qtut_requirements>`,
     :ref:`installing_unix`,
     :ref:`Before You Install <installing_chapter>`, and
@@ -92,7 +92,7 @@ in Pyramid development. Building an application from loosely-coupled
 parts via :doc:`../narr/configuration` is a central idea in Pyramid,
 one that we will revisit regurlarly in this *Quick Tour*.
 
-.. seealso:: See Also:
+.. seealso:: See also:
    :ref:`Quick Tutorial Hello World <qtut_hello_world>`,
    :ref:`firstapp_chapter`, and
    :ref:`Single File Tasks tutorial <tutorials:single-file-tutorial>`
@@ -125,7 +125,7 @@ the name is included in the body of the response::
 
 Finally, we set the response's content type and return the Response.
 
-.. seealso:: See Also:
+.. seealso:: See also:
     :ref:`Quick Tutorial Request and Response <qtut_request_response>`
     and
     :ref:`webob_chapter`
@@ -178,7 +178,7 @@ configuration`, in which a Python :term:`decorator` is placed on the
 line above the view. Both approaches result in the same final
 configuration, thus usually, it is simply a matter of taste.
 
-.. seealso:: See Also:
+.. seealso:: See also:
    :ref:`Quick Tutorial Views <qtut_views>`,
    :doc:`../narr/views`,
    :doc:`../narr/viewconfig`, and
@@ -226,7 +226,7 @@ view:
 "replacement patterns" (the curly braces) in the route declaration.
 This information can then be used in your view.
 
-.. seealso:: See Also:
+.. seealso:: See also:
    :ref:`Quick Tutorial Routing <qtut_routing>`,
    :doc:`../narr/urldispatch`,
    :ref:`debug_routematch_section`, and
@@ -277,7 +277,7 @@ Since our view returned ``dict(name=request.matchdict['name'])``,
 we can use ``name`` as a variable in our template via
 ``${name}``.
 
-.. seealso:: See Also:
+.. seealso:: See also:
     :ref:`Quick Tutorial Templating <qtut_templating>`,
     :doc:`../narr/templates`,
     :ref:`debugging_templates`, and
@@ -320,7 +320,7 @@ filename extensions. In this case, changing the extension from ``.pt``
 to ``.jinja2`` passed the view response through the ``pyramid_jinja2``
 renderer.
 
-.. seealso:: See Also:
+.. seealso:: See also:
     :ref:`Quick Tutorial Jinja2 <qtut_jinja2>`,
     `Jinja2 homepage <http://jinja.pocoo.org/>`_, and
     :ref:`pyramid_jinja2 Overview <jinja2:overview>`
@@ -368,7 +368,7 @@ By using ``request.static_url`` to generate the full URL to the static
 assets, you both ensure you stay in sync with the configuration and
 gain refactoring flexibility later.
 
-.. seealso:: See Also:
+.. seealso:: See also:
     :ref:`Quick Tutorial Static Assets <qtut_static_assets>`,
     :doc:`../narr/assets`,
     :ref:`preventing_http_caching`, and
@@ -389,7 +389,7 @@ This wires up a view that returns some data through the JSON
 :term:`renderer`, which calls Python's JSON support to serialize the data
 into JSON and set the appropriate HTTP headers.
 
-.. seealso:: See Also:
+.. seealso:: See also:
     :ref:`Quick Tutorial JSON <qtut_json>`,
     :ref:`views_which_use_a_renderer`,
     :ref:`json_renderer`, and
@@ -446,7 +446,7 @@ have much more to offer:
   ``accept``, ``header``, ``xhr``, ``containment``, and
   ``custom_predicates``
 
-.. seealso:: See Also:
+.. seealso:: See also:
     :ref:`Quick Tutorial View Classes <qtut_view_classes>`,
     :ref:`Quick Tutorial More View Classes <qtut_more_view_classes>`, and
     :ref:`class_as_view`
@@ -497,7 +497,7 @@ configuration. This includes a new way of running your application:
 
 Let's look at ``pserve`` and configuration in more depth.
 
-.. seealso:: See Also:
+.. seealso:: See also:
     :ref:`Quick Tutorial Scaffolds <qtut_scaffolds>`,
     :ref:`project_narr`, and
     :doc:`../narr/scaffolding`
@@ -528,7 +528,7 @@ Most of the work, though, comes from your project's wiring, as
 expressed in the configuration file you supply to ``pserve``. Let's
 take a look at this configuration file.
 
-.. seealso:: See Also:
+.. seealso:: See also:
     :ref:`what_is_this_pserve_thing`
 
 Configuration with ``.ini`` Files
@@ -576,7 +576,7 @@ Additionally, the ``development.ini`` generated by this scaffold wired
 up Python's standard logging. We'll now see in the console, for example,
 a log on every request that comes in, as well traceback information.
 
-.. seealso:: See Also:
+.. seealso:: See also:
     :ref:`Quick Tutorial Application Configuration <qtut_ini>`,
     :ref:`environment_chapter` and
     :doc:`../narr/paste`
@@ -631,7 +631,7 @@ you want to disable this toolbar, no need to change code: you can
 remove it from ``pyramid.includes`` in the relevant ``.ini``
 configuration file.
 
-.. seealso:: See Also:
+.. seealso:: See also:
     :ref:`Quick Tutorial
     pyramid_debugtoolbar <qtut_debugtoolbar>` and
     :ref:`pyramid_debugtoolbar <toolbar:overview>`
@@ -685,7 +685,7 @@ Pyramid supplies helpers for test writing, which we use in the
 test setup and teardown. Our one test imports the view,
 makes a dummy request, and sees if the view returns what we expected.
 
-.. seealso:: See Also:
+.. seealso:: See also:
     :ref:`Quick Tutorial Unit Testing <qtut_unit_testing>`,
     :ref:`Quick Tutorial Functional Testing <qtut_functional_testing>`,
     and
@@ -732,7 +732,7 @@ visit ``http://localhost:6543`` your console will now show::
 
  2013-08-09 10:42:42,968 DEBUG [hello_world.views][MainThread] Some Message
 
-.. seealso:: See Also:
+.. seealso:: See also:
     :ref:`Quick Tutorial Logging <qtut_logging>` and
     :ref:`logging_chapter`
 
@@ -780,7 +780,7 @@ Jinja2 template:
     :start-after: Start Sphinx Include 1
     :end-before: End Sphinx Include 1
 
-.. seealso:: See Also:
+.. seealso:: See also:
     :ref:`Quick Tutorial Sessions <qtut_sessions>`,
     :ref:`sessions_chapter`, :ref:`flash_messages`,
     :ref:`session_module`, and :term:`pyramid_redis_sessions`.
@@ -828,7 +828,7 @@ of the system, can then easily get at the data thanks to SQLAlchemy:
     :start-after: Start Sphinx Include
     :end-before: End Sphinx Include
 
-.. seealso:: See Also:
+.. seealso:: See also:
     :ref:`Quick Tutorial Databases <qtut_databases>`,
     `SQLAlchemy <http://www.sqlalchemy.org/>`_,
     :ref:`making_a_console_script`,
@@ -891,7 +891,7 @@ Also, the ``deform_bootstrap`` Pyramid add-on restyles the stock Deform
 widgets using attractive CSS from Bootstrap and more powerful widgets
 from Chosen.
 
-.. seealso:: See Also:
+.. seealso:: See also:
     :ref:`Quick Tutorial Forms <qtut_forms>`,
     :ref:`Deform <deform:overview>`,
     :ref:`Colander <colander:overview>`, and
diff --git a/docs/quick_tutorial/authentication.rst b/docs/quick_tutorial/authentication.rst
index 8380a75ed..4b4eb1ba3 100644
--- a/docs/quick_tutorial/authentication.rst
+++ b/docs/quick_tutorial/authentication.rst
@@ -130,5 +130,5 @@ Extra Credit
    onto each request? Use ``import pdb; pdb.set_trace()`` to answer
    this.
 
-.. seealso:: :ref:`security_chapter`,
-   :ref:`AuthTktAuthenticationPolicy <authentication_module>`
+.. seealso:: See also :ref:`security_chapter`,
+   :ref:`AuthTktAuthenticationPolicy <authentication_module>`.
diff --git a/docs/quick_tutorial/debugtoolbar.rst b/docs/quick_tutorial/debugtoolbar.rst
index d25588c49..9a37c5f0e 100644
--- a/docs/quick_tutorial/debugtoolbar.rst
+++ b/docs/quick_tutorial/debugtoolbar.rst
@@ -86,4 +86,4 @@ start to experience otherwise inexplicable client-side weirdness, you can shut
 it off by commenting out the ``pyramid_debugtoolbar`` line in
 ``pyramid.includes`` temporarily.
 
-.. seealso:: See Also: :ref:`pyramid_debugtoolbar <toolbar:overview>`
+.. seealso:: See also :ref:`pyramid_debugtoolbar <toolbar:overview>`.
diff --git a/docs/quick_tutorial/logging.rst b/docs/quick_tutorial/logging.rst
index 0167e5249..855ded59f 100644
--- a/docs/quick_tutorial/logging.rst
+++ b/docs/quick_tutorial/logging.rst
@@ -76,4 +76,4 @@ visit http://localhost:6543 your console will now show::
 Also, if you have configured your Pyramid application to use the
 ``pyramid_debugtoolbar``, logging statements appear in one of its menus.
 
-.. seealso:: See Also: :ref:`logging_chapter`
+.. seealso:: See also :ref:`logging_chapter`.
diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst
index 234e4aa0d..df920ea39 100644
--- a/docs/quick_tutorial/requirements.rst
+++ b/docs/quick_tutorial/requirements.rst
@@ -240,7 +240,7 @@ during this tutorial:
     some optional C extensions for performance. With ``easy_install``, Windows
     users can get these extensions without needing a C compiler.
 
-.. seealso:: See Also: :ref:`installing_unix`. For instructions to set up your
+.. seealso:: See also :ref:`installing_unix`. For instructions to set up your
     Python environment for development using Windows or Python 2, see Pyramid's
     :ref:`Before You Install <installing_chapter>`.
 
diff --git a/docs/quick_tutorial/tutorial_approach.rst b/docs/quick_tutorial/tutorial_approach.rst
index 52d768306..204d388b0 100644
--- a/docs/quick_tutorial/tutorial_approach.rst
+++ b/docs/quick_tutorial/tutorial_approach.rst
@@ -4,9 +4,9 @@ Tutorial Approach
 
 This tutorial uses conventions to keep the introduction focused and
 concise. Details, references, and deeper discussions are mentioned in
-"See Also" notes.
+"See also" notes.
 
-.. seealso:: This is an example "See Also" note.
+.. seealso:: This is an example "See also" note.
 
 This "Getting Started" tutorial is broken into independent steps,
 starting with the smallest possible "single file WSGI app" example.
@@ -42,4 +42,4 @@ Each of the first-level directories (e.g. ``request_response``) is a
 *Python project* (except, as noted, the ``hello_world`` step.) The
 ``tutorial`` directory is a *Python package*. At the end of each step,
 we copy a previous directory into a new directory to use as a starting
-point.
\ No newline at end of file
+point.
diff --git a/docs/quick_tutorial/unit_testing.rst b/docs/quick_tutorial/unit_testing.rst
index ed33f62d7..f8a33b39d 100644
--- a/docs/quick_tutorial/unit_testing.rst
+++ b/docs/quick_tutorial/unit_testing.rst
@@ -116,4 +116,4 @@ Extra Credit
 #. Why do we import the ``hello_world`` view function *inside* the
    ``test_hello_world`` method instead of at the top of the module?
 
-.. seealso:: See Also: :ref:`testing_chapter`
+.. seealso:: See also :ref:`testing_chapter`
diff --git a/docs/whatsnew-1.0.rst b/docs/whatsnew-1.0.rst
index 8750863e7..9541f0a28 100644
--- a/docs/whatsnew-1.0.rst
+++ b/docs/whatsnew-1.0.rst
@@ -114,8 +114,11 @@ Scaffold Improvements
   scaffolds now use a default "commit veto" hook when configuring the
   ``repoze.tm2`` transaction manager in ``development.ini``.  This prevents a
   transaction from being committed when the response status code is within
-  the 400 or 500 ranges.  See also
-  http://docs.repoze.org/tm2/#using-a-commit-veto.
+  the 400 or 500 ranges.
+  
+  .. seealso::
+     
+     See also http://docs.repoze.org/tm2/#using-a-commit-veto.
 
 Terminology Changes
 ~~~~~~~~~~~~~~~~~~~
diff --git a/docs/whatsnew-1.1.rst b/docs/whatsnew-1.1.rst
index 086c12ca2..99737b6d8 100644
--- a/docs/whatsnew-1.1.rst
+++ b/docs/whatsnew-1.1.rst
@@ -454,10 +454,13 @@ Deprecations and Behavior Differences
                      renderer='some/renderer.pt')
 
   This deprecation was done to reduce confusion observed in IRC, as well as
-  to (eventually) reduce documentation burden (see also
-  https://github.com/Pylons/pyramid/issues/164).  A deprecation warning is
-  now issued when any view-related parameter is passed to
-  ``add_route``.
+  to (eventually) reduce documentation burden.  A deprecation warning is
+  now issued when any view-related parameter is passed to ``add_route``.
+  
+  .. seealso::
+  
+     See also `issue #164 on GitHub
+     <https://github.com/Pylons/pyramid/issues/164>`_.
 
 - Passing an ``environ`` dictionary to the ``__call__`` method of a
   "traverser" (e.g. an object that implements
@@ -537,8 +540,12 @@ Deprecations and Behavior Differences
   subdirectory, the ``index.html`` of that subdirectory would not be served
   properly.  Instead, a redirect to ``/subdir`` would be issued.  This has
   been fixed, and now visiting a subdirectory that contains an ``index.html``
-  within a static view returns the index.html properly.  See also
-  https://github.com/Pylons/pyramid/issues/67.
+  within a static view returns the index.html properly.
+  
+  .. seealso::
+  
+     See also `issue #67 on GitHub
+     <https://github.com/Pylons/pyramid/issues/67>`_.
 
 - Deprecated the ``pyramid.config.Configurator.set_renderer_globals_factory``
   method and the ``renderer_globals`` Configurator constructor parameter.
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 19c47cbd9..32cf82fba 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -181,8 +181,11 @@ class Configurator(
     By default, ``default_permission`` is ``None``, meaning that view
     configurations which do not explicitly declare a permission will
     always be executable by entirely anonymous users (any
-    authorization policy in effect is ignored).  See also
-    :ref:`setting_a_default_permission`.
+    authorization policy in effect is ignored).
+    
+    .. seealso::
+
+        See also :ref:`setting_a_default_permission`.
 
     If ``session_factory`` is passed, it should be an object which
     implements the :term:`session factory` interface.  If a nondefault
diff --git a/pyramid/config/factories.py b/pyramid/config/factories.py
index 774125821..1990c377a 100644
--- a/pyramid/config/factories.py
+++ b/pyramid/config/factories.py
@@ -186,9 +186,9 @@ class FactoriesConfiguratorMixin(object):
         """ Add a property to the request object.
 
         .. deprecated:: 1.5
-           :meth:`pyramid.config.Configurator.add_request_method` should be
-           used instead.  (This method was docs-deprecated in 1.4 and
-           issues a real deprecation warning in 1.5).
+            :meth:`pyramid.config.Configurator.add_request_method` should be
+            used instead.  (This method was docs-deprecated in 1.4 and
+            issues a real deprecation warning in 1.5).
 
         .. versionadded:: 1.3
         """
diff --git a/pyramid/config/routes.py b/pyramid/config/routes.py
index 4fd207600..f1463b50b 100644
--- a/pyramid/config/routes.py
+++ b/pyramid/config/routes.py
@@ -249,22 +249,21 @@ class RoutesConfiguratorMixin(object):
         custom_predicates
 
           .. deprecated:: 1.5
-
-          This value should be a sequence of references to custom
-          predicate callables.  Use custom predicates when no set of
-          predefined predicates does what you need.  Custom predicates
-          can be combined with predefined predicates as necessary.
-          Each custom predicate callable should accept two arguments:
-          ``info`` and ``request`` and should return either ``True``
-          or ``False`` after doing arbitrary evaluation of the info
-          and/or the request.  If all custom and non-custom predicate
-          callables return ``True`` the associated route will be
-          considered viable for a given request.  If any predicate
-          callable returns ``False``, route matching continues.  Note
-          that the value ``info`` passed to a custom route predicate
-          is a dictionary containing matching information; see
-          :ref:`custom_route_predicates` for more information about
-          ``info``.
+              This value should be a sequence of references to custom
+              predicate callables.  Use custom predicates when no set of
+              predefined predicates does what you need.  Custom predicates
+              can be combined with predefined predicates as necessary.
+              Each custom predicate callable should accept two arguments:
+              ``info`` and ``request`` and should return either ``True``
+              or ``False`` after doing arbitrary evaluation of the info
+              and/or the request.  If all custom and non-custom predicate
+              callables return ``True`` the associated route will be
+              considered viable for a given request.  If any predicate
+              callable returns ``False``, route matching continues.  Note
+              that the value ``info`` passed to a custom route predicate
+              is a dictionary containing matching information; see
+              :ref:`custom_route_predicates` for more information about
+              ``info``.
 
         predicates
 
diff --git a/pyramid/config/security.py b/pyramid/config/security.py
index 6a1257b6a..81549cbfc 100644
--- a/pyramid/config/security.py
+++ b/pyramid/config/security.py
@@ -112,7 +112,9 @@ class SecurityConfiguratorMixin(object):
           permission is ignored, and the view is registered, making it
           available to all callers regardless of their credentials.
 
-        See also :ref:`setting_a_default_permission`.
+        .. seealso::
+
+            See also :ref:`setting_a_default_permission`.
 
         .. note::
 
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index cdad7e85e..1ef4efdb3 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -1035,18 +1035,20 @@ class ViewsConfiguratorMixin(object):
 
         custom_predicates
 
-          .. deprecated:: 1.5
-
-          This value should be a sequence of references to custom predicate
-          callables.  Use custom predicates when no set of predefined
-          predicates do what you need.  Custom predicates can be combined with
-          predefined predicates as necessary.  Each custom predicate callable
-          should accept two arguments: ``context`` and ``request`` and should
-          return either ``True`` or ``False`` after doing arbitrary evaluation
-          of the context and/or the request.  The ``predicates`` argument to
-          this method and the ability to register third-party view predicates
-          via :meth:`pyramid.config.Configurator.add_view_predicate` obsoletes
-          this argument, but it is kept around for backwards compatibility.
+            .. deprecated:: 1.5
+                This value should be a sequence of references to custom
+                predicate callables.  Use custom predicates when no set of
+                predefined predicates do what you need.  Custom predicates
+                can be combined with predefined predicates as necessary. 
+                Each custom predicate callable should accept two arguments:
+                ``context`` and ``request`` and should return either
+                ``True`` or ``False`` after doing arbitrary evaluation of
+                the context and/or the request.  The ``predicates`` argument
+                to this method and the ability to register third-party view
+                predicates via
+                :meth:`pyramid.config.Configurator.add_view_predicate`
+                obsoletes this argument, but it is kept around for backwards
+                compatibility.
 
         predicates
 
@@ -1744,7 +1746,9 @@ class ViewsConfiguratorMixin(object):
         the default view mapper to be used by all subsequent :term:`view
         configuration` registrations.
 
-        See also :ref:`using_a_view_mapper`.
+        .. seealso::
+
+            See also :ref:`using_a_view_mapper`.
 
         .. note::
 
diff --git a/pyramid/events.py b/pyramid/events.py
index 5179ab08a..97375638e 100644
--- a/pyramid/events.py
+++ b/pyramid/events.py
@@ -235,7 +235,9 @@ class BeforeRender(dict):
     For a description of the values present in the renderer globals dictionary,
     see :ref:`renderer_system_values`.
 
-    See also :class:`pyramid.interfaces.IBeforeRender`.
+    .. seealso::
+
+        See also :class:`pyramid.interfaces.IBeforeRender`.
     """
     def __init__(self, system, rendering_val=None):
         dict.__init__(self, system)
diff --git a/pyramid/i18n.py b/pyramid/i18n.py
index aaba769c6..4c8f4b55d 100644
--- a/pyramid/i18n.py
+++ b/pyramid/i18n.py
@@ -25,10 +25,10 @@ from pyramid.threadlocal import get_current_registry
 class Localizer(object):
     """
     An object providing translation and pluralizations related to
-     the current request's locale name.  A
-     :class:`pyramid.i18n.Localizer` object is created using the
-     :func:`pyramid.i18n.get_localizer` function.
-     """
+    the current request's locale name.  A
+    :class:`pyramid.i18n.Localizer` object is created using the
+    :func:`pyramid.i18n.get_localizer` function.
+    """
     def __init__(self, locale_name, translations):
         self.locale_name = locale_name
         self.translations = translations
@@ -158,9 +158,11 @@ def negotiate_locale_name(request):
     return locale_name
 
 def get_locale_name(request):
-    """ Return the :term:`locale name` associated with the current
-    request.  Deprecated in favor of using request.locale_name directly as of
-    Pyramid 1.5."""
+    """
+    .. deprecated:: 1.5
+        Use :attr:`pyramid.request.Request.locale_name` directly instead.
+        Return the :term:`locale name` associated with the current request.
+    """
     return request.locale_name
 
 def make_localizer(current_locale_name, translation_directories):
@@ -207,9 +209,12 @@ def make_localizer(current_locale_name, translation_directories):
                           translations=translations)
 
 def get_localizer(request):
-    """ Retrieve a :class:`pyramid.i18n.Localizer` object
-    corresponding to the current request's locale name.  Deprecated in favor
-    of using the ``request.localizer`` attribute directly as of Pyramid 1.5"""
+    """
+    .. deprecated:: 1.5
+        Use the :attr:`pyramid.request.Request.localizer` attribute directly
+        instead.  Retrieve a :class:`pyramid.i18n.Localizer` object
+        corresponding to the current request's locale name.
+    """
     return request.localizer
 
 class Translations(gettext.GNUTranslations, object):
diff --git a/pyramid/interfaces.py b/pyramid/interfaces.py
index cf651cf1e..75b9b1cb9 100644
--- a/pyramid/interfaces.py
+++ b/pyramid/interfaces.py
@@ -361,7 +361,9 @@ class IBeforeRender(IDict):
       def add_global(event):
           event['mykey'] = 'foo'
 
-    See also :ref:`beforerender_event`.
+    .. seealso::
+
+        See also :ref:`beforerender_event`.
     """
     rendering_val = Attribute('The value returned by a view or passed to a '
                               '``render`` method for this rendering. '
@@ -767,10 +769,10 @@ class IResourceURL(Interface):
         )
 
 class IContextURL(IResourceURL):
-    """ An adapter which deals with URLs related to a context.
-
+    """
     .. deprecated:: 1.3
-       use IResourceURL instead.
+        An adapter which deals with URLs related to a context.  Use
+        :class:`pyramid.interfaces.IResourceURL` instead.
     """
     # this class subclasses IResourceURL because request.resource_url looks
     # for IResourceURL via queryAdapter.  queryAdapter will find a deprecated
diff --git a/pyramid/renderers.py b/pyramid/renderers.py
index 88ef285a0..108255ee4 100644
--- a/pyramid/renderers.py
+++ b/pyramid/renderers.py
@@ -341,7 +341,9 @@ class JSONP(JSON):
 
     .. versionadded:: 1.1
 
-    See also: :ref:`jsonp_renderer`.
+    .. seealso::
+
+        See also :ref:`jsonp_renderer`.
     """
 
     def __init__(self, param_name='callback', **kw):
diff --git a/pyramid/request.py b/pyramid/request.py
index 188e968ac..f8514066e 100644
--- a/pyramid/request.py
+++ b/pyramid/request.py
@@ -66,7 +66,9 @@ class CallbackMethodsMixin(object):
         will be propagated to the caller of the :app:`Pyramid`
         router application.
 
-        See also: :ref:`using_response_callbacks`.
+        .. seealso::
+
+            See also :ref:`using_response_callbacks`.
         """
 
         callbacks = self.response_callbacks
@@ -124,7 +126,9 @@ class CallbackMethodsMixin(object):
         They will be propagated to the caller of the :app:`Pyramid`
         router application.
 
-        See also: :ref:`using_finished_callbacks`.
+        .. seealso::
+
+            See also :ref:`using_finished_callbacks`.
         """
 
         callbacks = self.finished_callbacks
diff --git a/pyramid/router.py b/pyramid/router.py
index 6239f3980..ba4f85b18 100644
--- a/pyramid/router.py
+++ b/pyramid/router.py
@@ -183,46 +183,16 @@ class Router(object):
         return response
 
     def invoke_subrequest(self, request, use_tweens=False):
-        """
-        Obtain a response object from the Pyramid application based on
+        """Obtain a response object from the Pyramid application based on
         information in the ``request`` object provided.  The ``request``
         object must be an object that implements the Pyramid request
         interface (such as a :class:`pyramid.request.Request` instance).  If
         ``use_tweens`` is ``True``, the request will be sent to the
         :term:`tween` in the tween stack closest to the request ingress.  If
         ``use_tweens`` is ``False``, the request will be sent to the main
-        router handler, and no tweens will be invoked.  This function also:
+        router handler, and no tweens will be invoked.
         
-        - manages the threadlocal stack (so that
-          :func:`~pyramid.threadlocal.get_current_request` and
-          :func:`~pyramid.threadlocal.get_current_registry` work during a
-          request)
-
-        - Adds a ``registry`` attribute and a ``invoke_subrequest`` attribute
-          (a callable) to the request object it's handed.
-
-        - sets request extensions (such as those added via
-          :meth:`~pyramid.config.Configurator.add_request_method` or
-          :meth:`~pyramid.config.Configurator.set_request_property`) on the
-          request it's passed.
-
-        - causes a :class:`~pyramid.event.NewRequest` event to be sent at the
-          beginning of request processing.
-
-        - causes a :class:`~pyramid.event.ContextFound` event to be sent
-          when a context resource is found.
-          
-        - Calls any :term:`response callback` functions defined within the
-          request's lifetime if a response is obtained from the Pyramid
-          application.
-
-        - causes a :class:`~pyramid.event.NewResponse` event to be sent if a
-          response is obtained.
-
-        - Calls any :term:`finished callback` functions defined within the
-          request's lifetime.
-
-        See also :ref:`subrequest_chapter`.
+        See the API for pyramid.request for complete documentation.
         """
         registry = self.registry
         has_listeners = self.registry.has_listeners
diff --git a/pyramid/security.py b/pyramid/security.py
index 58fa9332a..848574233 100644
--- a/pyramid/security.py
+++ b/pyramid/security.py
@@ -44,15 +44,15 @@ def _get_authentication_policy(request):
 
 def has_permission(permission, context, request):
     """
-    A function that calls
-    :meth:`pyramid.request.Request.has_permission` and returns its result.
+    A function that calls :meth:`pyramid.request.Request.has_permission`
+    and returns its result.
     
     .. deprecated:: 1.5
-       Use :meth:`pyramid.request.Request.has_permission` instead.
+        Use :meth:`pyramid.request.Request.has_permission` instead.
 
     .. versionchanged:: 1.5a3
-       If context is None, then attempt to use the context attribute
-       of self, if not set then the  AttributeError is propergated.
+        If context is None, then attempt to use the context attribute of self;
+        if not set, then the AttributeError is propagated.
     """    
     return request.has_permission(permission, context)
 
@@ -87,7 +87,7 @@ def unauthenticated_userid(request):
     :attr:`pyramid.request.Request.unauthenticated_userid`.
     
     .. deprecated:: 1.5
-       Use :attr:`pyramid.request.Request.unauthenticated_userid` instead.
+        Use :attr:`pyramid.request.Request.unauthenticated_userid` instead.
     """        
     return request.unauthenticated_userid
 
@@ -104,7 +104,7 @@ def effective_principals(request):
     :attr:`pyramid.request.Request.effective_principals`.
     
     .. deprecated:: 1.5
-       Use :attr:`pyramid.request.Request.effective_principals` instead.
+        Use :attr:`pyramid.request.Request.effective_principals` instead.
     """            
     return request.effective_principals
 
@@ -162,7 +162,7 @@ def forget(request):
     always return an empty sequence.
 
     .. deprecated:: 1.5
-       Use :meth:`pyramid.request.Request.get_logout_headers` instead.
+        Use :meth:`pyramid.request.Request.get_logout_headers` instead.
     """            
     policy = _get_authentication_policy(request)
     if policy is None:
diff --git a/pyramid/session.py b/pyramid/session.py
index e3ce4a090..3a045b91b 100644
--- a/pyramid/session.py
+++ b/pyramid/session.py
@@ -381,11 +381,11 @@ def UnencryptedCookieSessionFactoryConfig(
     ):
     """
     .. deprecated:: 1.5
-       Use :func:`pyramid.session.SignedCookieSessionFactory` instead.
-       Caveat: Cookies generated using ``SignedCookieSessionFactory`` are not
-       compatible with cookies generated using
-       ``UnencryptedCookieSessionFactory``, so existing user session data will
-       be destroyed if you switch to it.
+        Use :func:`pyramid.session.SignedCookieSessionFactory` instead.
+        Caveat: Cookies generated using ``SignedCookieSessionFactory`` are not
+        compatible with cookies generated using
+        ``UnencryptedCookieSessionFactory``, so existing user session data
+        will be destroyed if you switch to it.
     
     Configure a :term:`session factory` which will provide unencrypted
     (but signed) cookie-based sessions.  The return value of this
diff --git a/pyramid/url.py b/pyramid/url.py
index 78dd297d5..bf4d4ff48 100644
--- a/pyramid/url.py
+++ b/pyramid/url.py
@@ -442,8 +442,11 @@ class URLMethodsMixin(object):
 
         If the ``resource`` passed in has a ``__resource_url__`` method, it
         will be used to generate the URL (scheme, host, port, path) for the
-        base resource which is operated upon by this function.  See also
-        :ref:`overriding_resource_url_generation`.
+        base resource which is operated upon by this function.
+        
+        .. seealso::
+
+            See also :ref:`overriding_resource_url_generation`.
 
         .. versionadded:: 1.5
            ``route_name``, ``route_kw``, and ``route_remainder_name``
diff --git a/pyramid/view.py b/pyramid/view.py
index 55ab38871..02ac8849f 100644
--- a/pyramid/view.py
+++ b/pyramid/view.py
@@ -162,12 +162,16 @@ class view_config(object):
     in a class or module context.  It's not often used, but it can be useful
     in this circumstance.  See the ``attach`` function in Venusian for more
     information.
+    
+    .. seealso::
+    
+        See also :ref:`mapping_views_using_a_decorator_section` for
+        details about using :class:`pyramid.view.view_config`.
 
-    See :ref:`mapping_views_using_a_decorator_section` for details about
-    using :class:`pyramid.view.view_config`.
-
-    ATTENTION: ``view_config`` will work ONLY on module top level members
-    because of the limitation of ``venusian.Scanner.scan``.
+    .. warning::
+    
+        ``view_config`` will work ONLY on module top level members
+        because of the limitation of ``venusian.Scanner.scan``.
 
     """
     venusian = venusian # for testing injection
@@ -245,6 +249,8 @@ class AppendSlashNotFoundViewFactory(object):
     view callable calling convention of ``(context, request)``
     (``context`` will be the exception object).
 
+    .. deprecated:: 1.3
+
     """
     def __init__(self, notfound_view=None):
         if notfound_view is None:
@@ -286,7 +292,7 @@ view as the Not Found view::
   from pyramid.view import append_slash_notfound_view
   config.add_view(append_slash_notfound_view, context=HTTPNotFound)
 
-See also :ref:`changing_the_notfound_view`.
+.. deprecated:: 1.3
 
 """
 
-- 
cgit v1.2.3


From 606a54cc890b345fc001b603a23f7990c9c58407 Mon Sep 17 00:00:00 2001
From: Antti Haapala <antti@haapala.name>
Date: Sun, 16 Feb 2014 16:13:39 +0200
Subject: Fix pserve --reload on Py3 (the simple solution)

This is the simpler fix for `pserve --reload` (so please pull either https://github.com/Pylons/pyramid/pull/1244 or this).

Basically with some project setups the reloader thread is guaranteed to crash on Python 3 as the main thread is importing modules in the other thread.
---
 pyramid/scripts/pserve.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py
index 03cbc23ab..ea125a0dd 100644
--- a/pyramid/scripts/pserve.py
+++ b/pyramid/scripts/pserve.py
@@ -811,7 +811,7 @@ class Monitor(object): # pragma: no cover
                 print(
                     "Error calling reloader callback %r:" % file_callback)
                 traceback.print_exc()
-        for module in sys.modules.values():
+        for module in list(sys.modules.values()):
             try:
                 filename = module.__file__
             except (AttributeError, ImportError):
-- 
cgit v1.2.3


From a0e97bad8ad2b1657ab99dca657a6522b2be0639 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Sun, 16 Feb 2014 10:52:19 -0500
Subject: Changelog for PR #1245.

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

diff --git a/CHANGES.txt b/CHANGES.txt
index cefb2318d..84d0694e3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,9 @@
+Unreleased
+==========
+
+- Avoid crash in ``pserve --reload`` under Py3k, when iterating over posiibly
+  mutated ``sys.modules``.
+
 1.5b1 (2014-02-08)
 ==================
 
-- 
cgit v1.2.3


From 2292ae27dc0061f524a59a5e25b4578b0885d4b9 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Sun, 16 Feb 2014 20:53:27 -0500
Subject: Clarify reasons for preferring easy_install over pip.

---
 docs/quick_tutorial/requirements.rst | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst
index df920ea39..fa5263856 100644
--- a/docs/quick_tutorial/requirements.rst
+++ b/docs/quick_tutorial/requirements.rst
@@ -226,25 +226,27 @@ during this tutorial:
     # Mac and Linux
     $ $VENV/bin/easy_install nose webtest deform sqlalchemy \
        pyramid_chameleon pyramid_debugtoolbar waitress \
-       pyramid_jinja2 pyramid_tm zope.sqlalchemy
+       pyramid_tm zope.sqlalchemy
 
     # Windows
     c:\> %VENV%\Scripts\easy_install nose webtest deform sqlalchemy pyramid_chameleon
 
-
-
 .. note::
 
     Why ``easy_install`` and not ``pip``? Pyramid encourages use of namespace
-    packages which, until recently, ``pip`` didn't permit. Also, Pyramid has
-    some optional C extensions for performance. With ``easy_install``, Windows
-    users can get these extensions without needing a C compiler.
+    packages, for which ``pip``'s support is less-than-optimal. Also, Pyramid's
+    dependencies use some optional C extensions for performance:   with
+    ``easy_install``, Windows users can get these extensions without needing
+    a C compiler (``pip`` does not support installing binary Windows
+    distributions, except for ``wheels``, which are not yet available for
+    all dependencies).
 
 .. seealso:: See also :ref:`installing_unix`. For instructions to set up your
     Python environment for development using Windows or Python 2, see Pyramid's
     :ref:`Before You Install <installing_chapter>`.
 
-    See also Python 3's :mod:`venv module <python3:venv>`, the `setuptools` `installation instructions
+    See also Python 3's :mod:`venv module <python3:venv>`, the `setuptools
+    installation instructions
     <https://pypi.python.org/pypi/setuptools/0.9.8#installation-instructions>`_,
     and `easy_install help <https://pypi.python.org/pypi/setuptools/0.9.8#using-setuptools-and-easyinstall>`_.
 
-- 
cgit v1.2.3


From 0c25b7b36f6c8c43513bd557ac63bdde64168a46 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Sun, 16 Feb 2014 21:05:35 -0500
Subject: Clarify vs. import time.

---
 docs/quick_tutorial/hello_world.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/quick_tutorial/hello_world.rst b/docs/quick_tutorial/hello_world.rst
index c7a8eaf5e..86e1319f0 100644
--- a/docs/quick_tutorial/hello_world.rst
+++ b/docs/quick_tutorial/hello_world.rst
@@ -71,11 +71,11 @@ New to Python web programming? If so, some lines in module merit
 explanation:
 
 #. *Line 11*. The ``if __name__ == '__main__':`` is Python's way of
-   saying "Start here when running from the command line".
+   saying "Start here when running from the command line", rather than
+   when this module is imported.
 
 #. *Lines 12-14*. Use Pyramid's :term:`configurator` to connect
-   :term:`view` code to a particular URL
-   :term:`route`.
+   :term:`view` code to a particular URL :term:`route`.
 
 #. *Lines 6-7*. Implement the view code that generates the
    :term:`response`.
@@ -111,4 +111,4 @@ Extra Credit
    then reload your browser. See the exception in the console?
 
 #. The ``GI`` in ``WSGI`` stands for "Gateway Interface". What web
-   standard is this modelled after?
\ No newline at end of file
+   standard is this modelled after?
-- 
cgit v1.2.3


From c0587cc2fce880950e5da4b34cc23c9df94893a2 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Sun, 16 Feb 2014 21:11:56 -0500
Subject: Avoid re-ambiguating 'project' vs. 'package.

---
 docs/quick_tutorial/package.rst | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/quick_tutorial/package.rst b/docs/quick_tutorial/package.rst
index 90d022b29..8fb052d5b 100644
--- a/docs/quick_tutorial/package.rst
+++ b/docs/quick_tutorial/package.rst
@@ -22,8 +22,7 @@ Explaining it all in this
 tutorial will induce madness. For this tutorial, this is all you need to
 know:
 
-- We will have a directory for each tutorial step as a
-  setuptools *project*
+- We will have a directory for each tutorial step as a setuptools *project*
 
 - This project will contain a ``setup.py`` which injects the features
   of the setuptool's project machinery into the directory
@@ -97,8 +96,8 @@ In this step we have a Python package called ``tutorial``. We use the
 same name in each step of the tutorial, to avoid unnecessary re-typing.
 
 Above this ``tutorial`` directory we have the files that handle the
-packaging of this, well, package. At the moment, all we need is a
-bare-bones ``ini/setup.py``.
+packaging of this project. At the moment, all we need is a
+bare-bones ``setup.py``.
 
 Everything else is the same about our application. We simply made a
 Python package with a ``setup.py`` and installed it in development mode.
-- 
cgit v1.2.3


From 3c6ea2ef47488ef800ed9bc9981726b1dc6f5839 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Sun, 16 Feb 2014 21:20:59 -0500
Subject: Clarifications.

---
 docs/quick_tutorial/ini.rst | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/docs/quick_tutorial/ini.rst b/docs/quick_tutorial/ini.rst
index 618b8e5e8..3402c50e8 100644
--- a/docs/quick_tutorial/ini.rst
+++ b/docs/quick_tutorial/ini.rst
@@ -98,18 +98,16 @@ the Pyramid chapter on
 
 The ``.ini`` file is also used for two other functions:
 
-- *Choice of WSGI server*. ``[server:main]`` wires up the choice of WSGI
-  *server* for your WSGI *application*. In this case, we are using
-  ``wsgiref`` bundled in the Python library.
+- *Configuring the WSGI server*. ``[server:main]`` wires up the choice of
+  which WSGI *server* for your WSGI *application*. In this case, we are using
+  ``wsgiref`` bundled in the Python library.  It also wires up the *port
+  number*:   ``port = 6543`` tells ``wsgiref`` to listen on port 6543.
 
-- *Python logging*. Pyramid uses Python standard logging, which needs a
-  number of configuration values. The ``.ini`` serves this function.
+- *Configuring Python logging*. Pyramid uses Python standard logging, which
+  needs a number of configuration values. The ``.ini`` serves this function.
   This provides the console log output that you see on startup and each
   request.
 
-- *Port number*. ``port = 6543`` tells ``wsgiref`` to listen on port
-  6543.
-
 We moved our startup code from ``app.py`` to the package's
 ``tutorial/__init__.py``. This isn't necessary,
 but it is a common style in Pyramid to take the WSGI app bootstrapping
@@ -131,7 +129,7 @@ Extra Credit
    might you want to do that?
 
 #. The entry point in ``setup.py`` didn't mention ``__init__.py`` when
-   it the ``main`` function. Why not?
+   it declared ``tutorial:main`` function. Why not?
 
 .. seealso::
    :ref:`project_narr`,
-- 
cgit v1.2.3


From ddcc03dc12ee6a82099cee95589cba700b3d7ef4 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Sun, 16 Feb 2014 21:37:20 -0500
Subject: EC: why not add 'pyramid_debugtoolbar' to our 'install_requires'?

---
 docs/quick_tutorial/debugtoolbar.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/quick_tutorial/debugtoolbar.rst b/docs/quick_tutorial/debugtoolbar.rst
index 9a37c5f0e..95cf229b2 100644
--- a/docs/quick_tutorial/debugtoolbar.rst
+++ b/docs/quick_tutorial/debugtoolbar.rst
@@ -39,7 +39,6 @@ Steps
     $ $VENV/bin/python setup.py develop
     $ $VENV/bin/easy_install pyramid_debugtoolbar
 
-
 #. Our ``debugtoolbar/development.ini`` gets a configuration entry for
    ``pyramid.includes``:
 
@@ -87,3 +86,9 @@ it off by commenting out the ``pyramid_debugtoolbar`` line in
 ``pyramid.includes`` temporarily.
 
 .. seealso:: See also :ref:`pyramid_debugtoolbar <toolbar:overview>`.
+
+Extra Credit
+============
+
+# Why don't we add ``pyramid_debugtoolbar`` to the list of
+  ``install_requires`` dependencies in ``debugtoolbar/setup.py``?
-- 
cgit v1.2.3


From fa20e0a093de3961c0f50aff906afd5b6790e673 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Sun, 16 Feb 2014 21:53:54 -0500
Subject: Match optional reqs on Windows to those on POSIX.

---
 docs/quick_tutorial/requirements.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst
index fa5263856..72bb4a4f8 100644
--- a/docs/quick_tutorial/requirements.rst
+++ b/docs/quick_tutorial/requirements.rst
@@ -229,7 +229,8 @@ during this tutorial:
        pyramid_tm zope.sqlalchemy
 
     # Windows
-    c:\> %VENV%\Scripts\easy_install nose webtest deform sqlalchemy pyramid_chameleon
+    c:\> %VENV%\Scripts\easy_install nose webtest deform sqlalchemy pyramid_chameleon pyramid_debugtoolbar waitress pyramid_tm zope.sqlalchemy
+
 
 .. note::
 
-- 
cgit v1.2.3


From f77c69c68665e81ffc89f4aa13f6e9af13df6cb0 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Sun, 16 Feb 2014 22:28:03 -0500
Subject: Don't leave the page broken.

---
 docs/quick_tutorial/debugtoolbar/tutorial/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/quick_tutorial/debugtoolbar/tutorial/__init__.py b/docs/quick_tutorial/debugtoolbar/tutorial/__init__.py
index 0993b25be..d784292ee 100644
--- a/docs/quick_tutorial/debugtoolbar/tutorial/__init__.py
+++ b/docs/quick_tutorial/debugtoolbar/tutorial/__init__.py
@@ -3,7 +3,7 @@ from pyramid.response import Response
 
 
 def hello_world(request):
-    return xResponse('<body><h1>Hello World!</h1></body>')
+    return Response('<body><h1>Hello World!</h1></body>')
 
 
 def main(global_config, **settings):
-- 
cgit v1.2.3


From 76ff93079eac35d529a2a316248b8cca750ef5e4 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Sun, 16 Feb 2014 22:28:33 -0500
Subject: EC:  break the page and see the DBT traceback display.

---
 docs/quick_tutorial/debugtoolbar.rst | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docs/quick_tutorial/debugtoolbar.rst b/docs/quick_tutorial/debugtoolbar.rst
index 95cf229b2..1c540d8a2 100644
--- a/docs/quick_tutorial/debugtoolbar.rst
+++ b/docs/quick_tutorial/debugtoolbar.rst
@@ -92,3 +92,22 @@ Extra Credit
 
 # Why don't we add ``pyramid_debugtoolbar`` to the list of
   ``install_requires`` dependencies in ``debugtoolbar/setup.py``?
+
+# Introduce a bug into your application:  Change:
+
+  .. code-block:: python
+
+    def hello_world(request):
+        return Response('<body><h1>Hello World!</h1></body>')
+
+  to:
+
+  .. code-block:: python
+
+    def hello_world(request):
+        return xResponse('<body><h1>Hello World!</h1></body>')
+
+  Save, and visit http://localhost:6543/ again.  Notice the nice
+  traceback display.  On the lowest line, click the "screen" icon to the
+  right, and try typing the variable names ``request`` and ``Response``.
+  What else can you discover?
-- 
cgit v1.2.3


From 111aef8a7d0e000d6ff65cc15138c2d376b1efc4 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Sun, 16 Feb 2014 22:38:00 -0500
Subject: Trailing commas are good.

---
 docs/quick_tutorial/templating/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/quick_tutorial/templating/setup.py b/docs/quick_tutorial/templating/setup.py
index 2221b72e9..0b71b73e6 100644
--- a/docs/quick_tutorial/templating/setup.py
+++ b/docs/quick_tutorial/templating/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
-    'pyramid_chameleon'
+    'pyramid_chameleon',
 ]
 
 setup(name='tutorial',
@@ -11,4 +11,4 @@ setup(name='tutorial',
       [paste.app_factory]
       main = tutorial:main
       """,
-)
\ No newline at end of file
+)
-- 
cgit v1.2.3


From 3c87ad81b0e846e7d61f86f8a5a6aff6ec3a2b9e Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Sun, 16 Feb 2014 23:00:38 -0500
Subject: Clarify.

---
 docs/quick_tutorial/more_view_classes.rst               | 11 +++++------
 docs/quick_tutorial/more_view_classes/tutorial/views.py |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/quick_tutorial/more_view_classes.rst b/docs/quick_tutorial/more_view_classes.rst
index 21b353b7c..1e5603554 100644
--- a/docs/quick_tutorial/more_view_classes.rst
+++ b/docs/quick_tutorial/more_view_classes.rst
@@ -18,11 +18,10 @@ or a Python class. In this last case, methods on the class can be
 decorated with ``@view_config`` to register the class methods with the
 :term:`configurator` as a view.
 
-So far our views have been simple, free-standing functions. Many times
+At first, our views were simple, free-standing functions. Many times
 your views are related: different ways to look at or work on the same
 data or a REST API that handles multiple operations. Grouping these
-together as a
-:ref:`view class <class_as_view>` makes sense:
+together as a :ref:`view class <class_as_view>` makes sense:
 
 - Group views
 
@@ -30,9 +29,9 @@ together as a
 
 - Share some state and helpers
 
-Pyramid views have
-:ref:`view predicates <view_configuration_parameters>` that
-help determine which view is matched to a request. These predicates
+Pyramid views have :ref:`view predicates <view_configuration_parameters>`
+that determine which view is matched to a request, based on factors
+such as the request method, the form parameters, etc. These predicates
 provide many axes of flexibility.
 
 The following shows a simple example with four operations operations:
diff --git a/docs/quick_tutorial/more_view_classes/tutorial/views.py b/docs/quick_tutorial/more_view_classes/tutorial/views.py
index fdba04ba8..635de0520 100644
--- a/docs/quick_tutorial/more_view_classes/tutorial/views.py
+++ b/docs/quick_tutorial/more_view_classes/tutorial/views.py
@@ -20,7 +20,6 @@ class TutorialViews:
     def home(self):
         return {'page_title': 'Home View'}
 
-
     # Retrieving /howdy/first/last the first time
     @view_config(renderer='hello.pt')
     def hello(self):
@@ -33,7 +32,8 @@ class TutorialViews:
         return {'page_title': 'Edit View', 'new_name': new_name}
 
     # Posting to /home via the "Delete" submit button
-    @view_config(request_param='form.delete', renderer='delete.pt')
+    @view_config(request_method='POST', request_param='form.delete',
+                 renderer='delete.pt')
     def delete(self):
         print ('Deleted')
         return {'page_title': 'Delete View'}
-- 
cgit v1.2.3


From 69b613db258d71caa925f0165030b9974a1610ca Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Fri, 21 Feb 2014 21:51:53 -0600
Subject: test cases to reproduce #1246

---
 pyramid/tests/test_session.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pyramid/tests/test_session.py b/pyramid/tests/test_session.py
index 1ad0729b3..6bce764ca 100644
--- a/pyramid/tests/test_session.py
+++ b/pyramid/tests/test_session.py
@@ -519,7 +519,7 @@ def serialize(data, secret):
     from pyramid.compat import native_
     from pyramid.compat import pickle
     pickled = pickle.dumps(data, pickle.HIGHEST_PROTOCOL)
-    sig = hmac.new(bytes_(secret), pickled, sha1).hexdigest()
+    sig = hmac.new(bytes_(secret, 'utf-8'), pickled, sha1).hexdigest()
     return sig + native_(base64.b64encode(pickled))
 
 class Test_signed_serialize(unittest.TestCase):
@@ -531,6 +531,12 @@ class Test_signed_serialize(unittest.TestCase):
         expected = serialize('123', 'secret')
         result = self._callFUT('123', 'secret')
         self.assertEqual(result, expected)
+
+    def test_it_with_highorder_secret(self):
+        secret = b'La Pe\xc3\xb1a'.decode('utf-8')
+        expected = serialize('123', secret)
+        result = self._callFUT('123', secret)
+        self.assertEqual(result, expected)
         
 class Test_signed_deserialize(unittest.TestCase):
     def _callFUT(self, serialized, secret, hmac=None):
@@ -562,6 +568,12 @@ class Test_signed_deserialize(unittest.TestCase):
         serialized = 'bad' + serialize('123', 'secret')
         self.assertRaises(ValueError, self._callFUT, serialized, 'secret')
 
+    def test_it_with_highorder_secret(self):
+        secret = b'La Pe\xc3\xb1a'.decode('utf-8')
+        serialized = serialize('123', secret)
+        result = self._callFUT(serialized, secret)
+        self.assertEqual(result, '123')
+
 class Test_check_csrf_token(unittest.TestCase):
     def _callFUT(self, *args, **kwargs):
         from ..session import check_csrf_token
-- 
cgit v1.2.3


From adcacf48dbf6eb84a1c1661918f3fb093a929bc2 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Fri, 21 Feb 2014 21:52:14 -0600
Subject: support high-order characters in
 UnencryptedCookieSessionFactoryConfig secrets

---
 CHANGES.txt        | 3 +++
 pyramid/session.py | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 84d0694e3..6372c904d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,9 @@ Unreleased
 - Avoid crash in ``pserve --reload`` under Py3k, when iterating over posiibly
   mutated ``sys.modules``.
 
+- ``UnencryptedCookieSessionFactoryConfig`` failed if the secret contained
+  higher order characters. See https://github.com/Pylons/pyramid/issues/1246
+
 1.5b1 (2014-02-08)
 ==================
 
diff --git a/pyramid/session.py b/pyramid/session.py
index 3a045b91b..d1964c43e 100644
--- a/pyramid/session.py
+++ b/pyramid/session.py
@@ -57,7 +57,7 @@ def signed_serialize(data, secret):
        response.set_cookie('signed_cookie', cookieval)
     """
     pickled = pickle.dumps(data, pickle.HIGHEST_PROTOCOL)
-    sig = hmac.new(bytes_(secret), pickled, hashlib.sha1).hexdigest()
+    sig = hmac.new(bytes_(secret, 'utf-8'), pickled, hashlib.sha1).hexdigest()
     return sig + native_(base64.b64encode(pickled))
 
 def signed_deserialize(serialized, secret, hmac=hmac):
@@ -81,7 +81,9 @@ def signed_deserialize(serialized, secret, hmac=hmac):
         # Badly formed data can make base64 die
         raise ValueError('Badly formed base64 data: %s' % e)
 
-    sig = bytes_(hmac.new(bytes_(secret), pickled, hashlib.sha1).hexdigest())
+    sig = bytes_(hmac.new(
+        bytes_(secret, 'utf-8'), pickled, hashlib.sha1,
+    ).hexdigest())
 
     # Avoid timing attacks (see
     # http://seb.dbzteam.org/crypto/python-oauth-timing-hmac.pdf)
-- 
cgit v1.2.3


From cf026e2cd8704a679dd83760907d8847deabb18e Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Fri, 21 Feb 2014 22:33:33 -0600
Subject: fix regression with code expecting secrets to be encoded with latin-1

---
 pyramid/session.py            | 16 ++++++++++++----
 pyramid/tests/test_session.py | 17 +++++++++++++++--
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/pyramid/session.py b/pyramid/session.py
index d1964c43e..4dc7bda74 100644
--- a/pyramid/session.py
+++ b/pyramid/session.py
@@ -57,7 +57,12 @@ def signed_serialize(data, secret):
        response.set_cookie('signed_cookie', cookieval)
     """
     pickled = pickle.dumps(data, pickle.HIGHEST_PROTOCOL)
-    sig = hmac.new(bytes_(secret, 'utf-8'), pickled, hashlib.sha1).hexdigest()
+    try:
+        # bw-compat with pyramid <= 1.5b1 where latin1 is the default
+        secret = bytes_(secret)
+    except UnicodeEncodeError:
+        secret = bytes_(secret, 'utf-8')
+    sig = hmac.new(secret, pickled, hashlib.sha1).hexdigest()
     return sig + native_(base64.b64encode(pickled))
 
 def signed_deserialize(serialized, secret, hmac=hmac):
@@ -81,9 +86,12 @@ def signed_deserialize(serialized, secret, hmac=hmac):
         # Badly formed data can make base64 die
         raise ValueError('Badly formed base64 data: %s' % e)
 
-    sig = bytes_(hmac.new(
-        bytes_(secret, 'utf-8'), pickled, hashlib.sha1,
-    ).hexdigest())
+    try:
+        # bw-compat with pyramid <= 1.5b1 where latin1 is the default
+        secret = bytes_(secret)
+    except UnicodeEncodeError:
+        secret = bytes_(secret, 'utf-8')
+    sig = bytes_(hmac.new(secret, pickled, hashlib.sha1).hexdigest())
 
     # Avoid timing attacks (see
     # http://seb.dbzteam.org/crypto/python-oauth-timing-hmac.pdf)
diff --git a/pyramid/tests/test_session.py b/pyramid/tests/test_session.py
index 6bce764ca..f1b1e2296 100644
--- a/pyramid/tests/test_session.py
+++ b/pyramid/tests/test_session.py
@@ -533,10 +533,16 @@ class Test_signed_serialize(unittest.TestCase):
         self.assertEqual(result, expected)
 
     def test_it_with_highorder_secret(self):
-        secret = b'La Pe\xc3\xb1a'.decode('utf-8')
+        secret = b'\xce\xb1\xce\xb2\xce\xb3\xce\xb4'.decode('utf-8')
         expected = serialize('123', secret)
         result = self._callFUT('123', secret)
         self.assertEqual(result, expected)
+
+    def test_it_with_latin1_secret(self):
+        secret = b'La Pe\xc3\xb1a'
+        expected = serialize('123', secret)
+        result = self._callFUT('123', secret.decode('latin-1'))
+        self.assertEqual(result, expected)
         
 class Test_signed_deserialize(unittest.TestCase):
     def _callFUT(self, serialized, secret, hmac=None):
@@ -569,11 +575,18 @@ class Test_signed_deserialize(unittest.TestCase):
         self.assertRaises(ValueError, self._callFUT, serialized, 'secret')
 
     def test_it_with_highorder_secret(self):
-        secret = b'La Pe\xc3\xb1a'.decode('utf-8')
+        secret = b'\xce\xb1\xce\xb2\xce\xb3\xce\xb4'.decode('utf-8')
         serialized = serialize('123', secret)
         result = self._callFUT(serialized, secret)
         self.assertEqual(result, '123')
 
+    # bwcompat with pyramid <= 1.5b1 where latin1 is the default
+    def test_it_with_latin1_secret(self):
+        secret = b'La Pe\xc3\xb1a'
+        serialized = serialize('123', secret)
+        result = self._callFUT(serialized, secret.decode('latin-1'))
+        self.assertEqual(result, '123')
+
 class Test_check_csrf_token(unittest.TestCase):
     def _callFUT(self, *args, **kwargs):
         from ..session import check_csrf_token
-- 
cgit v1.2.3


From dd15238fa182aff0ab09dd9d3f469f821f9810ef Mon Sep 17 00:00:00 2001
From: dobesv <dobesv@gmail.com>
Date: Thu, 27 Feb 2014 10:34:12 -0800
Subject: Add get_logout_headers to request

The documentation for forget() says it is deprecated and to use get_logout_headers() on the request instead.  However, no such method has been added to the request.
---
 pyramid/security.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pyramid/security.py b/pyramid/security.py
index 848574233..dafd19611 100644
--- a/pyramid/security.py
+++ b/pyramid/security.py
@@ -355,6 +355,25 @@ class AuthenticationAPIMixin(object):
             return [Everyone]
         return policy.effective_principals(self)
     
+    def get_logout_headers(self):
+        """
+        Return a sequence of header tuples (e.g. ``[('Set-Cookie',
+        'foo=abc')]``) suitable for 'forgetting' the set of credentials
+        possessed by the currently authenticated user.  A common usage
+        might look like so within the body of a view function
+        (``response`` is assumed to be an :term:`WebOb` -style
+        :term:`response` object computed previously by the view code)::
+    
+          request.response.headerlist.extend(request.get_logout_headers())
+
+        If no :term:`authentication policy` is in use, this function will
+        always return an empty sequence.
+        """            
+        policy = self._get_authentication_policy()
+        if policy is None:
+            return []
+        return policy.forget(request)
+    
 class AuthorizationAPIMixin(object):
 
     def has_permission(self, permission, context=None):
-- 
cgit v1.2.3


From 8b434dd3d40ed42639a73d9ba5a750732049a043 Mon Sep 17 00:00:00 2001
From: dobesv <dobesv@gmail.com>
Date: Thu, 27 Feb 2014 11:09:08 -0800
Subject: Remove reference to request.get_logout_headers()

---
 pyramid/security.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/pyramid/security.py b/pyramid/security.py
index dafd19611..aa4aece69 100644
--- a/pyramid/security.py
+++ b/pyramid/security.py
@@ -160,9 +160,6 @@ def forget(request):
 
     If no :term:`authentication policy` is in use, this function will
     always return an empty sequence.
-
-    .. deprecated:: 1.5
-        Use :meth:`pyramid.request.Request.get_logout_headers` instead.
     """            
     policy = _get_authentication_policy(request)
     if policy is None:
@@ -354,26 +351,7 @@ class AuthenticationAPIMixin(object):
         if policy is None:
             return [Everyone]
         return policy.effective_principals(self)
-    
-    def get_logout_headers(self):
-        """
-        Return a sequence of header tuples (e.g. ``[('Set-Cookie',
-        'foo=abc')]``) suitable for 'forgetting' the set of credentials
-        possessed by the currently authenticated user.  A common usage
-        might look like so within the body of a view function
-        (``response`` is assumed to be an :term:`WebOb` -style
-        :term:`response` object computed previously by the view code)::
-    
-          request.response.headerlist.extend(request.get_logout_headers())
 
-        If no :term:`authentication policy` is in use, this function will
-        always return an empty sequence.
-        """            
-        policy = self._get_authentication_policy()
-        if policy is None:
-            return []
-        return policy.forget(request)
-    
 class AuthorizationAPIMixin(object):
 
     def has_permission(self, permission, context=None):
-- 
cgit v1.2.3


From 89dc4659eedfe75bada6d131722fbb00f1bbc49f Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 27 Feb 2014 16:23:56 -0500
Subject: improve timeout docs

---
 pyramid/session.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pyramid/session.py b/pyramid/session.py
index 3a045b91b..9fe2add60 100644
--- a/pyramid/session.py
+++ b/pyramid/session.py
@@ -192,14 +192,17 @@ def BaseCookieSessionFactory(
 
     ``timeout``
       A number of seconds of inactivity before a session times out. If
-      ``None`` then the cookie never expires. Default: 1200.
+      ``None`` then the cookie never expires. This lifetime only applies
+      to the *value* within the cookie. Meaning that if the cookie expires
+      due to a lower ``max_age``, then this setting has no effect.
+      Default: ``1200``.
 
     ``reissue_time``
       The number of seconds that must pass before the cookie is automatically
       reissued as the result of a request which accesses the session. The
       duration is measured as the number of seconds since the last session
       cookie was issued and 'now'.  If this value is ``0``, a new cookie
-      will be reissued on every request accesses the session. If ``None``
+      will be reissued on every request accessing the session. If ``None``
       then the cookie's lifetime will never be extended.
 
       A good rule of thumb: if you want auto-expired cookies based on
@@ -548,14 +551,17 @@ def SignedCookieSessionFactory(
 
     ``timeout``
       A number of seconds of inactivity before a session times out. If
-      ``None`` then the cookie never expires. Default: 1200.
+      ``None`` then the cookie never expires. This lifetime only applies
+      to the *value* within the cookie. Meaning that if the cookie expires
+      due to a lower ``max_age``, then this setting has no effect.
+      Default: ``1200``.
 
     ``reissue_time``
       The number of seconds that must pass before the cookie is automatically
-      reissued as the result of a request which accesses the session. The
+      reissued as the result of accessing the session. The
       duration is measured as the number of seconds since the last session
       cookie was issued and 'now'.  If this value is ``0``, a new cookie
-      will be reissued on every request accesses the session. If ``None``
+      will be reissued on every request accessing the session. If ``None``
       then the cookie's lifetime will never be extended.
 
       A good rule of thumb: if you want auto-expired cookies based on
-- 
cgit v1.2.3


From 1098ac88253ab7bee225bbb620381d3c7c4f99af Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 27 Feb 2014 16:28:08 -0500
Subject: 79-char line widths!

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

diff --git a/pyramid/session.py b/pyramid/session.py
index 9fe2add60..ea7a5628c 100644
--- a/pyramid/session.py
+++ b/pyramid/session.py
@@ -165,10 +165,10 @@ def BaseCookieSessionFactory(
     Parameters:
 
     ``serializer``
-      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.
+      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.
 
     ``cookie_name``
       The name of the cookie used for sessioning. Default: ``'session'``.
@@ -473,8 +473,8 @@ def UnencryptedCookieSessionFactoryConfig(
 deprecated(
     'UnencryptedCookieSessionFactoryConfig',
     'The UnencryptedCookieSessionFactoryConfig callable is deprecated as of '
-    'Pyramid 1.5.  Use ``pyramid.session.SignedCookieSessionFactory`` instead. '
-    'Caveat: Cookies generated using SignedCookieSessionFactory are not '
+    'Pyramid 1.5.  Use ``pyramid.session.SignedCookieSessionFactory`` instead.'
+    ' Caveat: Cookies generated using SignedCookieSessionFactory are not '
     'compatible with cookies generated using UnencryptedCookieSessionFactory, '
     'so existing user session data will be destroyed if you switch to it.'
     )
@@ -578,11 +578,11 @@ def SignedCookieSessionFactory(
       while rendering a view. Default: ``True``.
 
     ``serializer``
-      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
-      :class:`pyramid.session.PickleSerializer` serializer will be used.
+      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 :class:`pyramid.session.PickleSerializer` serializer will be used.
 
     .. versionadded: 1.5a3
     """
@@ -591,7 +591,7 @@ def SignedCookieSessionFactory(
 
     signed_serializer = SignedSerializer(
         secret,
-        salt, 
+        salt,
         hashalg,
         serializer=serializer,
         )
-- 
cgit v1.2.3


From 7075e1742529f7de53dd794e9ded0baaa3584135 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 27 Feb 2014 16:51:10 -0500
Subject: reproduce timeout=None bug

---
 pyramid/tests/test_session.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pyramid/tests/test_session.py b/pyramid/tests/test_session.py
index 1ad0729b3..1abc43e82 100644
--- a/pyramid/tests/test_session.py
+++ b/pyramid/tests/test_session.py
@@ -52,6 +52,15 @@ class SharedCookieSessionTests(object):
         session = self._makeOne(request, timeout=1)
         self.assertEqual(dict(session), {})
 
+    def test_timeout_never(self):
+        import time
+        request = testing.DummyRequest()
+        LONG_TIME = 31536000
+        cookieval = self._serialize((time.time() + LONG_TIME, 0, {'state': 1}))
+        request.cookies['session'] = cookieval
+        session = self._makeOne(request, timeout=None)
+        self.assertEqual(dict(session), {'state': 1})
+
     def test_changed(self):
         request = testing.DummyRequest()
         session = self._makeOne(request)
-- 
cgit v1.2.3


From 8f4fbd84220a3256cbeee3f2adcc333c0ef0e6aa Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 27 Feb 2014 16:51:43 -0500
Subject: fix timeout=None bug as well as some other potential unpacking
 problems

---
 pyramid/session.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pyramid/session.py b/pyramid/session.py
index ea7a5628c..5cc51869c 100644
--- a/pyramid/session.py
+++ b/pyramid/session.py
@@ -256,17 +256,24 @@ def BaseCookieSessionFactory(
 
             if value is not None:
                 try:
-                    renewed, created, state = value
+                    # since the value is not necessarily signed, we have
+                    # to unpack it a little carefully
+                    rval, cval, sval = value
+                    renewed = float(rval)
+                    created = float(cval)
+                    state = sval
                     new = False
-                    if now - renewed > self._timeout:
-                        # expire the session because it was not renewed
-                        # before the timeout threshold
-                        state = {}
-                except TypeError:
+                except (TypeError, ValueError):
                     # value failed to unpack properly or renewed was not
                     # a numeric type so we'll fail deserialization here
                     state = {}
 
+            if self._timeout is not None:
+                if now - renewed > self._timeout:
+                    # expire the session because it was not renewed
+                    # before the timeout threshold
+                    state = {}
+
             self.created = created
             self.accessed = renewed
             self.renewed = renewed
-- 
cgit v1.2.3


From 9549f66c78f18e4a041e96cbc78e7aa8d75fb4fe Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 27 Feb 2014 16:52:12 -0500
Subject: reproduce reissue_time=None bug

---
 pyramid/tests/test_session.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pyramid/tests/test_session.py b/pyramid/tests/test_session.py
index 1abc43e82..1aaa7a2ba 100644
--- a/pyramid/tests/test_session.py
+++ b/pyramid/tests/test_session.py
@@ -288,6 +288,14 @@ class TestBaseCookieSession(SharedCookieSessionTests, unittest.TestCase):
         self.assertEqual(session['state'], 1)
         self.assertFalse(session._dirty)
 
+    def test_reissue_never(self):
+        request = testing.DummyRequest()
+        cookieval = self._serialize((0, 0, {'state': 1}))
+        request.cookies['session'] = cookieval
+        session = self._makeOne(request, reissue_time=None, timeout=None)
+        self.assertEqual(session['state'], 1)
+        self.assertFalse(session._dirty)
+
 class TestSignedCookieSession(SharedCookieSessionTests, unittest.TestCase):
     def _makeOne(self, request, **kw):
         from pyramid.session import SignedCookieSessionFactory
@@ -314,6 +322,14 @@ class TestSignedCookieSession(SharedCookieSessionTests, unittest.TestCase):
         self.assertEqual(session['state'], 1)
         self.assertFalse(session._dirty)
 
+    def test_reissue_never(self):
+        request = testing.DummyRequest()
+        cookieval = self._serialize((0, 0, {'state': 1}))
+        request.cookies['session'] = cookieval
+        session = self._makeOne(request, reissue_time=None, timeout=None)
+        self.assertEqual(session['state'], 1)
+        self.assertFalse(session._dirty)
+
     def test_custom_salt(self):
         import time
         request = testing.DummyRequest()
-- 
cgit v1.2.3


From b2dd47336c200bbbfea31526f85652226c335687 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 27 Feb 2014 16:52:44 -0500
Subject: handle reissue_time=None properly

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

diff --git a/pyramid/session.py b/pyramid/session.py
index 5cc51869c..56d99e9de 100644
--- a/pyramid/session.py
+++ b/pyramid/session.py
@@ -27,8 +27,9 @@ def manage_accessed(wrapped):
     method is called."""
     def accessed(session, *arg, **kw):
         session.accessed = now = int(time.time())
-        if now - session.renewed > session._reissue_time:
-            session.changed()
+        if session._reissue_time is not None:
+            if now - session.renewed > session._reissue_time:
+                session.changed()
         return wrapped(session, *arg, **kw)
     accessed.__doc__ = wrapped.__doc__
     return accessed
-- 
cgit v1.2.3


From e175ffca6a3c005b61856d50802a289f0483cfb7 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 27 Feb 2014 16:58:47 -0500
Subject: update changelog

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 84d0694e3..434eab898 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,12 @@ Unreleased
 - Avoid crash in ``pserve --reload`` under Py3k, when iterating over posiibly
   mutated ``sys.modules``.
 
+- Fixed a bug in ``UnencryptedCookieSessionFactoryConfig`` and
+  ``SignedCookieSessionFactory`` where ``timeout=None`` would cause a new
+  session to always be created. Also in ``SignedCookieSessionFactory`` a
+  ``reissue_time=None`` would cause an exception when modifying the session.
+  See https://github.com/Pylons/pyramid/issues/1247
+
 1.5b1 (2014-02-08)
 ==================
 
-- 
cgit v1.2.3


From 76144dfae72a0a6d2bd33a414deb296937e90e49 Mon Sep 17 00:00:00 2001
From: Robert Buchholz <rbu@goodpoint.de>
Date: Mon, 3 Mar 2014 16:24:31 +0100
Subject: Hand RepozeWho1AuthenticationPolicy.remember kwargs to repoze.who
 #1249

Documentation for pyramid.security.remember supports keyword arguments
to hand over to the authentication policy. However, when using
RepozeWho1AuthenticationPolicy, all of the kw were dropped in remember.

It is my understanding that with repoze.who, additional configuration
parameters shall be stored in the identity dictionary. In our case,
setting the max_age parameter to the authtkt identifier, would be done
using an identity {'repoze.who.userid':principal, 'max_age': 23}.

It seems sensible just to hand over kw through the identity dictionary
and all users to specify max_age or other parameters such as userdata.
---
 pyramid/authentication.py            | 11 +++++++++--
 pyramid/tests/test_authentication.py |  8 ++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/pyramid/authentication.py b/pyramid/authentication.py
index ba7b864f9..b84981bbc 100644
--- a/pyramid/authentication.py
+++ b/pyramid/authentication.py
@@ -336,12 +336,19 @@ class RepozeWho1AuthenticationPolicy(CallbackAuthenticationPolicy):
         return effective_principals
 
     def remember(self, request, principal, **kw):
-        """ Store the ``principal`` as ``repoze.who.userid``."""
+        """ Store the ``principal`` as ``repoze.who.userid``.
+        
+        The identity to authenticated to :mod:`repoze.who`
+        will contain the given principal as ``userid``, and
+        provide all keyword arguments as additional identity
+        keys. Useful keys could be ``max_age`` or ``userdata``.
+        """
         identifier = self._get_identifier(request)
         if identifier is None:
             return []
         environ = request.environ
-        identity = {'repoze.who.userid':principal}
+        identity = kw
+        identity['repoze.who.userid'] = principal
         return identifier.remember(environ, identity)
 
     def forget(self, request):
diff --git a/pyramid/tests/test_authentication.py b/pyramid/tests/test_authentication.py
index 79d2a5923..e25e9faa1 100644
--- a/pyramid/tests/test_authentication.py
+++ b/pyramid/tests/test_authentication.py
@@ -350,6 +350,14 @@ class TestRepozeWho1AuthenticationPolicy(unittest.TestCase):
         self.assertEqual(result[0], request.environ)
         self.assertEqual(result[1], {'repoze.who.userid':'fred'})
 
+    def test_remember_kwargs(self):
+        authtkt = DummyWhoPlugin()
+        request = DummyRequest(
+            {'repoze.who.plugins':{'auth_tkt':authtkt}})
+        policy = self._makeOne()
+        result = policy.remember(request, 'fred', max_age=23)
+        self.assertEqual(result[1], {'repoze.who.userid':'fred', 'max_age': 23})
+
     def test_forget_no_plugins(self):
         request = DummyRequest({})
         policy = self._makeOne()
-- 
cgit v1.2.3


From 1bd3157143c7ae6e0a35fa07e4f0888ddd347ab5 Mon Sep 17 00:00:00 2001
From: Robert Buchholz <rbu@goodpoint.de>
Date: Mon, 3 Mar 2014 16:24:31 +0100
Subject: Hand RepozeWho1AuthenticationPolicy.remember kwargs to repoze.who
 #1249

Documentation for pyramid.security.remember supports keyword arguments
to hand over to the authentication policy. However, when using
RepozeWho1AuthenticationPolicy, all of the kw were dropped in remember.

It is my understanding that with repoze.who, additional configuration
parameters shall be stored in the identity dictionary. In our case,
setting the max_age parameter to the authtkt identifier, would be done
using an identity {'repoze.who.userid':principal, 'max_age': 23}.

It seems sensible just to hand over kw through the identity dictionary
and all users to specify max_age or other parameters such as userdata.
---
 pyramid/authentication.py            | 11 +++++++++--
 pyramid/tests/test_authentication.py |  8 ++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/pyramid/authentication.py b/pyramid/authentication.py
index ba7b864f9..b84981bbc 100644
--- a/pyramid/authentication.py
+++ b/pyramid/authentication.py
@@ -336,12 +336,19 @@ class RepozeWho1AuthenticationPolicy(CallbackAuthenticationPolicy):
         return effective_principals
 
     def remember(self, request, principal, **kw):
-        """ Store the ``principal`` as ``repoze.who.userid``."""
+        """ Store the ``principal`` as ``repoze.who.userid``.
+        
+        The identity to authenticated to :mod:`repoze.who`
+        will contain the given principal as ``userid``, and
+        provide all keyword arguments as additional identity
+        keys. Useful keys could be ``max_age`` or ``userdata``.
+        """
         identifier = self._get_identifier(request)
         if identifier is None:
             return []
         environ = request.environ
-        identity = {'repoze.who.userid':principal}
+        identity = kw
+        identity['repoze.who.userid'] = principal
         return identifier.remember(environ, identity)
 
     def forget(self, request):
diff --git a/pyramid/tests/test_authentication.py b/pyramid/tests/test_authentication.py
index 79d2a5923..e25e9faa1 100644
--- a/pyramid/tests/test_authentication.py
+++ b/pyramid/tests/test_authentication.py
@@ -350,6 +350,14 @@ class TestRepozeWho1AuthenticationPolicy(unittest.TestCase):
         self.assertEqual(result[0], request.environ)
         self.assertEqual(result[1], {'repoze.who.userid':'fred'})
 
+    def test_remember_kwargs(self):
+        authtkt = DummyWhoPlugin()
+        request = DummyRequest(
+            {'repoze.who.plugins':{'auth_tkt':authtkt}})
+        policy = self._makeOne()
+        result = policy.remember(request, 'fred', max_age=23)
+        self.assertEqual(result[1], {'repoze.who.userid':'fred', 'max_age': 23})
+
     def test_forget_no_plugins(self):
         request = DummyRequest({})
         policy = self._makeOne()
-- 
cgit v1.2.3


From 82ec99eebc6a6dfe2903bc0383f31a9b146b3d80 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Mon, 3 Mar 2014 16:36:04 -0800
Subject: update inconsistent effective_principals docs

fixes #1196
---
 pyramid/security.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pyramid/security.py b/pyramid/security.py
index aa4aece69..c98d4e6cc 100644
--- a/pyramid/security.py
+++ b/pyramid/security.py
@@ -340,10 +340,9 @@ class AuthenticationAPIMixin(object):
     @property
     def effective_principals(self):
         """ Return the list of 'effective' :term:`principal` identifiers
-        for the ``request``.  This will include the userid of the
-        currently authenticated user if a user is currently
-        authenticated. If no :term:`authentication policy` is in effect,
-        this will return an empty sequence.
+        for the ``request``. If no :term:`authentication policy` is in effect,
+        this will return a one-element list containing the
+        :data:`pyramid.security.Everyone` principal.
 
         .. versionadded:: 1.5
         """
-- 
cgit v1.2.3


From b4e59b7168273b774acd975457906dffa176caba Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Wed, 5 Mar 2014 18:47:46 -0500
Subject: 'request_method' is *not* limited to the named set.

---
 pyramid/config/views.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index 1ef4efdb3..2f6c758ab 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -879,13 +879,13 @@ class ViewsConfiguratorMixin(object):
 
         request_method
 
-          This value can be one of the strings ``GET``, ``POST``, ``PUT``,
-          ``DELETE``, or ``HEAD`` representing an HTTP ``REQUEST_METHOD``, or
-          a tuple containing one or more of these strings.  A view
-          declaration with this argument ensures that the view will only be
-          called when the request's ``method`` attribute (aka the
-          ``REQUEST_METHOD`` of the WSGI environment) string matches a
-          supplied value.  Note that use of ``GET`` also implies that the
+          This value can be either a strings (such as ``GET``, ``POST``,
+          ``PUT``, ``DELETE``, or ``HEAD``) representing an HTTP
+          ``REQUEST_METHOD``, or a tuple containing one or more of these
+          strings.  A view declaration with this argument ensures that the
+          view will only be called when the ``method`` attribute of the
+          request (aka the ``REQUEST_METHOD`` of the WSGI environment) matches
+          a supplied value.  Note that use of ``GET`` also implies that the
           view will respond to ``HEAD`` as of Pyramid 1.4.
 
           .. versionchanged:: 1.2
-- 
cgit v1.2.3


From 58febc5917a82ef1ae25af92b62843ad3c6d5e0e Mon Sep 17 00:00:00 2001
From: Paul Winkler <paul.winkler@percolate.com>
Date: Fri, 7 Mar 2014 11:19:29 -0500
Subject: Minor punctuation and grammar changes to Quick Intro

---
 docs/quick_tour.rst | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 2d4e679f8..4ab39bb11 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -73,14 +73,14 @@ This simple example is easy to run. Save this as ``app.py`` and run it:
 Next, open `http://localhost:6543/ <http://localhost:6543/>`_ in a
 browser and you will see the ``Hello World!`` message.
 
-New to Python web programming? If so, some lines in module merit
+New to Python web programming? If so, some lines in the module merit
 explanation:
 
 #. *Line 10*. The ``if __name__ == '__main__':`` is Python's way of
    saying "Start here when running from the command line".
 
 #. *Lines 11-13*. Use Pyramid's :term:`configurator` to connect
-   :term:`view` code to particular URL :term:`route`.
+   :term:`view` code to a particular URL :term:`route`.
 
 #. *Lines 6-7*. Implement the view code that generates the
    :term:`response`.
@@ -148,15 +148,15 @@ So far our examples place everything in one file:
 - the WSGI application launcher
 
 Let's move the views out to their own ``views.py`` module and change
-the ``app.py`` to scan that module, looking for decorators that setup
+the ``app.py`` to scan that module, looking for decorators that set up
 the views. First, our revised ``app.py``:
 
 .. literalinclude:: quick_tour/views/app.py
     :linenos:
 
 We added some more routes, but we also removed the view code.
-Our views, and their registrations (via decorators) are now in a module
-``views.py`` which is scanned via ``config.scan('views')``.
+Our views and their registrations (via decorators) are now in a module
+``views.py``, which is scanned via ``config.scan('views')``.
 
 We now have a ``views.py`` module that is focused on handling requests
 and responses:
@@ -167,7 +167,7 @@ and responses:
 We have 4 views, each leading to the other. If you start at
 ``http://localhost:6543/``, you get a response with a link to the next
 view. The ``hello_view`` (available at the URL ``/howdy``) has a link
-to the ``redirect_view``, which shows issuing a redirect to the final
+to the ``redirect_view``, which issues a redirect to the final
 view.
 
 Earlier we saw ``config.add_view`` as one way to configure a view. This
@@ -267,7 +267,7 @@ Now lets change our views.py file:
 
 Ahh, that looks better. We have a view that is focused on Python code.
 Our ``@view_config`` decorator specifies a :term:`renderer` that points
-our template file. Our view then simply returns data which is then
+to our template file. Our view then simply returns data which is then
 supplied to our template:
 
 .. literalinclude:: quick_tour/templating/hello_world.pt
@@ -303,7 +303,7 @@ our configuration:
 
     config.include('pyramid_jinja2')
 
-The only change in our view...point the renderer at the ``.jinja2`` file:
+The only change in our view is to point the renderer at the ``.jinja2`` file:
 
 .. literalinclude:: quick_tour/jinja2/views.py
     :start-after: Start View 1
@@ -356,8 +356,8 @@ template:
 
 This link presumes that our CSS is at a URL starting with ``/static/``.
 What if the site is later moved under ``/somesite/static/``? Or perhaps
-web developer changes the arrangement on disk? Pyramid gives a helper
-that provides flexibility on URL generation:
+a web developer changes the arrangement on disk? Pyramid provides a helper
+to allow flexibility on URL generation:
 
 .. literalinclude:: quick_tour/static_assets/hello_world.pt
     :language: html
@@ -454,7 +454,7 @@ have much more to offer:
 Quick Project Startup with Scaffolds
 ====================================
 
-So far we have done all of our *Quick Glance* as a single Python file.
+So far we have done all of our *Quick Tour* as a single Python file.
 No Python packages, no structure. Most Pyramid projects, though,
 aren't developed this way.
 
@@ -479,7 +479,7 @@ let's use that scaffold to make our project:
 
     $ pcreate --scaffold pyramid_jinja2_starter hello_world
 
-We next use the normal Python development to setup our package for
+We next use the normal Python command to set up our package for
 development:
 
 .. code-block:: bash
@@ -534,7 +534,7 @@ take a look at this configuration file.
 Configuration with ``.ini`` Files
 =================================
 
-Earlier in *Quick Glance* we first met Pyramid's configuration system.
+Earlier in *Quick Tour* we first met Pyramid's configuration system.
 At that point we did all configuration in Python code. For example,
 the port number chosen for our HTTP server was right there in Python
 code. Our scaffold has moved this decision, and more, into the
@@ -556,8 +556,8 @@ into sections:
 
 We have a few decisions made for us in this configuration:
 
-#. *Choice of web server*. The ``use = egg:pyramid#wsgiref`` tell
-   ``pserve`` to the ``wsgiref`` server that is wrapped in the Pyramid
+#. *Choice of web server*. The ``use = egg:pyramid#wsgiref`` tells
+   ``pserve`` to use the ``wsgiref`` server that is wrapped in the Pyramid
    package.
 
 #. *Port number*. ``port = 6543`` tells ``wsgiref`` to listen on port
@@ -574,7 +574,7 @@ We have a few decisions made for us in this configuration:
 
 Additionally, the ``development.ini`` generated by this scaffold wired
 up Python's standard logging. We'll now see in the console, for example,
-a log on every request that comes in, as well traceback information.
+a log on every request that comes in, as well as traceback information.
 
 .. seealso:: See also:
     :ref:`Quick Tutorial Application Configuration <qtut_ini>`,
@@ -585,7 +585,7 @@ a log on every request that comes in, as well traceback information.
 Easier Development with ``debugtoolbar``
 ========================================
 
-As we introduce the basics we also want to show how to be productive in
+As we introduce the basics, we also want to show how to be productive in
 development and debugging. For example, we just discussed template
 reloading and earlier we showed ``--reload`` for application reloading.
 
@@ -700,12 +700,12 @@ we might need to detect situations when other people use the site. We
 need *logging*.
 
 Fortunately Pyramid uses the normal Python approach to logging. The
-scaffold generated, in your ``development.ini``, a number of lines that
+scaffold generated in your ``development.ini`` a number of lines that
 configure the logging for you to some reasonable defaults. You then see
-messages sent by Pyramid (for example, when a new request comes in.)
+messages sent by Pyramid (for example, when a new request comes in).
 
 Maybe you would like to log messages in your code? In your Python
-module, import and setup the logging:
+module, import and set up the logging:
 
 .. literalinclude:: quick_tour/package/hello_world/views.py
     :start-after: Start Logging 1
@@ -726,7 +726,7 @@ controls that? These sections in the configuration file:
     :start-after: Start Sphinx Include
     :end-before: End Sphinx Include
 
-Our application, a package named ``hello_world``, is setup as a logger
+Our application, a package named ``hello_world``, is set up as a logger
 and configured to log messages at a ``DEBUG`` or higher level. When you
 visit ``http://localhost:6543`` your console will now show::
 
@@ -789,7 +789,7 @@ Databases
 =========
 
 Web applications mean data. Data means databases. Frequently SQL
-databases. SQL Databases frequently mean an "ORM"
+databases. SQL databases frequently mean an "ORM"
 (object-relational mapper.) In Python, ORM usually leads to the
 mega-quality *SQLAlchemy*, a Python package that greatly eases working
 with databases.
-- 
cgit v1.2.3


From 5c5edadd089f3c3f13751bde3f691ad19339b551 Mon Sep 17 00:00:00 2001
From: sbivol <sergiu@ase.md>
Date: Mon, 10 Mar 2014 16:28:56 +0200
Subject: Remove extra concatenation from request.static_url()

fixes issue #1266
---
 docs/quick_tutorial/forms/tutorial/wikipage_addedit.pt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/quick_tutorial/forms/tutorial/wikipage_addedit.pt b/docs/quick_tutorial/forms/tutorial/wikipage_addedit.pt
index d1fea0d7f..3292dfd90 100644
--- a/docs/quick_tutorial/forms/tutorial/wikipage_addedit.pt
+++ b/docs/quick_tutorial/forms/tutorial/wikipage_addedit.pt
@@ -4,10 +4,10 @@
     <title>WikiPage: Add/Edit</title>
     <tal:block tal:repeat="reqt view.reqts['css']">
         <link rel="stylesheet" type="text/css"
-              href="${request.static_url('deform:static/' + reqt)}"/>
+              href="${request.static_url(reqt)}"/>
     </tal:block>
     <tal:block tal:repeat="reqt view.reqts['js']">
-        <script src="${request.static_url('deform:static/' + reqt)}"
+        <script src="${request.static_url(reqt)}"
                 type="text/javascript"></script>
     </tal:block>
 </head>
-- 
cgit v1.2.3


From 49bcc8e86ded6785c3bddd6972f870b2d2d858a8 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Mon, 10 Mar 2014 09:15:08 -0700
Subject: Add integration tests for Unicode in URL

---
 pyramid/tests/test_integration.py | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/pyramid/tests/test_integration.py b/pyramid/tests/test_integration.py
index 9d3a9e004..bc22c2e54 100644
--- a/pyramid/tests/test_integration.py
+++ b/pyramid/tests/test_integration.py
@@ -640,6 +640,44 @@ class RendererScanAppTest(IntegrationBase, unittest.TestCase):
         res = testapp.get('/two', status=200)
         self.assertTrue(b'Two!' in res.body)
 
+class UnicodeInURLTest(unittest.TestCase):
+    def _makeConfig(self):
+        from pyramid.config import Configurator
+        config = Configurator()
+        return config
+
+    def _makeTestApp(self, config):
+        from webtest import TestApp
+        app = config.make_wsgi_app()
+        return TestApp(app)
+
+    def test_unicode_in_url_404(self):
+        request_path = b'/avalia%C3%A7%C3%A3o_participante/'
+        request_path_unicode = u'/avalia\xe7\xe3o_participante/'
+
+        config = self._makeConfig()
+        testapp = self._makeTestApp(config)
+
+        res = testapp.get(request_path, status=404)
+        self.assertTrue(request_path_unicode in res.text)
+
+    def test_unicode_in_url_200(self):
+        request_path = b'/avalia%C3%A7%C3%A3o_participante'
+        request_path_unicode = u'/avalia\xe7\xe3o_participante'
+
+        def myview(request):
+            return 'XXX'
+
+        config = self._makeConfig()
+        config.add_route('myroute', request_path_unicode)
+        config.add_view(myview, route_name='myroute', renderer='json')
+        testapp = self._makeTestApp(config)
+
+        res = testapp.get(request_path, status=200)
+
+        self.assertEqual(res.text, '"XXX"')
+
+
 class AcceptContentTypeTest(unittest.TestCase):
     def setUp(self):
         def hello_view(request):
-- 
cgit v1.2.3


From 0c425da09d966bafd2f4043fa8919f3da4d8abc4 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Tue, 11 Mar 2014 08:27:56 -0700
Subject: Remove 'b'; WebTest or WebOb doesn't like Python 3 bytes for URLs

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

diff --git a/pyramid/tests/test_integration.py b/pyramid/tests/test_integration.py
index bc22c2e54..48199c419 100644
--- a/pyramid/tests/test_integration.py
+++ b/pyramid/tests/test_integration.py
@@ -652,7 +652,7 @@ class UnicodeInURLTest(unittest.TestCase):
         return TestApp(app)
 
     def test_unicode_in_url_404(self):
-        request_path = b'/avalia%C3%A7%C3%A3o_participante/'
+        request_path = '/avalia%C3%A7%C3%A3o_participante/'
         request_path_unicode = u'/avalia\xe7\xe3o_participante/'
 
         config = self._makeConfig()
@@ -662,7 +662,7 @@ class UnicodeInURLTest(unittest.TestCase):
         self.assertTrue(request_path_unicode in res.text)
 
     def test_unicode_in_url_200(self):
-        request_path = b'/avalia%C3%A7%C3%A3o_participante'
+        request_path = '/avalia%C3%A7%C3%A3o_participante'
         request_path_unicode = u'/avalia\xe7\xe3o_participante'
 
         def myview(request):
-- 
cgit v1.2.3


From bc87edd3d8df7c5bd4c8d267c626f4fd22ef7443 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Tue, 11 Mar 2014 10:10:10 -0700
Subject: Convert from u prefix to byte string and decode

because the u prefix is not supported in Python 3.2
---
 pyramid/tests/test_integration.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyramid/tests/test_integration.py b/pyramid/tests/test_integration.py
index 48199c419..0ab18de7a 100644
--- a/pyramid/tests/test_integration.py
+++ b/pyramid/tests/test_integration.py
@@ -652,8 +652,8 @@ class UnicodeInURLTest(unittest.TestCase):
         return TestApp(app)
 
     def test_unicode_in_url_404(self):
-        request_path = '/avalia%C3%A7%C3%A3o_participante/'
-        request_path_unicode = u'/avalia\xe7\xe3o_participante/'
+        request_path = '/avalia%C3%A7%C3%A3o_participante'
+        request_path_unicode = b'/avalia\xc3\xa7\xc3\xa3o_participante'.decode('utf-8')
 
         config = self._makeConfig()
         testapp = self._makeTestApp(config)
@@ -663,7 +663,7 @@ class UnicodeInURLTest(unittest.TestCase):
 
     def test_unicode_in_url_200(self):
         request_path = '/avalia%C3%A7%C3%A3o_participante'
-        request_path_unicode = u'/avalia\xe7\xe3o_participante'
+        request_path_unicode = b'/avalia\xc3\xa7\xc3\xa3o_participante'.decode('utf-8')
 
         def myview(request):
             return 'XXX'
-- 
cgit v1.2.3


From a99abf808a15fbc02da4c27ab7d46d03668b62ed Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Tue, 11 Mar 2014 11:12:13 -0700
Subject: test_unicode_in_url_404: Add comment to clarify why
 request_path_unicode is expected to be in res.txt

---
 pyramid/tests/test_integration.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pyramid/tests/test_integration.py b/pyramid/tests/test_integration.py
index 0ab18de7a..35648ed38 100644
--- a/pyramid/tests/test_integration.py
+++ b/pyramid/tests/test_integration.py
@@ -659,6 +659,10 @@ class UnicodeInURLTest(unittest.TestCase):
         testapp = self._makeTestApp(config)
 
         res = testapp.get(request_path, status=404)
+
+        # Pyramid default 404 handler outputs:
+        # u'404 Not Found\n\nThe resource could not be found.\n\n\n'
+        # u'/avalia\xe7\xe3o_participante\n\n'
         self.assertTrue(request_path_unicode in res.text)
 
     def test_unicode_in_url_200(self):
-- 
cgit v1.2.3


From ba85e591d563ed654f492f7cab5ca492a32a86d7 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Thu, 13 Mar 2014 18:17:43 -0400
Subject: Strip redundant logging config from tutorial INI files.

Leave it for the 'logging' and 'scaffolds' sections, where it is germane.
---
 docs/quick_tutorial/authentication/development.ini | 31 -------------------
 docs/quick_tutorial/authorization/development.ini  | 31 -------------------
 docs/quick_tutorial/databases/development.ini      | 36 ----------------------
 docs/quick_tutorial/debugtoolbar/development.ini   | 31 -------------------
 docs/quick_tutorial/forms/development.ini          | 31 -------------------
 .../functional_testing/development.ini             | 31 -------------------
 docs/quick_tutorial/ini/development.ini            | 31 -------------------
 docs/quick_tutorial/jinja2/development.ini         | 31 -------------------
 docs/quick_tutorial/json/development.ini           | 31 -------------------
 .../more_view_classes/development.ini              | 31 -------------------
 .../request_response/development.ini               | 31 -------------------
 docs/quick_tutorial/retail_forms/development.ini   | 31 -------------------
 docs/quick_tutorial/routing/development.ini        | 31 -------------------
 docs/quick_tutorial/sessions/development.ini       | 31 -------------------
 docs/quick_tutorial/static_assets/development.ini  | 31 -------------------
 docs/quick_tutorial/templating/development.ini     | 31 -------------------
 docs/quick_tutorial/unit_testing/development.ini   | 31 -------------------
 docs/quick_tutorial/view_classes/development.ini   | 31 -------------------
 docs/quick_tutorial/views/development.ini          | 31 -------------------
 19 files changed, 594 deletions(-)

diff --git a/docs/quick_tutorial/authentication/development.ini b/docs/quick_tutorial/authentication/development.ini
index 5d4580ff5..8a39b2fe7 100644
--- a/docs/quick_tutorial/authentication/development.ini
+++ b/docs/quick_tutorial/authentication/development.ini
@@ -9,34 +9,3 @@ tutorial.secret = 98zd
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/authorization/development.ini b/docs/quick_tutorial/authorization/development.ini
index 5d4580ff5..8a39b2fe7 100644
--- a/docs/quick_tutorial/authorization/development.ini
+++ b/docs/quick_tutorial/authorization/development.ini
@@ -9,34 +9,3 @@ tutorial.secret = 98zd
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/databases/development.ini b/docs/quick_tutorial/databases/development.ini
index 270da960f..04c249a62 100644
--- a/docs/quick_tutorial/databases/development.ini
+++ b/docs/quick_tutorial/databases/development.ini
@@ -11,39 +11,3 @@ sqlalchemy.url = sqlite:///%(here)s/sqltutorial.sqlite
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial, sqlalchemy
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[logger_sqlalchemy]
-level = INFO
-handlers =
-qualname = sqlalchemy.engine
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/debugtoolbar/development.ini b/docs/quick_tutorial/debugtoolbar/development.ini
index 470d92c57..52b2a3a41 100644
--- a/docs/quick_tutorial/debugtoolbar/development.ini
+++ b/docs/quick_tutorial/debugtoolbar/development.ini
@@ -7,34 +7,3 @@ pyramid.includes =
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/forms/development.ini b/docs/quick_tutorial/forms/development.ini
index 62e0c5123..4d47e54a5 100644
--- a/docs/quick_tutorial/forms/development.ini
+++ b/docs/quick_tutorial/forms/development.ini
@@ -8,34 +8,3 @@ pyramid.includes =
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/functional_testing/development.ini b/docs/quick_tutorial/functional_testing/development.ini
index 470d92c57..52b2a3a41 100644
--- a/docs/quick_tutorial/functional_testing/development.ini
+++ b/docs/quick_tutorial/functional_testing/development.ini
@@ -7,34 +7,3 @@ pyramid.includes =
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/ini/development.ini b/docs/quick_tutorial/ini/development.ini
index ca7d9bf81..8853e2c2b 100644
--- a/docs/quick_tutorial/ini/development.ini
+++ b/docs/quick_tutorial/ini/development.ini
@@ -5,34 +5,3 @@ use = egg:tutorial
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/jinja2/development.ini b/docs/quick_tutorial/jinja2/development.ini
index 62e0c5123..4d47e54a5 100644
--- a/docs/quick_tutorial/jinja2/development.ini
+++ b/docs/quick_tutorial/jinja2/development.ini
@@ -8,34 +8,3 @@ pyramid.includes =
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/json/development.ini b/docs/quick_tutorial/json/development.ini
index 62e0c5123..4d47e54a5 100644
--- a/docs/quick_tutorial/json/development.ini
+++ b/docs/quick_tutorial/json/development.ini
@@ -8,34 +8,3 @@ pyramid.includes =
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/more_view_classes/development.ini b/docs/quick_tutorial/more_view_classes/development.ini
index 62e0c5123..4d47e54a5 100644
--- a/docs/quick_tutorial/more_view_classes/development.ini
+++ b/docs/quick_tutorial/more_view_classes/development.ini
@@ -8,34 +8,3 @@ pyramid.includes =
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/request_response/development.ini b/docs/quick_tutorial/request_response/development.ini
index 62e0c5123..4d47e54a5 100644
--- a/docs/quick_tutorial/request_response/development.ini
+++ b/docs/quick_tutorial/request_response/development.ini
@@ -8,34 +8,3 @@ pyramid.includes =
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/retail_forms/development.ini b/docs/quick_tutorial/retail_forms/development.ini
index 62e0c5123..4d47e54a5 100644
--- a/docs/quick_tutorial/retail_forms/development.ini
+++ b/docs/quick_tutorial/retail_forms/development.ini
@@ -8,34 +8,3 @@ pyramid.includes =
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/routing/development.ini b/docs/quick_tutorial/routing/development.ini
index 62e0c5123..4d47e54a5 100644
--- a/docs/quick_tutorial/routing/development.ini
+++ b/docs/quick_tutorial/routing/development.ini
@@ -8,34 +8,3 @@ pyramid.includes =
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/sessions/development.ini b/docs/quick_tutorial/sessions/development.ini
index 62e0c5123..4d47e54a5 100644
--- a/docs/quick_tutorial/sessions/development.ini
+++ b/docs/quick_tutorial/sessions/development.ini
@@ -8,34 +8,3 @@ pyramid.includes =
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/static_assets/development.ini b/docs/quick_tutorial/static_assets/development.ini
index 62e0c5123..4d47e54a5 100644
--- a/docs/quick_tutorial/static_assets/development.ini
+++ b/docs/quick_tutorial/static_assets/development.ini
@@ -8,34 +8,3 @@ pyramid.includes =
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/templating/development.ini b/docs/quick_tutorial/templating/development.ini
index 62e0c5123..4d47e54a5 100644
--- a/docs/quick_tutorial/templating/development.ini
+++ b/docs/quick_tutorial/templating/development.ini
@@ -8,34 +8,3 @@ pyramid.includes =
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/unit_testing/development.ini b/docs/quick_tutorial/unit_testing/development.ini
index 470d92c57..52b2a3a41 100644
--- a/docs/quick_tutorial/unit_testing/development.ini
+++ b/docs/quick_tutorial/unit_testing/development.ini
@@ -7,34 +7,3 @@ pyramid.includes =
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/view_classes/development.ini b/docs/quick_tutorial/view_classes/development.ini
index 62e0c5123..4d47e54a5 100644
--- a/docs/quick_tutorial/view_classes/development.ini
+++ b/docs/quick_tutorial/view_classes/development.ini
@@ -8,34 +8,3 @@ pyramid.includes =
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/quick_tutorial/views/development.ini b/docs/quick_tutorial/views/development.ini
index 470d92c57..52b2a3a41 100644
--- a/docs/quick_tutorial/views/development.ini
+++ b/docs/quick_tutorial/views/development.ini
@@ -7,34 +7,3 @@ pyramid.includes =
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
-- 
cgit v1.2.3


From ee824a80bab0b30f7f8f466a9c93765b35c1c677 Mon Sep 17 00:00:00 2001
From: thapar <rajthapar@gmail.com>
Date: Mon, 17 Mar 2014 20:16:44 -0400
Subject: Added note to place login/logout route definitions before
 `/{pagename}` route

Resolves https://github.com/Pylons/pyramid/issues/1274
---
 docs/tutorials/wiki2/authorization.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index 1e5d0dcbf..1417dbdd8 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -207,6 +207,19 @@ routes:
    :linenos:
    :language: python
 
+.. note:: These lines must be added `before` this ``view_page`` route
+   definition:
+   .. literalinclude:: src/authorization/tutorial/__init__.py
+      :lines: 32
+      :linenos:
+      :language: python
+   This is because ``view_page``'s route definition uses a catch-all
+   "replacement marker" ``/{pagename}`` (see :ref:_route_pattern_syntax )
+   which will catch any route that was not already caught by any
+   route listed above it in ``__init__.py``. Hence, for ``login`` and
+   ``logout`` views to have the opportunity of being matched
+   (or "caught"), they must be above ``/{pagename}``.
+
 Add Login and Logout Views
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- 
cgit v1.2.3


From b6d8cf9c2eb8f7dd03fa3487b8e401940c314fb4 Mon Sep 17 00:00:00 2001
From: thapar <rajthapar@gmail.com>
Date: Mon, 17 Mar 2014 21:26:01 -0400
Subject: Corrected inline markup to use * for italics

---
 docs/tutorials/wiki2/authorization.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index 1417dbdd8..e3811b338 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -207,7 +207,7 @@ routes:
    :linenos:
    :language: python
 
-.. note:: These lines must be added `before` this ``view_page`` route
+.. note:: These lines must be added *before* this ``view_page`` route
    definition:
    .. literalinclude:: src/authorization/tutorial/__init__.py
       :lines: 32
-- 
cgit v1.2.3


From cf4023ad25637720ed5ccd1e7cdffd24da4c47cb Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Fri, 21 Mar 2014 06:19:27 -0700
Subject: - correct bad .rst syntax

---
 docs/tutorials/wiki2/authorization.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index e3811b338..2e35574fd 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -207,14 +207,16 @@ routes:
    :linenos:
    :language: python
 
-.. note:: These lines must be added *before* this ``view_page`` route
-   definition:
+.. note:: The preceding lines must be added *before* the following
+   ``view_page`` route definition:
+
    .. literalinclude:: src/authorization/tutorial/__init__.py
       :lines: 32
       :linenos:
       :language: python
+
    This is because ``view_page``'s route definition uses a catch-all
-   "replacement marker" ``/{pagename}`` (see :ref:_route_pattern_syntax )
+   "replacement marker" ``/{pagename}`` (see :ref:`route_pattern_syntax`)
    which will catch any route that was not already caught by any
    route listed above it in ``__init__.py``. Hence, for ``login`` and
    ``logout`` views to have the opportunity of being matched
-- 
cgit v1.2.3


From 49923dbf430fc6becc92133ba7672e93f1bc955e Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Fri, 21 Mar 2014 06:47:55 -0700
Subject: - fix indentation of code block

---
 docs/quick_tutorial/scaffolds.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/quick_tutorial/scaffolds.rst b/docs/quick_tutorial/scaffolds.rst
index 8ca2d27df..4f2694100 100644
--- a/docs/quick_tutorial/scaffolds.rst
+++ b/docs/quick_tutorial/scaffolds.rst
@@ -63,11 +63,11 @@ Steps
 
    On startup, ``pserve`` logs some output:
 
-   .. code-block:: bash
+    .. code-block:: bash
 
-     Starting subprocess with file monitor
-     Starting server in PID 72213.
-     Starting HTTP server on http://0.0.0.0:6543
+        Starting subprocess with file monitor
+        Starting server in PID 72213.
+        Starting HTTP server on http://0.0.0.0:6543
 
 #. Open http://localhost:6543/ in your browser.
 
-- 
cgit v1.2.3


From 71c979fb9a89cffdc57a9533a61101483c23b93b Mon Sep 17 00:00:00 2001
From: Daniel Haaker <d.haaker@gmail.com>
Date: Wed, 26 Mar 2014 09:56:15 +0100
Subject: Remove whitespace before the open parenthesis

---
 docs/quick_tutorial/hello_world/app.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/quick_tutorial/hello_world/app.py b/docs/quick_tutorial/hello_world/app.py
index 210075023..0a95f9ad3 100644
--- a/docs/quick_tutorial/hello_world/app.py
+++ b/docs/quick_tutorial/hello_world/app.py
@@ -4,7 +4,7 @@ from pyramid.response import Response
 
 
 def hello_world(request):
-    print ('Incoming request')
+    print('Incoming request')
     return Response('<body><h1>Hello World!</h1></body>')
 
 
@@ -14,4 +14,4 @@ if __name__ == '__main__':
     config.add_view(hello_world, route_name='hello')
     app = config.make_wsgi_app()
     server = make_server('0.0.0.0', 6543, app)
-    server.serve_forever()
\ No newline at end of file
+    server.serve_forever()
-- 
cgit v1.2.3


From 92b27dc06a4a73ea4ff0649855a5a84cd30b458c Mon Sep 17 00:00:00 2001
From: Daniel Haaker <d.haaker@gmail.com>
Date: Wed, 26 Mar 2014 10:10:54 +0100
Subject: Update hello_world.rst

Modify 'Extra Credit' to reflect code example
---
 docs/quick_tutorial/hello_world.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/quick_tutorial/hello_world.rst b/docs/quick_tutorial/hello_world.rst
index 86e1319f0..1a9ba4c9d 100644
--- a/docs/quick_tutorial/hello_world.rst
+++ b/docs/quick_tutorial/hello_world.rst
@@ -96,13 +96,13 @@ Extra Credit
 
    .. code-block:: python
 
-      print ('Starting up server on http://localhost:6547')
+      print('Incoming request')
 
    ...instead of:
 
    .. code-block:: python
 
-      print 'Starting up server on http://localhost:6547'
+      print 'Incoming request'
 
 #. What happens if you return a string of HTML? A sequence of integers?
 
-- 
cgit v1.2.3


From 32200c3af84c352c066eb2c402496305375912e4 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 27 Mar 2014 22:03:59 -0500
Subject: broadcast 3.4 support

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

diff --git a/setup.py b/setup.py
index 3c17af20d..bb443330d 100644
--- a/setup.py
+++ b/setup.py
@@ -79,6 +79,7 @@ setup(name='pyramid',
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.2",
         "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Framework :: Pyramid",
-- 
cgit v1.2.3


From e4dc7443ddf8e5e3d861c66e0cef565a6d907789 Mon Sep 17 00:00:00 2001
From: Wichert Akkerman <wichert@wiggy.net>
Date: Tue, 8 Apr 2014 20:07:59 +0200
Subject: Update documentation for Lingua 2

---
 docs/narr/i18n.rst                       | 182 ++++++++-----------------------
 pyramid/scaffolds/alchemy/setup.cfg_tmpl |  21 ----
 pyramid/scaffolds/starter/setup.cfg_tmpl |  21 ----
 pyramid/scaffolds/zodb/setup.cfg_tmpl    |  21 ----
 4 files changed, 48 insertions(+), 197 deletions(-)

diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
index 5f50ca212..31b63664b 100644
--- a/docs/narr/i18n.rst
+++ b/docs/narr/i18n.rst
@@ -245,88 +245,69 @@ GNU gettext uses three types of files in the translation framework,
 
   A ``.po`` file is turned into a machine-readable binary file, which
   is the ``.mo`` file. Compiling the translations to machine code
-  makes the localized program run faster.
+  makes the localized program start faster.
 
 The tools for working with :term:`gettext` translation files related to a
-:app:`Pyramid` application is :term:`Babel` and :term:`Lingua`.  Lingua is a
-Babel extension that provides support for scraping i18n references out of
-Python and Chameleon files.
+:app:`Pyramid` application are :term:`Lingua` and :term:`Gettext`. Lingua
+can scrape i18n references out of Python and Chameleon files and create
+the ``.pot`` file. Gettext includes tools to update a ``.po`` file from
+an updated ``.pot`` file and to compile ``.po`` files to ``.mo`` files.
 
 .. index::
-   single: Babel
+   single: Gettext
    single: Lingua
 
 .. _installing_babel:
 
-Installing Babel and Lingua
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Installing Lingua and Gettext
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 In order for the commands related to working with ``gettext`` translation
-files to work properly, you will need to have :term:`Babel` and
-:term:`Lingua` installed into the same environment in which :app:`Pyramid` is
+files to work properly, you will need to have :term:`Lingua` and
+:term:`Gettext` installed into the same environment in which :app:`Pyramid` is
 installed.
 
 Installation on UNIX
 ++++++++++++++++++++
 
-If the :term:`virtualenv` into which you've installed your :app:`Pyramid`
-application lives in ``/my/virtualenv``, you can install Babel and Lingua
-like so:
+Gettext is often already installed on UNIX systems. You can check if it is
+installed by testing if the ``msgfmt`` command is available. If it is not
+available you can install it through the packaging system from your OS;
+the package name is almost always ``gettext``. For example on a Debian or
+Ubuntu system run this command:
 
 .. code-block:: text
 
-   $ cd /my/virtualenv
-   $ $VENV/bin/easy_install Babel lingua
+   $ sudo apt-get install gettext
 
-Installation on Windows
-+++++++++++++++++++++++
-
-If the :term:`virtualenv` into which you've installed your :app:`Pyramid`
-application lives in ``C:\my\virtualenv``, you can install Babel and Lingua
+Installing Lingua is done with the Python packaging tools. If the
+:term:`virtualenv` into which you've installed your :app:`Pyramid` application
+lives in ``/my/virtualenv``, you can install Lingua
 like so:
 
 .. code-block:: text
 
-   C> %VENV%\Scripts\easy_install Babel lingua
+   $ cd /my/virtualenv
+   $ $VENV/bin/pip install lingua
 
-.. index::
-   single: Babel; message extractors
-   single: Lingua
+Installation on Windows
++++++++++++++++++++++++
 
-Changing the ``setup.py``
-+++++++++++++++++++++++++
+There are several ways to install Gettext on Windows: it is included in the
+`Cygwin <http://www.cygwin.com/>`_ collection, or you can use the `installer
+from the GnuWin32 <http://gnuwin32.sourceforge.net/packages/gettext.htm>`_
+or compile it yourself. Make sure the installation path is added to your
+``$PATH``.
 
-You need to add a few boilerplate lines to your application's ``setup.py``
-file in order to properly generate :term:`gettext` files from your
-application.
 
-.. note:: See :ref:`project_narr` to learn about the
-  composition of an application's ``setup.py`` file.
+Installing Lingua is done with the Python packaging tools. If the
+:term:`virtualenv` into which you've installed your :app:`Pyramid` application
+lives in ``C:\my\virtualenv``, you can install Lingua like so:
 
-In particular, add the ``Babel`` and ``lingua`` distributions to the
-``install_requires`` list and insert a set of references to :term:`Babel`
-*message extractors* within the call to :func:`setuptools.setup` inside your
-application's ``setup.py`` file:
+.. code-block:: text
 
-.. code-block:: python
-    :linenos:
+   C> %VENV%\Scripts\pip install lingua
 
-    setup(name="mypackage",
-          # ...
-          install_requires = [
-                # ...
-                'Babel',
-                'lingua',
-                ],
-          message_extractors = { '.': [
-                ('**.py',   'lingua_python', None ),
-                ('**.pt',   'lingua_xml', None ),
-                ]},
-          )
-
-The ``message_extractors`` stanza placed into the ``setup.py`` file causes
-the :term:`Babel` message catalog extraction machinery to also consider
-``*.pt`` files when doing message id extraction.
 
 .. index::
    pair: extracting; messages
@@ -336,90 +317,20 @@ the :term:`Babel` message catalog extraction machinery to also consider
 Extracting Messages from Code and Templates
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Once Babel and Lingua are installed and your application's ``setup.py`` file
-has the correct message extractor references, you may extract a message
-catalog template from the code and :term:`Chameleon` templates which reside
-in your :app:`Pyramid` application.  You run a ``setup.py`` command to
-extract the messages:
+Once Lingua is installed you may extract a message catalog template from the
+code and :term:`Chameleon` templates which reside in your :app:`Pyramid`
+application.  You run a ``pot-create`` command to extract the messages:
 
 .. code-block:: text
 
    $ cd /place/where/myapplication/setup.py/lives
    $ mkdir -p myapplication/locale
-   $ $VENV/bin/python setup.py extract_messages
+   $ $VENT/bin/pot-create src > myapplication/locale/myapplication.pot
 
 The message catalog ``.pot`` template will end up in:
 
 ``myapplication/locale/myapplication.pot``.
 
-.. index::
-   single: translation domains
-
-Translation Domains
-+++++++++++++++++++
-
-The name ``myapplication`` above in the filename ``myapplication.pot``
-denotes the :term:`translation domain` of the translations that must
-be performed to localize your application.  By default, the
-translation domain is the :term:`project` name of your
-:app:`Pyramid` application.
-
-To change the translation domain of the extracted messages in your project,
-edit the ``setup.cfg`` file of your application, The default ``setup.cfg``
-file of a ``pcreate`` -generated :app:`Pyramid` application has stanzas in it
-that look something like the following:
-
-.. code-block:: ini
-    :linenos:
-
-    [compile_catalog]
-    directory = myproject/locale
-    domain = MyProject
-    statistics = true
-
-    [extract_messages]
-    add_comments = TRANSLATORS:
-    output_file = myproject/locale/MyProject.pot
-    width = 80
-
-    [init_catalog]
-    domain = MyProject
-    input_file = myproject/locale/MyProject.pot
-    output_dir = myproject/locale
-
-    [update_catalog]
-    domain = MyProject
-    input_file = myproject/locale/MyProject.pot
-    output_dir = myproject/locale
-    previous = true
-
-In the above example, the project name is ``MyProject``.  To indicate
-that you'd like the domain of your translations to be ``mydomain``
-instead, change the ``setup.cfg`` file stanzas to look like so:
-
-.. code-block:: ini
-    :linenos:
-
-    [compile_catalog]
-    directory = myproject/locale
-    domain = mydomain
-    statistics = true
-
-    [extract_messages]
-    add_comments = TRANSLATORS:
-    output_file = myproject/locale/mydomain.pot
-    width = 80
-
-    [init_catalog]
-    domain = mydomain
-    input_file = myproject/locale/mydomain.pot
-    output_dir = myproject/locale
-
-    [update_catalog]
-    domain = mydomain
-    input_file = myproject/locale/mydomain.pot
-    output_dir = myproject/locale
-    previous = true
 
 .. index::
    pair: initializing; message catalog
@@ -432,15 +343,17 @@ Once you've extracted messages into a ``.pot`` file (see
 in the ``.pot`` file, you need to generate at least one ``.po`` file.
 A ``.po`` file represents translations of a particular set of messages
 to a particular locale.  Initialize a ``.po`` file for a specific
-locale from a pre-generated ``.pot`` template by using the ``setup.py
-init_catalog`` command:
+locale from a pre-generated ``.pot`` template by using the ``msginit``
+command:
 
 .. code-block:: text
 
    $ cd /place/where/myapplication/setup.py/lives
-   $ $VENV/bin/python setup.py init_catalog -l es
+   $ cd myapplication/locale
+   $ mkdir -p es/LC_MESSAGES
+   $ msginit -l es es/LC_MESSAGES/myapplication.po
 
-By default, the message catalog ``.po`` file will end up in:
+This will create a new the message catalog ``.po`` file will in:
 
 ``myapplication/locale/es/LC_MESSAGES/myapplication.po``.
 
@@ -465,12 +378,13 @@ files based on changes to the ``.pot`` file, so that the new and
 changed messages can also be translated or re-translated.
 
 First, regenerate the ``.pot`` file as per :ref:`extracting_messages`.
-Then use the ``setup.py update_catalog`` command.
+Then use the ``msgmerge`` command.
 
 .. code-block:: text
 
    $ cd /place/where/myapplication/setup.py/lives
-   $ $VENV/bin/python setup.py update_catalog
+   $ cd myapplication/locale
+   $ msgmerge --update es/LC_MESSAGES/myapplication.po myapplication.pot
 
 .. index::
    pair: compiling; message catalog
@@ -481,12 +395,12 @@ Compiling a Message Catalog File
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Finally, to prepare an application for performing actual runtime
-translations, compile ``.po`` files to ``.mo`` files:
+translations, compile ``.po`` files to ``.mo`` files use the ``msgfmt``:
 
 .. code-block:: text
 
    $ cd /place/where/myapplication/setup.py/lives
-   $ $VENV/bin/python setup.py compile_catalog
+   $ msgfmt myapplication/locale/*/LC_MESSAGES/*.po
 
 This will create a ``.mo`` file for each ``.po`` file in your
 application.  As long as the :term:`translation directory` in which
diff --git a/pyramid/scaffolds/alchemy/setup.cfg_tmpl b/pyramid/scaffolds/alchemy/setup.cfg_tmpl
index 5bec29823..8bf5d22c1 100644
--- a/pyramid/scaffolds/alchemy/setup.cfg_tmpl
+++ b/pyramid/scaffolds/alchemy/setup.cfg_tmpl
@@ -4,24 +4,3 @@ nocapture=1
 cover-package={{package}}
 with-coverage=1
 cover-erase=1
-
-[compile_catalog]
-directory = {{package}}/locale
-domain = {{project}}
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = {{package}}/locale/{{project}}.pot
-width = 80
-
-[init_catalog]
-domain = {{project}}
-input_file = {{package}}/locale/{{project}}.pot
-output_dir = {{package}}/locale
-
-[update_catalog]
-domain = {{project}}
-input_file = {{package}}/locale/{{project}}.pot
-output_dir = {{package}}/locale
-previous = true
diff --git a/pyramid/scaffolds/starter/setup.cfg_tmpl b/pyramid/scaffolds/starter/setup.cfg_tmpl
index 04c738049..1bc9ec437 100644
--- a/pyramid/scaffolds/starter/setup.cfg_tmpl
+++ b/pyramid/scaffolds/starter/setup.cfg_tmpl
@@ -4,24 +4,3 @@ nocapture = 1
 cover-package = {{package}}
 with-coverage = 1
 cover-erase = 1
-
-[compile_catalog]
-directory = {{package}}/locale
-domain = {{project}}
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = {{package}}/locale/{{project}}.pot
-width = 80
-
-[init_catalog]
-domain = {{project}}
-input_file = {{package}}/locale/{{project}}.pot
-output_dir = {{package}}/locale
-
-[update_catalog]
-domain = {{project}}
-input_file = {{package}}/locale/{{project}}.pot
-output_dir = {{package}}/locale
-previous = true
diff --git a/pyramid/scaffolds/zodb/setup.cfg_tmpl b/pyramid/scaffolds/zodb/setup.cfg_tmpl
index 5bec29823..8bf5d22c1 100644
--- a/pyramid/scaffolds/zodb/setup.cfg_tmpl
+++ b/pyramid/scaffolds/zodb/setup.cfg_tmpl
@@ -4,24 +4,3 @@ nocapture=1
 cover-package={{package}}
 with-coverage=1
 cover-erase=1
-
-[compile_catalog]
-directory = {{package}}/locale
-domain = {{project}}
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = {{package}}/locale/{{project}}.pot
-width = 80
-
-[init_catalog]
-domain = {{project}}
-input_file = {{package}}/locale/{{project}}.pot
-output_dir = {{package}}/locale
-
-[update_catalog]
-domain = {{project}}
-input_file = {{package}}/locale/{{project}}.pot
-output_dir = {{package}}/locale
-previous = true
-- 
cgit v1.2.3


From 98a99d726f8892376f69fba0fa6b99752972f1c8 Mon Sep 17 00:00:00 2001
From: Wichert Akkerman <wichert@wiggy.net>
Date: Tue, 8 Apr 2014 20:11:37 +0200
Subject: Update Lingua glossary item.

---
 docs/glossary.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/glossary.rst b/docs/glossary.rst
index 0e340491b..2cc461a77 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -801,8 +801,9 @@ Glossary
      application.
 
    Lingua
-     A package by Wichert Akkerman which provides :term:`Babel` message
-     extractors for Python source files and Chameleon ZPT template files.
+     A package by Wichert Akkerman which provides the ``pot-create``
+     command to extract translateable messages from Python sources
+     and Chameleon ZPT template files.
 
    Message Identifier
      A string used as a translation lookup key during localization.
-- 
cgit v1.2.3


From cfaec8b63b271e141789244ad276d3045e00a2a8 Mon Sep 17 00:00:00 2001
From: Wichert Akkerman <wichert@wiggy.net>
Date: Tue, 8 Apr 2014 21:01:43 +0200
Subject: Keep using easy_install.

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

diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
index 31b63664b..122f33130 100644
--- a/docs/narr/i18n.rst
+++ b/docs/narr/i18n.rst
@@ -288,7 +288,7 @@ like so:
 .. code-block:: text
 
    $ cd /my/virtualenv
-   $ $VENV/bin/pip install lingua
+   $ $VENV/bin/easy_install lingua
 
 Installation on Windows
 +++++++++++++++++++++++
@@ -306,7 +306,7 @@ lives in ``C:\my\virtualenv``, you can install Lingua like so:
 
 .. code-block:: text
 
-   C> %VENV%\Scripts\pip install lingua
+   C> %VENV%\Scripts\easy_install lingua
 
 
 .. index::
-- 
cgit v1.2.3


From d3a70e5e656eea3f527b56e9f03b6f754731dc4a Mon Sep 17 00:00:00 2001
From: Wichert Akkerman <wichert@wiggy.net>
Date: Tue, 8 Apr 2014 21:04:57 +0200
Subject: Fix $VENT typo

---
 docs/narr/i18n.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
index 122f33130..50e5a6817 100644
--- a/docs/narr/i18n.rst
+++ b/docs/narr/i18n.rst
@@ -325,7 +325,7 @@ application.  You run a ``pot-create`` command to extract the messages:
 
    $ cd /place/where/myapplication/setup.py/lives
    $ mkdir -p myapplication/locale
-   $ $VENT/bin/pot-create src > myapplication/locale/myapplication.pot
+   $ $VENV/bin/pot-create src > myapplication/locale/myapplication.pot
 
 The message catalog ``.pot`` template will end up in:
 
-- 
cgit v1.2.3


From c1cbf085fbf4e0280481acfbf1e9b6b0f8692cbd Mon Sep 17 00:00:00 2001
From: Wichert Akkerman <wichert@wiggy.net>
Date: Tue, 8 Apr 2014 21:07:24 +0200
Subject: Remove lingua references from setup.cfg description.

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

diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 62b91de0e..3631a9782 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -760,8 +760,8 @@ Our generated ``setup.cfg`` looks like this:
    :language: guess
    :linenos:
 
-The values in the default setup file allow various commonly-used
-internationalization commands and testing commands to work more smoothly.
+The values in the default setup file make the testing commands to work more
+smoothly.
 
 .. index::
    single: package
-- 
cgit v1.2.3


From 0a4433df3711755170396090d8daa69bfaef76f9 Mon Sep 17 00:00:00 2001
From: Wichert Akkerman <wichert@wiggy.net>
Date: Tue, 8 Apr 2014 21:09:34 +0200
Subject: Always mention the msg* commands come from Gettext

---
 docs/narr/i18n.rst | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
index 50e5a6817..1de2c8941 100644
--- a/docs/narr/i18n.rst
+++ b/docs/narr/i18n.rst
@@ -250,8 +250,9 @@ GNU gettext uses three types of files in the translation framework,
 The tools for working with :term:`gettext` translation files related to a
 :app:`Pyramid` application are :term:`Lingua` and :term:`Gettext`. Lingua
 can scrape i18n references out of Python and Chameleon files and create
-the ``.pot`` file. Gettext includes tools to update a ``.po`` file from
-an updated ``.pot`` file and to compile ``.po`` files to ``.mo`` files.
+the ``.pot`` file. Gettext includes ``msgmerge`` tool to update a ``.po`` file
+from an updated ``.pot`` file and ``msgfmt`` to compile ``.po`` files to
+``.mo`` files.
 
 .. index::
    single: Gettext
@@ -344,7 +345,7 @@ in the ``.pot`` file, you need to generate at least one ``.po`` file.
 A ``.po`` file represents translations of a particular set of messages
 to a particular locale.  Initialize a ``.po`` file for a specific
 locale from a pre-generated ``.pot`` template by using the ``msginit``
-command:
+command from Gettext:
 
 .. code-block:: text
 
@@ -378,7 +379,7 @@ files based on changes to the ``.pot`` file, so that the new and
 changed messages can also be translated or re-translated.
 
 First, regenerate the ``.pot`` file as per :ref:`extracting_messages`.
-Then use the ``msgmerge`` command.
+Then use the ``msgmerge`` command from Gettext.
 
 .. code-block:: text
 
@@ -395,7 +396,8 @@ Compiling a Message Catalog File
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Finally, to prepare an application for performing actual runtime
-translations, compile ``.po`` files to ``.mo`` files use the ``msgfmt``:
+translations, compile ``.po`` files to ``.mo`` files use the ``msgfmt``
+command from Gettext:
 
 .. code-block:: text
 
-- 
cgit v1.2.3


From 832c2e8967fa1904fb1a0d3e5d707a11c32aa543 Mon Sep 17 00:00:00 2001
From: Wichert Akkerman <wichert@wiggy.net>
Date: Tue, 8 Apr 2014 21:49:44 +0200
Subject: Remove Babel from all setup.cfg files

---
 docs/narr/MyProject/setup.cfg                      | 21 ---------------------
 docs/quick_tour/awesome/setup.cfg                  | 22 ----------------------
 docs/quick_tour/package/setup.cfg                  | 22 ----------------------
 docs/quick_tour/sqla_demo/setup.cfg                | 21 ---------------------
 docs/quick_tutorial/scaffolds/setup.cfg            | 21 ---------------------
 docs/tutorials/wiki/src/authorization/setup.cfg    | 22 ----------------------
 docs/tutorials/wiki/src/basiclayout/setup.cfg      | 21 ---------------------
 docs/tutorials/wiki/src/models/setup.cfg           | 22 ----------------------
 docs/tutorials/wiki/src/tests/setup.cfg            | 22 ----------------------
 docs/tutorials/wiki/src/views/setup.cfg            | 22 ----------------------
 docs/tutorials/wiki2/src/authorization/setup.cfg   | 21 ---------------------
 docs/tutorials/wiki2/src/basiclayout/setup.cfg     | 21 ---------------------
 docs/tutorials/wiki2/src/models/setup.cfg          | 21 ---------------------
 docs/tutorials/wiki2/src/tests/setup.cfg           | 21 ---------------------
 docs/tutorials/wiki2/src/views/setup.cfg           | 21 ---------------------
 .../test_scaffolds/fixture_scaffold/setup.cfg_tmpl | 21 ---------------------
 16 files changed, 342 deletions(-)

diff --git a/docs/narr/MyProject/setup.cfg b/docs/narr/MyProject/setup.cfg
index 332e80a60..229a686f8 100644
--- a/docs/narr/MyProject/setup.cfg
+++ b/docs/narr/MyProject/setup.cfg
@@ -4,24 +4,3 @@ nocapture = 1
 cover-package = myproject
 with-coverage = 1
 cover-erase = 1
-
-[compile_catalog]
-directory = myproject/locale
-domain = MyProject
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = myproject/locale/MyProject.pot
-width = 80
-
-[init_catalog]
-domain = MyProject
-input_file = myproject/locale/MyProject.pot
-output_dir = myproject/locale
-
-[update_catalog]
-domain = MyProject
-input_file = myproject/locale/MyProject.pot
-output_dir = myproject/locale
-previous = true
diff --git a/docs/quick_tour/awesome/setup.cfg b/docs/quick_tour/awesome/setup.cfg
index b1cd90d2c..14f322085 100644
--- a/docs/quick_tour/awesome/setup.cfg
+++ b/docs/quick_tour/awesome/setup.cfg
@@ -4,25 +4,3 @@ nocapture = 1
 cover-package = awesome
 with-coverage = 1
 cover-erase = 1
-
-[compile_catalog]
-directory = awesome/locale
-domain = awesome
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = awesome/locale/awesome.pot
-width = 80
-mapping_file = message-extraction.ini
-
-[init_catalog]
-domain = awesome
-input_file = awesome/locale/awesome.pot
-output_dir = awesome/locale
-
-[update_catalog]
-domain = awesome
-input_file = awesome/locale/awesome.pot
-output_dir = awesome/locale
-previous = true
diff --git a/docs/quick_tour/package/setup.cfg b/docs/quick_tour/package/setup.cfg
index 186e796fc..ac8bb6e21 100644
--- a/docs/quick_tour/package/setup.cfg
+++ b/docs/quick_tour/package/setup.cfg
@@ -4,25 +4,3 @@ nocapture = 1
 cover-package = hello_world
 with-coverage = 1
 cover-erase = 1
-
-[compile_catalog]
-directory = hello_world/locale
-domain = hello_world
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = hello_world/locale/hello_world.pot
-width = 80
-mapping_file = message-extraction.ini
-
-[init_catalog]
-domain = hello_world
-input_file = hello_world/locale/hello_world.pot
-output_dir = hello_world/locale
-
-[update_catalog]
-domain = hello_world
-input_file = hello_world/locale/hello_world.pot
-output_dir = hello_world/locale
-previous = true
diff --git a/docs/quick_tour/sqla_demo/setup.cfg b/docs/quick_tour/sqla_demo/setup.cfg
index 9f91cd122..27dbd2377 100644
--- a/docs/quick_tour/sqla_demo/setup.cfg
+++ b/docs/quick_tour/sqla_demo/setup.cfg
@@ -4,24 +4,3 @@ nocapture=1
 cover-package=sqla_demo
 with-coverage=1
 cover-erase=1
-
-[compile_catalog]
-directory = sqla_demo/locale
-domain = sqla_demo
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = sqla_demo/locale/sqla_demo.pot
-width = 80
-
-[init_catalog]
-domain = sqla_demo
-input_file = sqla_demo/locale/sqla_demo.pot
-output_dir = sqla_demo/locale
-
-[update_catalog]
-domain = sqla_demo
-input_file = sqla_demo/locale/sqla_demo.pot
-output_dir = sqla_demo/locale
-previous = true
diff --git a/docs/quick_tutorial/scaffolds/setup.cfg b/docs/quick_tutorial/scaffolds/setup.cfg
index c980261e3..16e18719c 100644
--- a/docs/quick_tutorial/scaffolds/setup.cfg
+++ b/docs/quick_tutorial/scaffolds/setup.cfg
@@ -4,24 +4,3 @@ nocapture = 1
 cover-package = scaffolds
 with-coverage = 1
 cover-erase = 1
-
-[compile_catalog]
-directory = scaffolds/locale
-domain = scaffolds
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = scaffolds/locale/scaffolds.pot
-width = 80
-
-[init_catalog]
-domain = scaffolds
-input_file = scaffolds/locale/scaffolds.pot
-output_dir = scaffolds/locale
-
-[update_catalog]
-domain = scaffolds
-input_file = scaffolds/locale/scaffolds.pot
-output_dir = scaffolds/locale
-previous = true
diff --git a/docs/tutorials/wiki/src/authorization/setup.cfg b/docs/tutorials/wiki/src/authorization/setup.cfg
index 3d7ea6e23..807ea6b0e 100644
--- a/docs/tutorials/wiki/src/authorization/setup.cfg
+++ b/docs/tutorials/wiki/src/authorization/setup.cfg
@@ -4,25 +4,3 @@ nocapture=1
 cover-package=tutorial
 with-coverage=1
 cover-erase=1
-
-[compile_catalog]
-directory = tutorial/locale
-domain = tutorial
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = tutorial/locale/tutorial.pot
-width = 80
-
-[init_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-
-[update_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-previous = true
-
diff --git a/docs/tutorials/wiki/src/basiclayout/setup.cfg b/docs/tutorials/wiki/src/basiclayout/setup.cfg
index 23b2ad983..807ea6b0e 100644
--- a/docs/tutorials/wiki/src/basiclayout/setup.cfg
+++ b/docs/tutorials/wiki/src/basiclayout/setup.cfg
@@ -4,24 +4,3 @@ nocapture=1
 cover-package=tutorial
 with-coverage=1
 cover-erase=1
-
-[compile_catalog]
-directory = tutorial/locale
-domain = tutorial
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = tutorial/locale/tutorial.pot
-width = 80
-
-[init_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-
-[update_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-previous = true
diff --git a/docs/tutorials/wiki/src/models/setup.cfg b/docs/tutorials/wiki/src/models/setup.cfg
index 3d7ea6e23..807ea6b0e 100644
--- a/docs/tutorials/wiki/src/models/setup.cfg
+++ b/docs/tutorials/wiki/src/models/setup.cfg
@@ -4,25 +4,3 @@ nocapture=1
 cover-package=tutorial
 with-coverage=1
 cover-erase=1
-
-[compile_catalog]
-directory = tutorial/locale
-domain = tutorial
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = tutorial/locale/tutorial.pot
-width = 80
-
-[init_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-
-[update_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-previous = true
-
diff --git a/docs/tutorials/wiki/src/tests/setup.cfg b/docs/tutorials/wiki/src/tests/setup.cfg
index 3d7ea6e23..807ea6b0e 100644
--- a/docs/tutorials/wiki/src/tests/setup.cfg
+++ b/docs/tutorials/wiki/src/tests/setup.cfg
@@ -4,25 +4,3 @@ nocapture=1
 cover-package=tutorial
 with-coverage=1
 cover-erase=1
-
-[compile_catalog]
-directory = tutorial/locale
-domain = tutorial
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = tutorial/locale/tutorial.pot
-width = 80
-
-[init_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-
-[update_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-previous = true
-
diff --git a/docs/tutorials/wiki/src/views/setup.cfg b/docs/tutorials/wiki/src/views/setup.cfg
index 3d7ea6e23..807ea6b0e 100644
--- a/docs/tutorials/wiki/src/views/setup.cfg
+++ b/docs/tutorials/wiki/src/views/setup.cfg
@@ -4,25 +4,3 @@ nocapture=1
 cover-package=tutorial
 with-coverage=1
 cover-erase=1
-
-[compile_catalog]
-directory = tutorial/locale
-domain = tutorial
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = tutorial/locale/tutorial.pot
-width = 80
-
-[init_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-
-[update_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-previous = true
-
diff --git a/docs/tutorials/wiki2/src/authorization/setup.cfg b/docs/tutorials/wiki2/src/authorization/setup.cfg
index 23b2ad983..807ea6b0e 100644
--- a/docs/tutorials/wiki2/src/authorization/setup.cfg
+++ b/docs/tutorials/wiki2/src/authorization/setup.cfg
@@ -4,24 +4,3 @@ nocapture=1
 cover-package=tutorial
 with-coverage=1
 cover-erase=1
-
-[compile_catalog]
-directory = tutorial/locale
-domain = tutorial
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = tutorial/locale/tutorial.pot
-width = 80
-
-[init_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-
-[update_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-previous = true
diff --git a/docs/tutorials/wiki2/src/basiclayout/setup.cfg b/docs/tutorials/wiki2/src/basiclayout/setup.cfg
index 23b2ad983..807ea6b0e 100644
--- a/docs/tutorials/wiki2/src/basiclayout/setup.cfg
+++ b/docs/tutorials/wiki2/src/basiclayout/setup.cfg
@@ -4,24 +4,3 @@ nocapture=1
 cover-package=tutorial
 with-coverage=1
 cover-erase=1
-
-[compile_catalog]
-directory = tutorial/locale
-domain = tutorial
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = tutorial/locale/tutorial.pot
-width = 80
-
-[init_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-
-[update_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-previous = true
diff --git a/docs/tutorials/wiki2/src/models/setup.cfg b/docs/tutorials/wiki2/src/models/setup.cfg
index 23b2ad983..807ea6b0e 100644
--- a/docs/tutorials/wiki2/src/models/setup.cfg
+++ b/docs/tutorials/wiki2/src/models/setup.cfg
@@ -4,24 +4,3 @@ nocapture=1
 cover-package=tutorial
 with-coverage=1
 cover-erase=1
-
-[compile_catalog]
-directory = tutorial/locale
-domain = tutorial
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = tutorial/locale/tutorial.pot
-width = 80
-
-[init_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-
-[update_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-previous = true
diff --git a/docs/tutorials/wiki2/src/tests/setup.cfg b/docs/tutorials/wiki2/src/tests/setup.cfg
index 23b2ad983..807ea6b0e 100644
--- a/docs/tutorials/wiki2/src/tests/setup.cfg
+++ b/docs/tutorials/wiki2/src/tests/setup.cfg
@@ -4,24 +4,3 @@ nocapture=1
 cover-package=tutorial
 with-coverage=1
 cover-erase=1
-
-[compile_catalog]
-directory = tutorial/locale
-domain = tutorial
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = tutorial/locale/tutorial.pot
-width = 80
-
-[init_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-
-[update_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-previous = true
diff --git a/docs/tutorials/wiki2/src/views/setup.cfg b/docs/tutorials/wiki2/src/views/setup.cfg
index 23b2ad983..807ea6b0e 100644
--- a/docs/tutorials/wiki2/src/views/setup.cfg
+++ b/docs/tutorials/wiki2/src/views/setup.cfg
@@ -4,24 +4,3 @@ nocapture=1
 cover-package=tutorial
 with-coverage=1
 cover-erase=1
-
-[compile_catalog]
-directory = tutorial/locale
-domain = tutorial
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = tutorial/locale/tutorial.pot
-width = 80
-
-[init_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-
-[update_catalog]
-domain = tutorial
-input_file = tutorial/locale/tutorial.pot
-output_dir = tutorial/locale
-previous = true
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/setup.cfg_tmpl b/pyramid/tests/test_scaffolds/fixture_scaffold/setup.cfg_tmpl
index 04c738049..1bc9ec437 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/setup.cfg_tmpl
+++ b/pyramid/tests/test_scaffolds/fixture_scaffold/setup.cfg_tmpl
@@ -4,24 +4,3 @@ nocapture = 1
 cover-package = {{package}}
 with-coverage = 1
 cover-erase = 1
-
-[compile_catalog]
-directory = {{package}}/locale
-domain = {{project}}
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = {{package}}/locale/{{project}}.pot
-width = 80
-
-[init_catalog]
-domain = {{project}}
-input_file = {{package}}/locale/{{project}}.pot
-output_dir = {{package}}/locale
-
-[update_catalog]
-domain = {{project}}
-input_file = {{package}}/locale/{{project}}.pot
-output_dir = {{package}}/locale
-previous = true
-- 
cgit v1.2.3


From 90600c7484d7e3ec8620e9fbe42f3449ffa6feb2 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 8 Apr 2014 15:54:25 -0400
Subject: add changenote

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

diff --git a/CHANGES.txt b/CHANGES.txt
index fdf2ac644..32881ef8a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,6 +13,9 @@ Unreleased
   ``reissue_time=None`` would cause an exception when modifying the session.
   See https://github.com/Pylons/pyramid/issues/1247
 
+- Updated docs and scaffolds to keep in step with new 2.0 release of
+  ``Lingua``.
+
 1.5b1 (2014-02-08)
 ==================
 
-- 
cgit v1.2.3


From eab0eb5068754da33123d5a7bc3faf025a3fc14e Mon Sep 17 00:00:00 2001
From: Wichert Akkerman <wichert@wiggy.net>
Date: Tue, 8 Apr 2014 22:04:47 +0200
Subject: Drop setup.cfg from scaffolds

Since setup.cfg is no longer needed for Babel, and no scaffold or
documentation references nose there is no need to keep them.
---
 docs/narr/MyProject/setup.cfg                      |  6 ------
 docs/narr/project.rst                              | 22 ----------------------
 docs/quick_tour/awesome/setup.cfg                  |  6 ------
 docs/quick_tour/package/setup.cfg                  |  6 ------
 docs/quick_tour/sqla_demo/setup.cfg                |  6 ------
 docs/quick_tutorial/scaffolds/setup.cfg            |  6 ------
 docs/tutorials/wiki/src/authorization/setup.cfg    |  6 ------
 docs/tutorials/wiki/src/basiclayout/setup.cfg      |  6 ------
 docs/tutorials/wiki/src/models/setup.cfg           |  6 ------
 docs/tutorials/wiki/src/tests/setup.cfg            |  6 ------
 docs/tutorials/wiki/src/views/setup.cfg            |  6 ------
 docs/tutorials/wiki2/src/authorization/setup.cfg   |  6 ------
 docs/tutorials/wiki2/src/basiclayout/setup.cfg     |  6 ------
 docs/tutorials/wiki2/src/models/setup.cfg          |  6 ------
 docs/tutorials/wiki2/src/tests/setup.cfg           |  6 ------
 docs/tutorials/wiki2/src/views/setup.cfg           |  6 ------
 pyramid/scaffolds/alchemy/setup.cfg_tmpl           |  6 ------
 pyramid/scaffolds/starter/setup.cfg_tmpl           |  6 ------
 pyramid/scaffolds/zodb/setup.cfg_tmpl              |  6 ------
 .../test_scaffolds/fixture_scaffold/setup.cfg_tmpl |  6 ------
 20 files changed, 136 deletions(-)
 delete mode 100644 docs/narr/MyProject/setup.cfg
 delete mode 100644 docs/quick_tour/awesome/setup.cfg
 delete mode 100644 docs/quick_tour/package/setup.cfg
 delete mode 100644 docs/quick_tour/sqla_demo/setup.cfg
 delete mode 100644 docs/quick_tutorial/scaffolds/setup.cfg
 delete mode 100644 docs/tutorials/wiki/src/authorization/setup.cfg
 delete mode 100644 docs/tutorials/wiki/src/basiclayout/setup.cfg
 delete mode 100644 docs/tutorials/wiki/src/models/setup.cfg
 delete mode 100644 docs/tutorials/wiki/src/tests/setup.cfg
 delete mode 100644 docs/tutorials/wiki/src/views/setup.cfg
 delete mode 100644 docs/tutorials/wiki2/src/authorization/setup.cfg
 delete mode 100644 docs/tutorials/wiki2/src/basiclayout/setup.cfg
 delete mode 100644 docs/tutorials/wiki2/src/models/setup.cfg
 delete mode 100644 docs/tutorials/wiki2/src/tests/setup.cfg
 delete mode 100644 docs/tutorials/wiki2/src/views/setup.cfg
 delete mode 100644 pyramid/scaffolds/alchemy/setup.cfg_tmpl
 delete mode 100644 pyramid/scaffolds/starter/setup.cfg_tmpl
 delete mode 100644 pyramid/scaffolds/zodb/setup.cfg_tmpl
 delete mode 100644 pyramid/tests/test_scaffolds/fixture_scaffold/setup.cfg_tmpl

diff --git a/docs/narr/MyProject/setup.cfg b/docs/narr/MyProject/setup.cfg
deleted file mode 100644
index 229a686f8..000000000
--- a/docs/narr/MyProject/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match = ^test
-nocapture = 1
-cover-package = myproject
-with-coverage = 1
-cover-erase = 1
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 3631a9782..39e55706f 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -492,7 +492,6 @@ structure:
   │   ├── tests.py
   │   └── views.py
   ├── production.ini
-  ├── setup.cfg
   └── setup.py
 
 The ``MyProject`` :term:`Project`
@@ -515,9 +514,6 @@ describe, run, and test your application.
 #. ``production.ini`` is a :term:`PasteDeploy` configuration file that can
    be used to execute your application in a production configuration.
 
-#. ``setup.cfg`` is a :term:`setuptools` configuration file used by
-   ``setup.py``.
-
 #. ``MANIFEST.in`` is a :term:`distutils` "manifest" file, naming which files
    should be included in a source distribution of the package when ``python
    setup.py sdist`` is run.
@@ -745,24 +741,6 @@ This will create a tarball of your application in a ``dist`` subdirectory
 named ``MyProject-0.1.tar.gz``.  You can send this tarball to other people
 who want to install and use your application.
 
-.. index::
-   single: setup.cfg
-
-``setup.cfg``
-~~~~~~~~~~~~~
-
-The ``setup.cfg`` file is a :term:`setuptools` configuration file.  It
-contains various settings related to testing and internationalization:
-
-Our generated ``setup.cfg`` looks like this:
-
-.. literalinclude:: MyProject/setup.cfg
-   :language: guess
-   :linenos:
-
-The values in the default setup file make the testing commands to work more
-smoothly.
-
 .. index::
    single: package
 
diff --git a/docs/quick_tour/awesome/setup.cfg b/docs/quick_tour/awesome/setup.cfg
deleted file mode 100644
index 14f322085..000000000
--- a/docs/quick_tour/awesome/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match = ^test
-nocapture = 1
-cover-package = awesome
-with-coverage = 1
-cover-erase = 1
diff --git a/docs/quick_tour/package/setup.cfg b/docs/quick_tour/package/setup.cfg
deleted file mode 100644
index ac8bb6e21..000000000
--- a/docs/quick_tour/package/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match = ^test
-nocapture = 1
-cover-package = hello_world
-with-coverage = 1
-cover-erase = 1
diff --git a/docs/quick_tour/sqla_demo/setup.cfg b/docs/quick_tour/sqla_demo/setup.cfg
deleted file mode 100644
index 27dbd2377..000000000
--- a/docs/quick_tour/sqla_demo/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match=^test
-nocapture=1
-cover-package=sqla_demo
-with-coverage=1
-cover-erase=1
diff --git a/docs/quick_tutorial/scaffolds/setup.cfg b/docs/quick_tutorial/scaffolds/setup.cfg
deleted file mode 100644
index 16e18719c..000000000
--- a/docs/quick_tutorial/scaffolds/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match = ^test
-nocapture = 1
-cover-package = scaffolds
-with-coverage = 1
-cover-erase = 1
diff --git a/docs/tutorials/wiki/src/authorization/setup.cfg b/docs/tutorials/wiki/src/authorization/setup.cfg
deleted file mode 100644
index 807ea6b0e..000000000
--- a/docs/tutorials/wiki/src/authorization/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match=^test
-nocapture=1
-cover-package=tutorial
-with-coverage=1
-cover-erase=1
diff --git a/docs/tutorials/wiki/src/basiclayout/setup.cfg b/docs/tutorials/wiki/src/basiclayout/setup.cfg
deleted file mode 100644
index 807ea6b0e..000000000
--- a/docs/tutorials/wiki/src/basiclayout/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match=^test
-nocapture=1
-cover-package=tutorial
-with-coverage=1
-cover-erase=1
diff --git a/docs/tutorials/wiki/src/models/setup.cfg b/docs/tutorials/wiki/src/models/setup.cfg
deleted file mode 100644
index 807ea6b0e..000000000
--- a/docs/tutorials/wiki/src/models/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match=^test
-nocapture=1
-cover-package=tutorial
-with-coverage=1
-cover-erase=1
diff --git a/docs/tutorials/wiki/src/tests/setup.cfg b/docs/tutorials/wiki/src/tests/setup.cfg
deleted file mode 100644
index 807ea6b0e..000000000
--- a/docs/tutorials/wiki/src/tests/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match=^test
-nocapture=1
-cover-package=tutorial
-with-coverage=1
-cover-erase=1
diff --git a/docs/tutorials/wiki/src/views/setup.cfg b/docs/tutorials/wiki/src/views/setup.cfg
deleted file mode 100644
index 807ea6b0e..000000000
--- a/docs/tutorials/wiki/src/views/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match=^test
-nocapture=1
-cover-package=tutorial
-with-coverage=1
-cover-erase=1
diff --git a/docs/tutorials/wiki2/src/authorization/setup.cfg b/docs/tutorials/wiki2/src/authorization/setup.cfg
deleted file mode 100644
index 807ea6b0e..000000000
--- a/docs/tutorials/wiki2/src/authorization/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match=^test
-nocapture=1
-cover-package=tutorial
-with-coverage=1
-cover-erase=1
diff --git a/docs/tutorials/wiki2/src/basiclayout/setup.cfg b/docs/tutorials/wiki2/src/basiclayout/setup.cfg
deleted file mode 100644
index 807ea6b0e..000000000
--- a/docs/tutorials/wiki2/src/basiclayout/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match=^test
-nocapture=1
-cover-package=tutorial
-with-coverage=1
-cover-erase=1
diff --git a/docs/tutorials/wiki2/src/models/setup.cfg b/docs/tutorials/wiki2/src/models/setup.cfg
deleted file mode 100644
index 807ea6b0e..000000000
--- a/docs/tutorials/wiki2/src/models/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match=^test
-nocapture=1
-cover-package=tutorial
-with-coverage=1
-cover-erase=1
diff --git a/docs/tutorials/wiki2/src/tests/setup.cfg b/docs/tutorials/wiki2/src/tests/setup.cfg
deleted file mode 100644
index 807ea6b0e..000000000
--- a/docs/tutorials/wiki2/src/tests/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match=^test
-nocapture=1
-cover-package=tutorial
-with-coverage=1
-cover-erase=1
diff --git a/docs/tutorials/wiki2/src/views/setup.cfg b/docs/tutorials/wiki2/src/views/setup.cfg
deleted file mode 100644
index 807ea6b0e..000000000
--- a/docs/tutorials/wiki2/src/views/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match=^test
-nocapture=1
-cover-package=tutorial
-with-coverage=1
-cover-erase=1
diff --git a/pyramid/scaffolds/alchemy/setup.cfg_tmpl b/pyramid/scaffolds/alchemy/setup.cfg_tmpl
deleted file mode 100644
index 8bf5d22c1..000000000
--- a/pyramid/scaffolds/alchemy/setup.cfg_tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match=^test
-nocapture=1
-cover-package={{package}}
-with-coverage=1
-cover-erase=1
diff --git a/pyramid/scaffolds/starter/setup.cfg_tmpl b/pyramid/scaffolds/starter/setup.cfg_tmpl
deleted file mode 100644
index 1bc9ec437..000000000
--- a/pyramid/scaffolds/starter/setup.cfg_tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match = ^test
-nocapture = 1
-cover-package = {{package}}
-with-coverage = 1
-cover-erase = 1
diff --git a/pyramid/scaffolds/zodb/setup.cfg_tmpl b/pyramid/scaffolds/zodb/setup.cfg_tmpl
deleted file mode 100644
index 8bf5d22c1..000000000
--- a/pyramid/scaffolds/zodb/setup.cfg_tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match=^test
-nocapture=1
-cover-package={{package}}
-with-coverage=1
-cover-erase=1
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/setup.cfg_tmpl b/pyramid/tests/test_scaffolds/fixture_scaffold/setup.cfg_tmpl
deleted file mode 100644
index 1bc9ec437..000000000
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/setup.cfg_tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-[nosetests]
-match = ^test
-nocapture = 1
-cover-package = {{package}}
-with-coverage = 1
-cover-erase = 1
-- 
cgit v1.2.3


From aef68bf93127265134ebf63dca0403cf9c1955a8 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 8 Apr 2014 17:14:42 -0400
Subject: add changenote

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 32881ef8a..0e452d011 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,7 +14,8 @@ Unreleased
   See https://github.com/Pylons/pyramid/issues/1247
 
 - Updated docs and scaffolds to keep in step with new 2.0 release of
-  ``Lingua``.
+  ``Lingua``.  This included removing all ``setup.cfg`` files from scaffolds
+  and documentation environments.
 
 1.5b1 (2014-02-08)
 ==================
-- 
cgit v1.2.3


From 610b85ab54452568728fc6390e6cd18670036ba2 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 8 Apr 2014 17:20:32 -0400
Subject: fix typo and update whatsnew

---
 CHANGES.txt           | 2 +-
 docs/whatsnew-1.5.rst | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0e452d011..2e3996b3e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
 Unreleased
 ==========
 
-- Avoid crash in ``pserve --reload`` under Py3k, when iterating over posiibly
+- Avoid crash in ``pserve --reload`` under Py3k, when iterating over possibly
   mutated ``sys.modules``.
 
 - ``UnencryptedCookieSessionFactoryConfig`` failed if the secret contained
diff --git a/docs/whatsnew-1.5.rst b/docs/whatsnew-1.5.rst
index 2f73af661..65e8393f8 100644
--- a/docs/whatsnew-1.5.rst
+++ b/docs/whatsnew-1.5.rst
@@ -511,6 +511,9 @@ Scaffolding Enhancements
 
 - All scaffolds have a new HTML + CSS theme.
 
+- Updated docs and scaffolds to keep in step with new 2.0 release of
+  ``Lingua``.  This included removing all ``setup.cfg`` files from scaffolds
+  and documentation environments.
 
 Dependency Changes
 ------------------
-- 
cgit v1.2.3


From b66661a72ea2f0fe4bd6aacb83c6c5487401141b Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 8 Apr 2014 17:44:36 -0400
Subject: i have no idea why we do this in here, but let's make it at least
 correct

---
 docs/conf.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index a447c9968..eba776628 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -138,17 +138,21 @@ if book:
 # Add and use Pylons theme
 if 'sphinx-build' in ' '.join(sys.argv):  # protect against dumb importers
     from subprocess import call, Popen, PIPE
-
-    p = Popen('which git', shell=True, stdout=PIPE)
     cwd = os.getcwd()
-    _themes = os.path.join(cwd, '_themes')
+    p = Popen('which git', shell=True, stdout=PIPE)
+    here = os.path.abspath(os.path.dirname(__file__))
+    parent = os.path.abspath(os.path.dirname(here))
+    _themes = os.path.join(here, '_themes')
     git = p.stdout.read().strip()
-    if not os.listdir(_themes):
-        call([git, 'submodule', '--init'])
-    else:
-        call([git, 'submodule', 'update'])
-
-    sys.path.append(os.path.abspath('_themes'))
+    try:
+        os.chdir(parent)
+        if not os.listdir(_themes):
+            call([git, 'submodule', '--init'])
+        else:
+            call([git, 'submodule', 'update'])
+        sys.path.append(_themes)
+    finally:
+        os.chdir(cwd)
 
 html_theme_path = ['_themes']
 html_theme = 'pyramid'
-- 
cgit v1.2.3


From c3ef4170b195f08f9563256a3cbdd614d786acef Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 8 Apr 2014 17:51:30 -0400
Subject: make pdf build again

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

diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 39e55706f..0ada1a379 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -476,23 +476,23 @@ structure:
 .. code-block:: text
 
   MyProject/
-  ├── 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.py
+  |-- CHANGES.txt
+  |-- development.ini
+  |-- MANIFEST.in
+  |-- myproject
+  |   |-- __init__.py
+  |   |-- static
+  |   |   |-- pyramid-16x16.png
+  |   |   |-- pyramid.png
+  |   |   |-- theme.css
+  |   |   `-- theme.min.css
+  |   |-- templates
+  |   |   `-- mytemplate.pt
+  |   |-- tests.py
+  |   `-- views.py
+  |-- production.ini
+  |-- README.txt
+  `-- setup.py
 
 The ``MyProject`` :term:`Project`
 ---------------------------------
-- 
cgit v1.2.3


From 2ecc60e1f55e42a99d8d5339e0724babb4c82a2e Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 8 Apr 2014 18:30:29 -0400
Subject: no idea how this ever worked without pyramid being installed into the
 python being used to run the tests first

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

diff --git a/pyramid/scaffolds/tests.py b/pyramid/scaffolds/tests.py
index d913d022a..dfbf9b6cf 100644
--- a/pyramid/scaffolds/tests.py
+++ b/pyramid/scaffolds/tests.py
@@ -1,6 +1,5 @@
 import sys
 import os
-import pkg_resources
 import shutil
 import subprocess
 import tempfile
@@ -26,7 +25,8 @@ class TemplateTest(object):
             self.old_cwd = os.getcwd()
             self.directory = tempfile.mkdtemp()
             self.make_venv(self.directory)
-            os.chdir(pkg_resources.get_distribution('pyramid').location)
+            here = os.path.abspath(os.path.dirname(__file__))
+            os.chdir(os.path.dirname(os.path.dirname(here)))
             subprocess.check_call(
                 [os.path.join(self.directory, 'bin', 'python'),
                  'setup.py', 'develop'])
-- 
cgit v1.2.3


From 0cb759758c97feba48c0bbba149a774f85f2606a Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 8 Apr 2014 19:09:47 -0400
Subject: prep for 1.5 release

---
 CHANGES.txt | 4 ++--
 setup.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2e3996b3e..900eb116d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Unreleased
-==========
+1.5 (2014-04-08)
+================
 
 - Avoid crash in ``pserve --reload`` under Py3k, when iterating over possibly
   mutated ``sys.modules``.
diff --git a/setup.py b/setup.py
index bb443330d..2214611b7 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ testing_extras = tests_require + [
     ]
 
 setup(name='pyramid',
-      version='1.5b1',
+      version='1.5',
       description='The Pyramid Web Framework, a Pylons project',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
-- 
cgit v1.2.3


From c61755f77b4f945057522a9f4d4360ed6e5504d7 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 8 Apr 2014 19:16:23 -0400
Subject: vb master to 1.6dev

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 900eb116d..264497f5b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+Next release
+============
+
+- ...
+
 1.5 (2014-04-08)
 ================
 
diff --git a/setup.py b/setup.py
index 2214611b7..0ace211d7 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ testing_extras = tests_require + [
     ]
 
 setup(name='pyramid',
-      version='1.5',
+      version='1.6dev',
       description='The Pyramid Web Framework, a Pylons project',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
-- 
cgit v1.2.3


From 0117573edbc5dff565868187f8841859b3e36a51 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 8 Apr 2014 20:07:23 -0400
Subject: add bdist_wheel unversality

---
 setup.cfg | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index d7622683f..a877ffb7f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,3 +11,7 @@ cover-erase=1
 [aliases]
 dev = develop easy_install pyramid[testing]
 docs = develop easy_install pyramid[docs]
+
+[bdist_wheel]
+universal = 1
+
-- 
cgit v1.2.3


From 25c886ebad924786bef43cd27ce7a57d95ce3482 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Wed, 9 Apr 2014 14:46:30 -0400
Subject: - clarify Windows setuptools instructions - correct typo on location

---
 docs/quick_tutorial/requirements.rst | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst
index 72bb4a4f8..b79be4b3a 100644
--- a/docs/quick_tutorial/requirements.rst
+++ b/docs/quick_tutorial/requirements.rst
@@ -187,9 +187,15 @@ pipe it to your environment's version of Python.
     $ wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | $VENV/bin/python
 
     # Windows
-    # Use your browser to download:
-    #   https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.p
-    # ...into c:\projects\quick_tutorial\ez_setup.py
+    #
+    # Use your web browser to download this file:
+    #   https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setupy
+    #
+    # ...and save it to:
+    # c:\projects\quick_tutorial\ez_setup.py
+    #
+    # Then run the following command:
+
     c:\> %VENV%\Scripts\python ez_setup.py
 
 If ``wget`` complains with a certificate error, then run this command instead:
-- 
cgit v1.2.3


From ca1273b6897a42d72adca8276e78458962c1b9bb Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Wed, 9 Apr 2014 16:29:55 -0400
Subject: - add name of views.py

---
 docs/quick_tutorial/json.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/quick_tutorial/json.rst b/docs/quick_tutorial/json.rst
index ece8a61c0..aa789d833 100644
--- a/docs/quick_tutorial/json.rst
+++ b/docs/quick_tutorial/json.rst
@@ -40,7 +40,7 @@ Steps
     :linenos:
 
 #. Rather than implement a new view, we will "stack" another decorator
-   on the ``hello`` view:
+   on the ``hello`` view in ``views.py``:
 
    .. literalinclude:: json/tutorial/views.py
     :linenos:
-- 
cgit v1.2.3


From c462c0770b801be06f26acdbdcc00b9b92260286 Mon Sep 17 00:00:00 2001
From: thapar <rajthapar@gmail.com>
Date: Wed, 9 Apr 2014 16:38:47 -0400
Subject: Typo correction "setupy"-->"setup.py"

---
 docs/quick_tutorial/requirements.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst
index b79be4b3a..b5778ea42 100644
--- a/docs/quick_tutorial/requirements.rst
+++ b/docs/quick_tutorial/requirements.rst
@@ -189,7 +189,7 @@ pipe it to your environment's version of Python.
     # Windows
     #
     # Use your web browser to download this file:
-    #   https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setupy
+    #   https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
     #
     # ...and save it to:
     # c:\projects\quick_tutorial\ez_setup.py
-- 
cgit v1.2.3


From 77005d96fa57a83ac91c2547892fbb3e3c34e553 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Mon, 14 Apr 2014 01:56:02 -0400
Subject: mature dev status

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

diff --git a/setup.py b/setup.py
index 0ace211d7..54ced84e3 100644
--- a/setup.py
+++ b/setup.py
@@ -72,6 +72,7 @@ setup(name='pyramid',
       description='The Pyramid Web Framework, a Pylons project',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
+        "Development Status :: 6 - Mature",
         "Intended Audience :: Developers",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2.6",
-- 
cgit v1.2.3


From f0398e9e32d8fee1b0f46eef0ffcc814d7e6efb0 Mon Sep 17 00:00:00 2001
From: Nina Zakharenko <nzakharenko@gmail.com>
Date: Mon, 14 Apr 2014 14:46:11 -0400
Subject: Update python installation instructions for mac osx.

---
 docs/narr/install.rst | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index e419a8b20..89791115f 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -32,20 +32,32 @@ dependency will fall back to using pure Python instead.
 For Mac OS X Users
 ~~~~~~~~~~~~~~~~~~
 
-From `Python.org <http://python.org/download/mac/>`_:
+Python comes pre-installed on Mac OS X, but due to Apple's release cycle,
+it is often out of date. Unless you have a need for a specific earlier version, it is recommended to
+install the latest 2.x or 3.x version of Python.
 
-    Python comes pre-installed on Mac OS X, but due to Apple's release cycle,
-    it's often one or even two years old. The overwhelming recommendation of
-    the "MacPython" community is to upgrade your Python by downloading and
-    installing a newer version from `the Python standard release page
-    <http://python.org/download/releases/>`_.
+You can install the latest version of Python for Mac using the `homebrew <http://brew.sh/>`_ package manager.
 
-It is recommended to download one of the *installer* versions, unless you
-prefer to install your Python through a packgage manager (e.g., macports or
-homebrew) or to build your Python from source.
+To install homebrew:
 
-Unless you have a need for a specific earlier version, it is recommended to
-install the latest 2.x or 3.x version of Python.
+.. code-block:: text
+
+   $ ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)"
+
+Then update the homebrew package index.
+
+.. code-block:: text
+
+   $ brew update & brew doctor
+
+If the message says you're ready to brew, install the latest python2 or python3 using:
+
+.. code-block:: text
+
+   $ brew install python
+   $ brew install python3
+
+Alternatively, you can install it via the binaries on the `python.org <https://www.python.org/download/mac/>`_ site.
 
 If you use an installer for your Python, then you can skip to the section
 :ref:`installing_unix`.
-- 
cgit v1.2.3


From 836894d87eb2b1127b69f7eed70b770460f913ca Mon Sep 17 00:00:00 2001
From: Nina Zakharenko <nzakharenko@gmail.com>
Date: Mon, 14 Apr 2014 16:07:23 -0400
Subject: Update the documentation for Python installation on OSX. Binaries are
 primary method.

---
 docs/narr/install.rst | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 89791115f..c0f633686 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -33,32 +33,19 @@ For Mac OS X Users
 ~~~~~~~~~~~~~~~~~~
 
 Python comes pre-installed on Mac OS X, but due to Apple's release cycle,
-it is often out of date. Unless you have a need for a specific earlier version, it is recommended to
-install the latest 2.x or 3.x version of Python.
+it is often out of date. Unless you have a need for a specific earlier version,
+it is recommended to install the latest 2.x or 3.x version of Python.
 
-You can install the latest version of Python for Mac using the `homebrew <http://brew.sh/>`_ package manager.
+You can install the latest verion of Python for OSX from the binaries on
+`python.org <https://www.python.org/download/mac/>`_.
 
-To install homebrew:
-
-.. code-block:: text
-
-   $ ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)"
-
-Then update the homebrew package index.
-
-.. code-block:: text
-
-   $ brew update & brew doctor
-
-If the message says you're ready to brew, install the latest python2 or python3 using:
+Alternatively, you can use the `homebrew <http://brew.sh/>`_ package manager.
 
 .. code-block:: text
 
    $ brew install python
    $ brew install python3
 
-Alternatively, you can install it via the binaries on the `python.org <https://www.python.org/download/mac/>`_ site.
-
 If you use an installer for your Python, then you can skip to the section
 :ref:`installing_unix`.
 
-- 
cgit v1.2.3


From 8af14089b511723912063bb1b8f1471378d4a0ba Mon Sep 17 00:00:00 2001
From: Nina Zakharenko <nzakharenko@gmail.com>
Date: Mon, 14 Apr 2014 16:20:04 -0400
Subject: Change OSX to Mac OS X

---
 docs/narr/install.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index c0f633686..54984e6a2 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -36,7 +36,7 @@ Python comes pre-installed on Mac OS X, but due to Apple's release cycle,
 it is often out of date. Unless you have a need for a specific earlier version,
 it is recommended to install the latest 2.x or 3.x version of Python.
 
-You can install the latest verion of Python for OSX from the binaries on
+You can install the latest verion of Python for Mac OS X from the binaries on
 `python.org <https://www.python.org/download/mac/>`_.
 
 Alternatively, you can use the `homebrew <http://brew.sh/>`_ package manager.
-- 
cgit v1.2.3


From abab3574569d39eeea5459eaad102eb6c7b2d7ef Mon Sep 17 00:00:00 2001
From: Nina Zakharenko <nzakharenko@gmail.com>
Date: Mon, 14 Apr 2014 16:44:32 -0400
Subject: adding comments for python versions

---
 docs/narr/install.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 54984e6a2..4ccf65c65 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -43,7 +43,10 @@ Alternatively, you can use the `homebrew <http://brew.sh/>`_ package manager.
 
 .. code-block:: text
 
+   # for python 2.7
    $ brew install python
+
+   # for python 3.4
    $ brew install python3
 
 If you use an installer for your Python, then you can skip to the section
-- 
cgit v1.2.3


From a51a5627b0dda868f467588c464215d6f74a0958 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Mon, 14 Apr 2014 16:46:59 -0400
Subject: clarify python version support

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

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index e419a8b20..a6ae7df60 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -15,8 +15,8 @@ You will need `Python <http://python.org>`_ version 2.6 or better to run
 .. sidebar:: Python Versions
 
     As of this writing, :app:`Pyramid` has been tested under Python 2.6, Python
-    2.7, Python 3.2, and Python 3.3.  :app:`Pyramid` does not run under any
-    version of Python before 2.6.
+    2.7, Python 3.2, Python 3.3, Python 3.4 and PyPy 2.2. :app:`Pyramid` does
+    not run under any version of Python before 2.6.
 
 :app:`Pyramid` is known to run on all popular UNIX-like systems such as Linux,
 Mac OS X, and FreeBSD as well as on Windows platforms.  It is also known to run
-- 
cgit v1.2.3


From 176914bfea1de3f04617ecde594c07600d8842c4 Mon Sep 17 00:00:00 2001
From: Leonardo Jimenez <ljimenez@stancedata.com>
Date: Mon, 14 Apr 2014 17:38:12 -0400
Subject: Modified the way anonymous commiters configure the remote, the older
 version only worked for users with access to the repository as commiters.

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

diff --git a/HACKING.txt b/HACKING.txt
index 460d02047..8e2c049c2 100644
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -31,7 +31,7 @@ By Hand
    $ cd hack-on-pyramid
    # Configure remotes such that you can pull changes from the Pyramid
    # repository into your local repository.
-   $ git remote add upstream git@github.com:Pylons/pyramid.git
+   $ git remote add upstream https://github.com:Pylons/pyramid.git
    # fetch and merge changes from upstream into master
    $ git fetch upstream
    $ git merge upstream/master
-- 
cgit v1.2.3


From ac16ec2f722dcdaa45d0389ad87952bd6be6e389 Mon Sep 17 00:00:00 2001
From: westurner <wes.turner@gmail.com>
Date: Tue, 15 Apr 2014 01:28:03 -0500
Subject: DOC: Response.content_type defaults to text/html

---
 docs/narr/webob.rst | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/narr/webob.rst b/docs/narr/webob.rst
index f0a4b5a0b..6a331e4bf 100644
--- a/docs/narr/webob.rst
+++ b/docs/narr/webob.rst
@@ -408,6 +408,8 @@ Here are some highlights:
     The content type *not* including the ``charset`` parameter.
     Typical use: ``response.content_type = 'text/html'``.
 
+    Default value: ``response.content_type = 'text/html'``.
+
 ``response.charset``:
     The ``charset`` parameter of the content-type, it also informs
     encoding in ``response.unicode_body``.
@@ -466,9 +468,12 @@ argument to the class; e.g.:
   from pyramid.response import Response
   response = Response(body='hello world!', content_type='text/plain')
 
-The status defaults to ``'200 OK'``.  The content_type does not default to
-anything, though if you subclass :class:`pyramid.response.Response` and set
-``default_content_type`` you can override this behavior.
+The status defaults to ``'200 OK'``.
+
+The value of content_type defaults to
+``webob.response.Response.default_content_type``; which is `text/html`.
+You can subclass :class:`pyramid.response.Response` and set
+``default_content_type`` to override this behavior.
 
 .. index::
    single: exception responses
-- 
cgit v1.2.3


From f1f35b771cb361a0e6e47a271292d48bf21c3cdd Mon Sep 17 00:00:00 2001
From: westurner <wes.turner@gmail.com>
Date: Tue, 15 Apr 2014 10:27:38 -0500
Subject: DOC: Add cgi.escape to quick_tour/views/views.py (Fixes #1294)

---
 docs/quick_tour/views/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/quick_tour/views/views.py b/docs/quick_tour/views/views.py
index 9dc795f14..0ca1347f2 100644
--- a/docs/quick_tour/views/views.py
+++ b/docs/quick_tour/views/views.py
@@ -2,6 +2,7 @@ from pyramid.httpexceptions import HTTPFound
 from pyramid.response import Response
 from pyramid.view import view_config
 
+import cgi
 
 # First view, available at http://localhost:6543/
 @view_config(route_name='home')
@@ -14,7 +15,7 @@ def home_view(request):
 def hello_view(request):
     name = request.params.get('name', 'No Name')
     body = '<p>Hi %s, this <a href="/goto">redirects</a></p>'
-    return Response(body % name)
+    return Response(body % cgi.escape(name))
 
 
 # /goto which issues HTTP redirect to the last view
-- 
cgit v1.2.3


From 4083b3bb431b464f330fb17e22a6465aeb6f2fe0 Mon Sep 17 00:00:00 2001
From: westurner <wes.turner@gmail.com>
Date: Tue, 15 Apr 2014 11:55:10 -0500
Subject: DOC: Comment re: XSS, PEP8 imports, typo

---
 docs/quick_tour/views/views.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/quick_tour/views/views.py b/docs/quick_tour/views/views.py
index 0ca1347f2..1449cbb38 100644
--- a/docs/quick_tour/views/views.py
+++ b/docs/quick_tour/views/views.py
@@ -1,8 +1,9 @@
+import cgi
+
 from pyramid.httpexceptions import HTTPFound
 from pyramid.response import Response
 from pyramid.view import view_config
 
-import cgi
 
 # First view, available at http://localhost:6543/
 @view_config(route_name='home')
@@ -15,6 +16,7 @@ def home_view(request):
 def hello_view(request):
     name = request.params.get('name', 'No Name')
     body = '<p>Hi %s, this <a href="/goto">redirects</a></p>'
+    # cgi.escape to prevent Cross-Site Scripting (XSS) [CWE 79]
     return Response(body % cgi.escape(name))
 
 
@@ -24,7 +26,7 @@ def redirect_view(request):
     return HTTPFound(location="/problem")
 
 
-# /problem which causes an site error
+# /problem which causes a site error
 @view_config(route_name='exception')
 def exception_view(request):
     raise Exception()
-- 
cgit v1.2.3


From 1aa8eb60c7d54324d8d0d31a667b3e9c4c4e3b25 Mon Sep 17 00:00:00 2001
From: tylereaves <tylere@gmail.com>
Date: Wed, 16 Apr 2014 16:13:03 -0400
Subject: Update debugtoolbar.rst

Fix wording to reflect how debugtoolbar actually works
---
 docs/quick_tutorial/debugtoolbar.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/quick_tutorial/debugtoolbar.rst b/docs/quick_tutorial/debugtoolbar.rst
index 1c540d8a2..88b55869e 100644
--- a/docs/quick_tutorial/debugtoolbar.rst
+++ b/docs/quick_tutorial/debugtoolbar.rst
@@ -71,9 +71,9 @@ supports wiring in add-on configuration via our ``development.ini``
 using ``pyramid.includes``. We use this to load the configuration for
 the debugtoolbar.
 
-You'll now see an attractive (and collapsible) menu in the right of
-your browser, providing introspective access to debugging information.
-Even better, if your web application generates an error,
+You'll now see an attractive button in the right of
+your browser, which you may click to provide introspective access to debugging 
+information in a new browser tab. Even better, if your web application generates an error,
 you will see a nice traceback on the screen. When you want to disable
 this toolbar, no need to change code: you can remove it from
 ``pyramid.includes`` in the relevant ``.ini`` configuration file (thus
-- 
cgit v1.2.3


From b6ff39af94797c3b81adc367e86a546a099df519 Mon Sep 17 00:00:00 2001
From: tylereaves <tylere@gmail.com>
Date: Wed, 16 Apr 2014 16:13:33 -0400
Subject: Update debugtoolbar.rst

grammar fix
---
 docs/quick_tutorial/debugtoolbar.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/quick_tutorial/debugtoolbar.rst b/docs/quick_tutorial/debugtoolbar.rst
index 88b55869e..45279b541 100644
--- a/docs/quick_tutorial/debugtoolbar.rst
+++ b/docs/quick_tutorial/debugtoolbar.rst
@@ -71,7 +71,7 @@ supports wiring in add-on configuration via our ``development.ini``
 using ``pyramid.includes``. We use this to load the configuration for
 the debugtoolbar.
 
-You'll now see an attractive button in the right of
+You'll now see an attractive button on the right side of
 your browser, which you may click to provide introspective access to debugging 
 information in a new browser tab. Even better, if your web application generates an error,
 you will see a nice traceback on the screen. When you want to disable
-- 
cgit v1.2.3


From b666df0d5f299eca20e9370ac43cddee71b6dd06 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Wed, 16 Apr 2014 15:15:50 -0500
Subject: minor tweaks based on toolbar changes in 2.x

---
 docs/quick_tutorial/debugtoolbar.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/quick_tutorial/debugtoolbar.rst b/docs/quick_tutorial/debugtoolbar.rst
index 45279b541..90750c633 100644
--- a/docs/quick_tutorial/debugtoolbar.rst
+++ b/docs/quick_tutorial/debugtoolbar.rst
@@ -73,14 +73,15 @@ the debugtoolbar.
 
 You'll now see an attractive button on the right side of
 your browser, which you may click to provide introspective access to debugging 
-information in a new browser tab. Even better, if your web application generates an error,
+information in a new browser tab. Even better, if your web application
+generates an error,
 you will see a nice traceback on the screen. When you want to disable
 this toolbar, no need to change code: you can remove it from
 ``pyramid.includes`` in the relevant ``.ini`` configuration file (thus
 showing why configuration files are handy.)
 
-Note that the toolbar mutates the HTML generated by our app and uses jQuery to
-overlay itself.  If you are using the toolbar while you're developing and you
+Note injects a small amount of html/css into your app just before the closing
+``</body>`` tag in order to display itself. If you
 start to experience otherwise inexplicable client-side weirdness, you can shut
 it off by commenting out the ``pyramid_debugtoolbar`` line in
 ``pyramid.includes`` temporarily.
-- 
cgit v1.2.3


From 0eff6638d2470f77bd444941cb8261d91c236591 Mon Sep 17 00:00:00 2001
From: Michael R <goodwillcoding@webhippo.net>
Date: Wed, 16 Apr 2014 16:49:53 -0400
Subject: add pyramid version and pyramid docs branch to the scaffold
 generation machinery so it is available in scaffold templates, this will help
 generate proper links in scaffolds and not confiuse people when they go to
 documentation

---
 .../starter/+package+/templates/mytemplate.pt_tmpl |  4 +-
 pyramid/scaffolds/starter/+package+/views.py_tmpl  |  5 +-
 pyramid/scripts/pcreate.py                         | 13 +++++
 pyramid/tests/test_scripts/test_pcreate.py         | 58 ++++++++++++++++++----
 4 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
index 76451f9b5..5f860da26 100644
--- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
@@ -41,8 +41,8 @@
         <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 class="current-version">Currently v${pyramid_version}</li>
+              <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org/projects/pyramid/en/${pyramid_docs_branch}/">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>
diff --git a/pyramid/scaffolds/starter/+package+/views.py_tmpl b/pyramid/scaffolds/starter/+package+/views.py_tmpl
index ad9af7292..b7a50929c 100644
--- a/pyramid/scaffolds/starter/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/starter/+package+/views.py_tmpl
@@ -3,4 +3,7 @@ from pyramid.view import view_config
 
 @view_config(route_name='home', renderer='templates/mytemplate.pt')
 def my_view(request):
-    return {'project': '{{project}}'}
+    return {
+        'project': '{{project}}',
+        'pyramid_version': '{{pyramid_version}}',
+        'pyramid_docs_branch': '{{pyramid_docs_branch}}'}
diff --git a/pyramid/scripts/pcreate.py b/pyramid/scripts/pcreate.py
index 9a3b53b33..32cb14ab0 100644
--- a/pyramid/scripts/pcreate.py
+++ b/pyramid/scripts/pcreate.py
@@ -53,6 +53,8 @@ class PCreateCommand(object):
                       action='store_true',
                       help='When a file would be overwritten, interrogate')
 
+    pyramid_dist = pkg_resources.get_distribution("pyramid")
+
     def __init__(self, argv, quiet=False):
         self.quiet = quiet
         self.options, self.args = self.parser.parse_args(argv[1:])
@@ -82,10 +84,21 @@ class PCreateCommand(object):
         pkg_name = _bad_chars_re.sub('', project_name.lower())
         safe_name = pkg_resources.safe_name(project_name)
         egg_name = pkg_resources.to_filename(safe_name)
+
+        # get pyramid package version
+        pyramid_version = self.pyramid_dist.version
+        # map pyramid package version of the documentation branch
+        if self.pyramid_dist.version[3:] == 'dev':
+          pyramid_docs_branch = 'latest'
+        else:
+          pyramid_docs_branch = "%s-branch" % self.pyramid_dist.version[:3]
+
         vars = {
             'project': project_name,
             'package': pkg_name,
             'egg': egg_name,
+            'pyramid_version': pyramid_version,
+            'pyramid_docs_branch': pyramid_docs_branch,
             }
         for scaffold_name in options.scaffold_name:
             for scaffold in self.scaffolds:
diff --git a/pyramid/tests/test_scripts/test_pcreate.py b/pyramid/tests/test_scripts/test_pcreate.py
index 6516ac229..c247d06b4 100644
--- a/pyramid/tests/test_scripts/test_pcreate.py
+++ b/pyramid/tests/test_scripts/test_pcreate.py
@@ -7,7 +7,7 @@ class TestPCreateCommand(unittest.TestCase):
 
     def out(self, msg):
         self.out_.write(msg)
-        
+
     def _getTargetClass(self):
         from pyramid.scripts.pcreate import PCreateCommand
         return PCreateCommand
@@ -25,7 +25,7 @@ class TestPCreateCommand(unittest.TestCase):
         self.assertEqual(result, 0)
         out = self.out_.getvalue()
         self.assertTrue(out.startswith('Available scaffolds'))
-        
+
     def test_run_show_scaffolds_none_exist(self):
         cmd = self._makeOne('-l')
         cmd.scaffolds = []
@@ -33,7 +33,7 @@ class TestPCreateCommand(unittest.TestCase):
         self.assertEqual(result, 0)
         out = self.out_.getvalue()
         self.assertTrue(out.startswith('No scaffolds available'))
-        
+
     def test_run_no_scaffold_name(self):
         cmd = self._makeOne()
         result = cmd.run()
@@ -61,6 +61,7 @@ class TestPCreateCommand(unittest.TestCase):
         cmd = self._makeOne('-s', 'dummy', 'Distro')
         scaffold = DummyScaffold('dummy')
         cmd.scaffolds = [scaffold]
+        cmd.pyramid_dist = DummyDist("0.1")
         result = cmd.run()
         self.assertEqual(result, 0)
         self.assertEqual(
@@ -69,14 +70,17 @@ class TestPCreateCommand(unittest.TestCase):
             )
         self.assertEqual(
             scaffold.vars,
-            {'project': 'Distro', 'egg': 'Distro', 'package': 'distro'})
+            {'project': 'Distro', 'egg': 'Distro', 'package': 'distro',
+             'pyramid_version': '0.1', 'pyramid_docs_branch':'0.1-branch'})
 
     def test_known_scaffold_absolute_path(self):
         import os
         path = os.path.abspath('Distro')
         cmd = self._makeOne('-s', 'dummy', path)
+        cmd.pyramid_dist = DummyDist("0.1")
         scaffold = DummyScaffold('dummy')
         cmd.scaffolds = [scaffold]
+        cmd.pyramid_dist = DummyDist("0.1")
         result = cmd.run()
         self.assertEqual(result, 0)
         self.assertEqual(
@@ -85,7 +89,8 @@ class TestPCreateCommand(unittest.TestCase):
             )
         self.assertEqual(
             scaffold.vars,
-            {'project': 'Distro', 'egg': 'Distro', 'package': 'distro'})
+            {'project': 'Distro', 'egg': 'Distro', 'package': 'distro',
+             'pyramid_version': '0.1', 'pyramid_docs_branch':'0.1-branch'})
 
     def test_known_scaffold_multiple_rendered(self):
         import os
@@ -93,6 +98,7 @@ class TestPCreateCommand(unittest.TestCase):
         scaffold1 = DummyScaffold('dummy1')
         scaffold2 = DummyScaffold('dummy2')
         cmd.scaffolds = [scaffold1, scaffold2]
+        cmd.pyramid_dist = DummyDist("0.1")
         result = cmd.run()
         self.assertEqual(result, 0)
         self.assertEqual(
@@ -101,20 +107,23 @@ class TestPCreateCommand(unittest.TestCase):
             )
         self.assertEqual(
             scaffold1.vars,
-            {'project': 'Distro', 'egg': 'Distro', 'package': 'distro'})
+            {'project': 'Distro', 'egg': 'Distro', 'package': 'distro',
+             'pyramid_version': '0.1', 'pyramid_docs_branch':'0.1-branch'})
         self.assertEqual(
             scaffold2.output_dir,
             os.path.normpath(os.path.join(os.getcwd(), 'Distro'))
             )
         self.assertEqual(
             scaffold2.vars,
-            {'project': 'Distro', 'egg': 'Distro', 'package': 'distro'})
+            {'project': 'Distro', 'egg': 'Distro', 'package': 'distro',
+             'pyramid_version': '0.1', 'pyramid_docs_branch':'0.1-branch'})
 
     def test_known_scaffold_with_path_as_project_target_rendered(self):
         import os
         cmd = self._makeOne('-s', 'dummy', '/tmp/foo/Distro/')
         scaffold = DummyScaffold('dummy')
         cmd.scaffolds = [scaffold]
+        cmd.pyramid_dist = DummyDist("0.1")
         result = cmd.run()
         self.assertEqual(result, 0)
         self.assertEqual(
@@ -123,8 +132,34 @@ class TestPCreateCommand(unittest.TestCase):
             )
         self.assertEqual(
             scaffold.vars,
-            {'project': 'Distro', 'egg': 'Distro', 'package': 'distro'})
-        
+            {'project': 'Distro', 'egg': 'Distro', 'package': 'distro',
+             'pyramid_version': '0.1', 'pyramid_docs_branch':'0.1-branch'})
+
+
+    def test_scaffold_with_prod_pyramid_version(self):
+        cmd = self._makeOne('-s', 'dummy', 'Distro')
+        scaffold = DummyScaffold('dummy')
+        cmd.scaffolds = [scaffold]
+        cmd.pyramid_dist = DummyDist("0.2")
+        result = cmd.run()
+        self.assertEqual(result, 0)
+        self.assertEqual(
+            scaffold.vars,
+            {'project': 'Distro', 'egg': 'Distro', 'package': 'distro',
+             'pyramid_version': '0.2', 'pyramid_docs_branch':'0.2-branch'})
+
+    def test_scaffold_with_dev_pyramid_version(self):
+        cmd = self._makeOne('-s', 'dummy', 'Distro')
+        scaffold = DummyScaffold('dummy')
+        cmd.scaffolds = [scaffold]
+        cmd.pyramid_dist = DummyDist("0.2dev")
+        result = cmd.run()
+        self.assertEqual(result, 0)
+        self.assertEqual(
+            scaffold.vars,
+            {'project': 'Distro', 'egg': 'Distro', 'package': 'distro',
+             'pyramid_version': '0.2dev', 'pyramid_docs_branch':'latest'})
+
 class Test_main(unittest.TestCase):
     def _callFUT(self, argv):
         from pyramid.scripts.pcreate import main
@@ -142,4 +177,7 @@ class DummyScaffold(object):
         self.command = command
         self.output_dir = output_dir
         self.vars = vars
-        
+
+class DummyDist(object):
+    def __init__(self, version):
+        self.version = version
-- 
cgit v1.2.3


From 23b5311878af64244d7a11de93fe2c8a39e46664 Mon Sep 17 00:00:00 2001
From: Michael R <goodwillcoding@webhippo.net>
Date: Wed, 16 Apr 2014 17:00:14 -0400
Subject: update the alchemy template to use pyramid version and doc version

---
 pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl | 4 ++--
 pyramid/scaffolds/alchemy/+package+/views.py_tmpl                | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
index 76451f9b5..5f860da26 100644
--- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
@@ -41,8 +41,8 @@
         <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 class="current-version">Currently v${pyramid_version}</li>
+              <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org/projects/pyramid/en/${pyramid_docs_branch}/">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>
diff --git a/pyramid/scaffolds/alchemy/+package+/views.py_tmpl b/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
index be0b45b0d..15e695d94 100644
--- a/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
@@ -15,14 +15,19 @@ def my_view(request):
         one = DBSession.query(MyModel).filter(MyModel.name == 'one').first()
     except DBAPIError:
         return Response(conn_err_msg, content_type='text/plain', status_int=500)
-    return {'one': one, 'project': '{{project}}'}
+    return {
+        'one': one,
+        'project': '{{project}}',
+        'pyramid_version': '{{pyramid_version}}',
+        'pyramid_docs_branch': '{{pyramid_docs_branch}}'}
+
 
 conn_err_msg = """\
 Pyramid is having a problem using your SQL database.  The problem
 might be caused by one of the following things:
 
 1.  You may need to run the "initialize_{{project}}_db" script
-    to initialize your database tables.  Check your virtual 
+    to initialize your database tables.  Check your virtual
     environment's "bin" directory for this script and try to run it.
 
 2.  Your database server may not be running.  Check that the
-- 
cgit v1.2.3


From 2af00e59d9c3e19b25e2759832efe6485a617536 Mon Sep 17 00:00:00 2001
From: flibustenet <flibustenet@users.noreply.github.com>
Date: Thu, 17 Apr 2014 21:52:23 +0200
Subject: More explicit example of set_property

cleanup callback has a "request" parameter (and not "_")
cleanup callback know (since 1.5) if an exception occurred or not (to commit or rollback)
(same as #1302 on 1.5)
---
 docs/api/request.rst | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/api/request.rst b/docs/api/request.rst
index 343d0c022..c52d41400 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -319,7 +319,13 @@
 
           def _connect(request):
               conn = request.registry.dbsession()
-              def cleanup(_):
+              def cleanup(request):
+                  # since version 1.5 request.exception is not more
+                  # eagerly cleared
+                  if request.exception is not None:
+                      conn.rollback()
+                  else:
+                      conn.commit()
                   conn.close()
               request.add_finished_callback(cleanup)
               return conn
-- 
cgit v1.2.3


From 268eb40ff0e21281497a954120220e41bac4a4db Mon Sep 17 00:00:00 2001
From: thapar <rajthapar@gmail.com>
Date: Fri, 18 Apr 2014 04:52:01 -0400
Subject: Typo fix "not"-->"no"

---
 docs/api/request.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/request.rst b/docs/api/request.rst
index c52d41400..b28ec5ffc 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -320,7 +320,7 @@
           def _connect(request):
               conn = request.registry.dbsession()
               def cleanup(request):
-                  # since version 1.5 request.exception is not more
+                  # since version 1.5, request.exception is no more
                   # eagerly cleared
                   if request.exception is not None:
                       conn.rollback()
-- 
cgit v1.2.3


From 070d7a6abc67e942abffc6645d1efdcfb3b6dafe Mon Sep 17 00:00:00 2001
From: thapar <rajthapar@gmail.com>
Date: Fri, 18 Apr 2014 11:42:01 -0400
Subject: Corrected the comment's language

---
 docs/api/request.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api/request.rst b/docs/api/request.rst
index b28ec5ffc..77d80f6d6 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -320,8 +320,8 @@
           def _connect(request):
               conn = request.registry.dbsession()
               def cleanup(request):
-                  # since version 1.5, request.exception is no more
-                  # eagerly cleared
+                  # since version 1.5, request.exception is no
+                  # longer eagerly cleared
                   if request.exception is not None:
                       conn.rollback()
                   else:
-- 
cgit v1.2.3


From 06b839f8f0b4c4c202ac10042241c00883b403d1 Mon Sep 17 00:00:00 2001
From: Bert JW Regeer <bertjw@regeer.org>
Date: Fri, 18 Apr 2014 15:48:29 -0600
Subject: _add_subscriber should resolve dotted names

---
 pyramid/config/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 32cf82fba..ebaae38a9 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -481,6 +481,7 @@ class Configurator(
 
     def _add_predicate(self, type, name, factory, weighs_more_than=None,
                        weighs_less_than=None):
+        factory = self.maybe_dotted(factory)
         discriminator = ('%s predicate' % type, name)
         intr = self.introspectable(
             '%s predicates' % type,
@@ -488,7 +489,7 @@ class Configurator(
             '%s predicate named %s' % (type, name),
             '%s predicate' % type)
         intr['name'] = name
-        intr['factory'] = self.maybe_dotted(factory)
+        intr['factory'] = factory
         intr['weighs_more_than'] = weighs_more_than
         intr['weighs_less_than'] = weighs_less_than
         def register():
-- 
cgit v1.2.3


From 8e90d62c0d50565e717738901e8a10a865ac1258 Mon Sep 17 00:00:00 2001
From: Bert JW Regeer <bertjw@regeer.org>
Date: Fri, 18 Apr 2014 15:49:59 -0600
Subject: Add information to CHANGES

---
 CHANGES.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 264497f5b..3d2b248ae 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,10 @@
 Next release
 ============
 
-- ...
+- Fix an issue whereby predicates would be resolved as maybe_dotted in the
+  introspectable but not when passed for registration. This would mean that
+  add_route_predicate for example can not take a string and turn it into the
+  actual callable function.
 
 1.5 (2014-04-08)
 ================
-- 
cgit v1.2.3


From 28cf6b65423b4c7e58afbf2850857a898dc29fbb Mon Sep 17 00:00:00 2001
From: goodwillcoding <goodwillcoding@webhippo.net>
Date: Sat, 19 Apr 2014 21:26:05 -0700
Subject: Move the docs and pyramid version to scaffold template generation and
 out of the views. Add pyramid docs version to all the .ini file scaffolds
 Update alchemy, zodb, and starter to have respective names

---
 pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl | 8 ++++----
 pyramid/scaffolds/alchemy/+package+/views.py_tmpl                | 6 +-----
 pyramid/scaffolds/alchemy/development.ini_tmpl                   | 4 ++--
 pyramid/scaffolds/alchemy/production.ini_tmpl                    | 4 ++--
 pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl | 4 ++--
 pyramid/scaffolds/starter/+package+/views.py_tmpl                | 5 +----
 pyramid/scaffolds/starter/development.ini_tmpl                   | 6 +++---
 pyramid/scaffolds/starter/production.ini_tmpl                    | 4 ++--
 pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl    | 8 ++++----
 pyramid/scaffolds/zodb/development.ini_tmpl                      | 4 ++--
 pyramid/scaffolds/zodb/production.ini_tmpl                       | 4 ++--
 11 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
index 5f860da26..83a9430b8 100644
--- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
@@ -8,7 +8,7 @@
     <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>
+    <title>Alchemy 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">
@@ -33,7 +33,7 @@
           </div>
           <div class="col-md-10">
             <div class="content">
-              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">starter template</span></h1>
+              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">alchemy 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>
@@ -41,8 +41,8 @@
         <div class="row">
           <div class="links">
             <ul>
-              <li class="current-version">Currently v${pyramid_version}</li>
-              <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org/projects/pyramid/en/${pyramid_docs_branch}/">Docs</a></li>
+              <li class="current-version">Currently v{{pyramid_version}}</li>
+              <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/">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>
diff --git a/pyramid/scaffolds/alchemy/+package+/views.py_tmpl b/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
index 15e695d94..292bce579 100644
--- a/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
@@ -15,11 +15,7 @@ def my_view(request):
         one = DBSession.query(MyModel).filter(MyModel.name == 'one').first()
     except DBAPIError:
         return Response(conn_err_msg, content_type='text/plain', status_int=500)
-    return {
-        'one': one,
-        'project': '{{project}}',
-        'pyramid_version': '{{pyramid_version}}',
-        'pyramid_docs_branch': '{{pyramid_docs_branch}}'}
+    return {'one': one, 'project': '{{project}}'}
 
 
 conn_err_msg = """\
diff --git a/pyramid/scaffolds/alchemy/development.ini_tmpl b/pyramid/scaffolds/alchemy/development.ini_tmpl
index bdf08171c..e54a8609c 100644
--- a/pyramid/scaffolds/alchemy/development.ini_tmpl
+++ b/pyramid/scaffolds/alchemy/development.ini_tmpl
@@ -1,6 +1,6 @@
 ###
 # app configuration
-# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/environment.html
 ###
 
 [app:main]
@@ -32,7 +32,7 @@ port = 6543
 
 ###
 # logging configuration
-# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/logging.html
 ###
 
 [loggers]
diff --git a/pyramid/scaffolds/alchemy/production.ini_tmpl b/pyramid/scaffolds/alchemy/production.ini_tmpl
index 69b08e458..b316ec9ca 100644
--- a/pyramid/scaffolds/alchemy/production.ini_tmpl
+++ b/pyramid/scaffolds/alchemy/production.ini_tmpl
@@ -1,6 +1,6 @@
 ###
 # app configuration
-# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/environment.html
 ###
 
 [app:main]
@@ -23,7 +23,7 @@ port = 6543
 
 ###
 # logging configuration
-# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/logging.html
 ###
 
 [loggers]
diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
index 5f860da26..1272d187d 100644
--- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
@@ -41,8 +41,8 @@
         <div class="row">
           <div class="links">
             <ul>
-              <li class="current-version">Currently v${pyramid_version}</li>
-              <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org/projects/pyramid/en/${pyramid_docs_branch}/">Docs</a></li>
+              <li class="current-version">Currently v{{pyramid_version}}</li>
+              <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/">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>
diff --git a/pyramid/scaffolds/starter/+package+/views.py_tmpl b/pyramid/scaffolds/starter/+package+/views.py_tmpl
index b7a50929c..ad9af7292 100644
--- a/pyramid/scaffolds/starter/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/starter/+package+/views.py_tmpl
@@ -3,7 +3,4 @@ from pyramid.view import view_config
 
 @view_config(route_name='home', renderer='templates/mytemplate.pt')
 def my_view(request):
-    return {
-        'project': '{{project}}',
-        'pyramid_version': '{{pyramid_version}}',
-        'pyramid_docs_branch': '{{pyramid_docs_branch}}'}
+    return {'project': '{{project}}'}
diff --git a/pyramid/scaffolds/starter/development.ini_tmpl b/pyramid/scaffolds/starter/development.ini_tmpl
index 33c454086..842cd61d9 100644
--- a/pyramid/scaffolds/starter/development.ini_tmpl
+++ b/pyramid/scaffolds/starter/development.ini_tmpl
@@ -1,6 +1,6 @@
 ###
 # app configuration
-# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/environment.html
 ###
 
 [app:main]
@@ -11,7 +11,7 @@ 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
@@ -29,7 +29,7 @@ port = 6543
 
 ###
 # logging configuration
-# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/logging.html
 ###
 
 [loggers]
diff --git a/pyramid/scaffolds/starter/production.ini_tmpl b/pyramid/scaffolds/starter/production.ini_tmpl
index dd2637e5b..6a123abf5 100644
--- a/pyramid/scaffolds/starter/production.ini_tmpl
+++ b/pyramid/scaffolds/starter/production.ini_tmpl
@@ -1,6 +1,6 @@
 ###
 # app configuration
-# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/environment.html
 ###
 
 [app:main]
@@ -23,7 +23,7 @@ port = 6543
 
 ###
 # logging configuration
-# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/logging.html
 ###
 
 [loggers]
diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
index 76451f9b5..88a094fd9 100644
--- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
@@ -8,7 +8,7 @@
     <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>
+    <title>Starter ZODB 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">
@@ -33,7 +33,7 @@
           </div>
           <div class="col-md-10">
             <div class="content">
-              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">starter template</span></h1>
+              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">ZODB 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>
@@ -41,8 +41,8 @@
         <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 class="current-version">Currently v{{pyramid_version}}</li>
+              <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/">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>
diff --git a/pyramid/scaffolds/zodb/development.ini_tmpl b/pyramid/scaffolds/zodb/development.ini_tmpl
index 746f7ded3..f57d559bf 100644
--- a/pyramid/scaffolds/zodb/development.ini_tmpl
+++ b/pyramid/scaffolds/zodb/development.ini_tmpl
@@ -1,6 +1,6 @@
 ###
 # app configuration
-# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/environment.html
 ###
 
 [app:main]
@@ -34,7 +34,7 @@ port = 6543
 
 ###
 # logging configuration
-# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/logging.html
 ###
 
 [loggers]
diff --git a/pyramid/scaffolds/zodb/production.ini_tmpl b/pyramid/scaffolds/zodb/production.ini_tmpl
index 9ce639ec3..c231e159d 100644
--- a/pyramid/scaffolds/zodb/production.ini_tmpl
+++ b/pyramid/scaffolds/zodb/production.ini_tmpl
@@ -1,6 +1,6 @@
 ###
 # app configuration
-# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/environment.html
 ###
 
 [app:main]
@@ -29,7 +29,7 @@ port = 6543
 
 ###
 # logging configuration
-# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/logging.html
 ###
 
 [loggers]
-- 
cgit v1.2.3


From 4e0d3f5ad9d556db1683a6fce5082543695c3f6f Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sun, 20 Apr 2014 03:46:06 -0700
Subject: - Correct 80-column lines specification to 79 to be compliant with
 PEP8 and consistent with doc to which this line refers.

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

diff --git a/HACKING.txt b/HACKING.txt
index 8e2c049c2..1386be3af 100644
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -149,7 +149,7 @@ Coding Style
 ------------
 
 - PEP8 compliance.  Whitespace rules are relaxed: not necessary to put
-  2 newlines between classes.  But 80-column lines, in particular, are
+  2 newlines between classes.  But 79-column lines, in particular, are
   mandatory.  See
   http://docs.pylonsproject.org/en/latest/community/codestyle.html for more
   information.
-- 
cgit v1.2.3


From ef7a4e90de2f78a57e4a3326072f8b40b449182c Mon Sep 17 00:00:00 2001
From: Omid Raha <omidraha.com@gmail.com>
Date: Sun, 20 Apr 2014 17:14:45 +0430
Subject: Remove repeated word.

Remove repeated `operations` word.
---
 docs/quick_tutorial/more_view_classes.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/quick_tutorial/more_view_classes.rst b/docs/quick_tutorial/more_view_classes.rst
index 1e5603554..9cc4cc520 100644
--- a/docs/quick_tutorial/more_view_classes.rst
+++ b/docs/quick_tutorial/more_view_classes.rst
@@ -34,7 +34,7 @@ that determine which view is matched to a request, based on factors
 such as the request method, the form parameters, etc. These predicates
 provide many axes of flexibility.
 
-The following shows a simple example with four operations operations:
+The following shows a simple example with four operations:
 view a home page which leads to a form, save a change,
 and press the delete button.
 
-- 
cgit v1.2.3


From 872796d2c1743430ab04364d05657b46133fa230 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sun, 20 Apr 2014 06:50:44 -0700
Subject: Merge pull request #1309 from omidraha/patch-1

Correct question to adapt to the the text.
---
 docs/quick_tutorial/jinja2.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/quick_tutorial/jinja2.rst b/docs/quick_tutorial/jinja2.rst
index 44d9f635b..2f1e295dd 100644
--- a/docs/quick_tutorial/jinja2.rst
+++ b/docs/quick_tutorial/jinja2.rst
@@ -88,9 +88,9 @@ Extra Credit
    dependency manually. What is another way we could have made the
    association?
 
-#. We used ``development.ini`` to get the :term:`configurator` to
-   load ``pyramid_jinja2``'s configuration. What is another way could
-   include it into the config?
+#. We used ``config.include`` which is an imperative configuration to get the
+   :term:`Configurator` to load ``pyramid_jinja2``'s configuration. 
+   What is another way could include it into the config?
 
 .. seealso:: `Jinja2 homepage <http://jinja.pocoo.org/>`_,
    and
-- 
cgit v1.2.3


From 510715d0a541a2d7361d505e034f1a4ce6115492 Mon Sep 17 00:00:00 2001
From: goodwillcoding <goodwillcoding@webhippo.net>
Date: Sun, 20 Apr 2014 10:03:14 -0700
Subject: clean up the language to say "Generated by"

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

diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
index 83a9430b8..e6a5c032b 100644
--- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
@@ -33,15 +33,15 @@
           </div>
           <div class="col-md-10">
             <div class="content">
-              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">alchemy 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>
+              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">starter Alchemy 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 {{pyramid_version}}</span>.</p>
             </div>
           </div>
         </div>
         <div class="row">
           <div class="links">
             <ul>
-              <li class="current-version">Currently v{{pyramid_version}}</li>
+              <li class="current-version">Generated by Pyramid v{{pyramid_version}}</li>
               <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/">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 1272d187d..dff7e734c 100644
--- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
@@ -34,14 +34,14 @@
           <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>
+              <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 {{pyramid_version}}</span>.</p>
             </div>
           </div>
         </div>
         <div class="row">
           <div class="links">
             <ul>
-              <li class="current-version">Currently v{{pyramid_version}}</li>
+              <li class="current-version">Generated by Pyramid  v{{pyramid_version}}</li>
               <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/">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 88a094fd9..59f57d63a 100644
--- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
@@ -33,15 +33,15 @@
           </div>
           <div class="col-md-10">
             <div class="content">
-              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">ZODB 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>
+              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">starter ZODB 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 {{pyramid_version}}</span>.</p>
             </div>
           </div>
         </div>
         <div class="row">
           <div class="links">
             <ul>
-              <li class="current-version">Currently v{{pyramid_version}}</li>
+              <li class="current-version">Generated by Pyramid v{{pyramid_version}}</li>
               <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/">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 889bdc8c89d2a2798705e1e6243baaf65264bd6e Mon Sep 17 00:00:00 2001
From: goodwillcoding <goodwillcoding@webhippo.net>
Date: Sun, 20 Apr 2014 10:08:32 -0700
Subject: update change me with the scaffold changes

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 3d2b248ae..b0495617b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Next release
 ============
 
+- Update scaffold generating machinery to return the version of pyramid and
+  pyramid docs for use in scaffolds. Updated starter, alchemy and zodb
+  templates to have links to correctly versioned documentation and reflect
+  which pyramid was used to generate the scaffold.
+
 - Fix an issue whereby predicates would be resolved as maybe_dotted in the
   introspectable but not when passed for registration. This would mean that
   add_route_predicate for example can not take a string and turn it into the
-- 
cgit v1.2.3


From c60e9601bffc199f1159e58370e9ffb639fb9af1 Mon Sep 17 00:00:00 2001
From: goodwillcoding <goodwillcoding@webhippo.net>
Date: Sun, 20 Apr 2014 10:32:48 -0700
Subject: standardize on scaffold over template naming

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

diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
index e6a5c032b..a98c3fdd0 100644
--- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
@@ -8,12 +8,12 @@
     <meta name="author" content="Pylons Project">
     <link rel="shortcut icon" href="${request.static_url('{{package}}:static/pyramid-16x16.png')}">
 
-    <title>Alchemy Template for The Pyramid Web Framework</title>
+    <title>Alchemy Scaffold 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 -->
+    <!-- Custom styles for this scaffold -->
     <link href="${request.static_url('{{package}}:static/theme.css')}" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
@@ -33,7 +33,7 @@
           </div>
           <div class="col-md-10">
             <div class="content">
-              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">starter Alchemy template</span></h1>
+              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">Alchemy scaffold</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 {{pyramid_version}}</span>.</p>
             </div>
           </div>
diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
index dff7e734c..76feac3d1 100644
--- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
@@ -8,12 +8,12 @@
     <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>
+    <title>Starter Scaffold 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 -->
+    <!-- Custom styles for this scaffold -->
     <link href="${request.static_url('{{package}}:static/theme.css')}" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
@@ -33,7 +33,7 @@
           </div>
           <div class="col-md-10">
             <div class="content">
-              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">starter template</span></h1>
+              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">Starter scaffold</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 {{pyramid_version}}</span>.</p>
             </div>
           </div>
@@ -41,7 +41,7 @@
         <div class="row">
           <div class="links">
             <ul>
-              <li class="current-version">Generated by Pyramid  v{{pyramid_version}}</li>
+              <li class="current-version">Generated by Pyramid v{{pyramid_version}}</li>
               <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/">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 59f57d63a..2c28d5483 100644
--- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
@@ -8,12 +8,12 @@
     <meta name="author" content="Pylons Project">
     <link rel="shortcut icon" href="${request.static_url('{{package}}:static/pyramid-16x16.png')}">
 
-    <title>Starter ZODB Template for The Pyramid Web Framework</title>
+    <title>ZODB Scaffold 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 -->
+    <!-- Custom styles for this scaffold -->
     <link href="${request.static_url('{{package}}:static/theme.css')}" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
@@ -33,7 +33,7 @@
           </div>
           <div class="col-md-10">
             <div class="content">
-              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">starter ZODB template</span></h1>
+              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">ZODB scaffold</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 {{pyramid_version}}</span>.</p>
             </div>
           </div>
-- 
cgit v1.2.3


From a89ac0a6626924099922e5c8964a9f3f5ebb460a Mon Sep 17 00:00:00 2001
From: goodwillcoding <goodwillcoding@webhippo.net>
Date: Sun, 20 Apr 2014 13:43:46 -0700
Subject: refine language some more to say 'Pyramid' less

---
 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 a98c3fdd0..976011ecb 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">Generated by Pyramid v{{pyramid_version}}</li>
+              <li class="current-version">Generated by v{{pyramid_version}}</li>
               <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/">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 76feac3d1..3c27906a0 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">Generated by Pyramid v{{pyramid_version}}</li>
+              <li class="current-version">Generated by v{{pyramid_version}}</li>
               <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/">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 2c28d5483..56efda8b4 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">Generated by Pyramid v{{pyramid_version}}</li>
+              <li class="current-version">Generated by v{{pyramid_version}}</li>
               <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/">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 e18b5f5d6a2cd73d4df99433258146856960ac50 Mon Sep 17 00:00:00 2001
From: goodwillcoding <goodwillcoding@webhippo.net>
Date: Sun, 20 Apr 2014 13:45:32 -0700
Subject: update the version detection to use better regex matching for version
 and add more test cases

---
 pyramid/scripts/pcreate.py                 | 15 +++++++++---
 pyramid/tests/test_scripts/test_pcreate.py | 37 ++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/pyramid/scripts/pcreate.py b/pyramid/scripts/pcreate.py
index 32cb14ab0..ffa459588 100644
--- a/pyramid/scripts/pcreate.py
+++ b/pyramid/scripts/pcreate.py
@@ -87,11 +87,20 @@ class PCreateCommand(object):
 
         # get pyramid package version
         pyramid_version = self.pyramid_dist.version
+
         # map pyramid package version of the documentation branch
-        if self.pyramid_dist.version[3:] == 'dev':
-          pyramid_docs_branch = 'latest'
+        # if version ends with 'dev' then docs version is latest'
+        if self.pyramid_dist.version[-3:] == 'dev':
+            pyramid_docs_branch = 'latest'
         else:
-          pyramid_docs_branch = "%s-branch" % self.pyramid_dist.version[:3]
+            # find the version.major version
+            major_version = re.match(r'(\d+\.\d+)', self.pyramid_dist.version)
+            # if can not find the version then default docs version to 'latest'
+            # otherwise the docs version is 'version.major_version-branch'
+            if major_version is None:
+                pyramid_docs_branch = 'latest'
+            else:
+              pyramid_docs_branch = "%s-branch" % major_version.group()
 
         vars = {
             'project': project_name,
diff --git a/pyramid/tests/test_scripts/test_pcreate.py b/pyramid/tests/test_scripts/test_pcreate.py
index c247d06b4..8c697bf2a 100644
--- a/pyramid/tests/test_scripts/test_pcreate.py
+++ b/pyramid/tests/test_scripts/test_pcreate.py
@@ -148,6 +148,30 @@ class TestPCreateCommand(unittest.TestCase):
             {'project': 'Distro', 'egg': 'Distro', 'package': 'distro',
              'pyramid_version': '0.2', 'pyramid_docs_branch':'0.2-branch'})
 
+    def test_scaffold_with_prod_pyramid_long_version(self):
+        cmd = self._makeOne('-s', 'dummy', 'Distro')
+        scaffold = DummyScaffold('dummy')
+        cmd.scaffolds = [scaffold]
+        cmd.pyramid_dist = DummyDist("0.2.1")
+        result = cmd.run()
+        self.assertEqual(result, 0)
+        self.assertEqual(
+            scaffold.vars,
+            {'project': 'Distro', 'egg': 'Distro', 'package': 'distro',
+             'pyramid_version': '0.2.1', 'pyramid_docs_branch':'0.2-branch'})
+
+    def test_scaffold_with_prod_pyramid_unparsable_version(self):
+        cmd = self._makeOne('-s', 'dummy', 'Distro')
+        scaffold = DummyScaffold('dummy')
+        cmd.scaffolds = [scaffold]
+        cmd.pyramid_dist = DummyDist("abc")
+        result = cmd.run()
+        self.assertEqual(result, 0)
+        self.assertEqual(
+            scaffold.vars,
+            {'project': 'Distro', 'egg': 'Distro', 'package': 'distro',
+             'pyramid_version': 'abc', 'pyramid_docs_branch':'latest'})
+
     def test_scaffold_with_dev_pyramid_version(self):
         cmd = self._makeOne('-s', 'dummy', 'Distro')
         scaffold = DummyScaffold('dummy')
@@ -160,6 +184,19 @@ class TestPCreateCommand(unittest.TestCase):
             {'project': 'Distro', 'egg': 'Distro', 'package': 'distro',
              'pyramid_version': '0.2dev', 'pyramid_docs_branch':'latest'})
 
+    def test_scaffold_with_dev_pyramid_long_version(self):
+        cmd = self._makeOne('-s', 'dummy', 'Distro')
+        scaffold = DummyScaffold('dummy')
+        cmd.scaffolds = [scaffold]
+        cmd.pyramid_dist = DummyDist("0.2.1dev")
+        result = cmd.run()
+        self.assertEqual(result, 0)
+        self.assertEqual(
+            scaffold.vars,
+            {'project': 'Distro', 'egg': 'Distro', 'package': 'distro',
+             'pyramid_version': '0.2.1dev', 'pyramid_docs_branch':'latest'})
+
+
 class Test_main(unittest.TestCase):
     def _callFUT(self, argv):
         from pyramid.scripts.pcreate import main
-- 
cgit v1.2.3


From 91f322214abe03b24cdecaea367f2df8713fd9e6 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Sun, 20 Apr 2014 17:39:50 -0500
Subject: remove special case for dev branches

the way pyramid's RTD works is that doc changes are rendered
automatically on each release branch, so dev versions should actually
point at their parent branch for the most up-to-date docs
---
 pyramid/scripts/pcreate.py                 | 16 +++++-----------
 pyramid/tests/test_scripts/test_pcreate.py | 10 ++++++----
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/pyramid/scripts/pcreate.py b/pyramid/scripts/pcreate.py
index ffa459588..d6d6952cc 100644
--- a/pyramid/scripts/pcreate.py
+++ b/pyramid/scripts/pcreate.py
@@ -89,18 +89,12 @@ class PCreateCommand(object):
         pyramid_version = self.pyramid_dist.version
 
         # map pyramid package version of the documentation branch
-        # if version ends with 'dev' then docs version is latest'
-        if self.pyramid_dist.version[-3:] == 'dev':
-            pyramid_docs_branch = 'latest'
+        # by finding the version.major version
+        vmatch = re.match(r'(\d+\.\d+)', self.pyramid_dist.version)
+        if vmatch is not None:
+            pyramid_docs_branch = "%s-branch" % vmatch.group()
         else:
-            # find the version.major version
-            major_version = re.match(r'(\d+\.\d+)', self.pyramid_dist.version)
-            # if can not find the version then default docs version to 'latest'
-            # otherwise the docs version is 'version.major_version-branch'
-            if major_version is None:
-                pyramid_docs_branch = 'latest'
-            else:
-              pyramid_docs_branch = "%s-branch" % major_version.group()
+            pyramid_docs_branch = 'latest'
 
         vars = {
             'project': project_name,
diff --git a/pyramid/tests/test_scripts/test_pcreate.py b/pyramid/tests/test_scripts/test_pcreate.py
index 8c697bf2a..8d90ac442 100644
--- a/pyramid/tests/test_scripts/test_pcreate.py
+++ b/pyramid/tests/test_scripts/test_pcreate.py
@@ -176,25 +176,27 @@ class TestPCreateCommand(unittest.TestCase):
         cmd = self._makeOne('-s', 'dummy', 'Distro')
         scaffold = DummyScaffold('dummy')
         cmd.scaffolds = [scaffold]
-        cmd.pyramid_dist = DummyDist("0.2dev")
+        cmd.pyramid_dist = DummyDist("0.12dev")
         result = cmd.run()
         self.assertEqual(result, 0)
         self.assertEqual(
             scaffold.vars,
             {'project': 'Distro', 'egg': 'Distro', 'package': 'distro',
-             'pyramid_version': '0.2dev', 'pyramid_docs_branch':'latest'})
+             'pyramid_version': '0.12dev',
+             'pyramid_docs_branch': '0.12-branch'})
 
     def test_scaffold_with_dev_pyramid_long_version(self):
         cmd = self._makeOne('-s', 'dummy', 'Distro')
         scaffold = DummyScaffold('dummy')
         cmd.scaffolds = [scaffold]
-        cmd.pyramid_dist = DummyDist("0.2.1dev")
+        cmd.pyramid_dist = DummyDist("0.10.1dev")
         result = cmd.run()
         self.assertEqual(result, 0)
         self.assertEqual(
             scaffold.vars,
             {'project': 'Distro', 'egg': 'Distro', 'package': 'distro',
-             'pyramid_version': '0.2.1dev', 'pyramid_docs_branch':'latest'})
+             'pyramid_version': '0.10.1dev',
+             'pyramid_docs_branch': '0.10-branch'})
 
 
 class Test_main(unittest.TestCase):
-- 
cgit v1.2.3


From 64b65d11bc414ca91cf266a888445a3cedb65efd Mon Sep 17 00:00:00 2001
From: goodwillcoding <goodwillcoding@webhippo.net>
Date: Sun, 20 Apr 2014 20:47:21 -0700
Subject: add correct handling for dev docs which now points to 'master' docs

---
 pyramid/scripts/pcreate.py                 | 18 ++++++++++++------
 pyramid/tests/test_scripts/test_pcreate.py |  4 ++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pyramid/scripts/pcreate.py b/pyramid/scripts/pcreate.py
index d6d6952cc..4c1f432fb 100644
--- a/pyramid/scripts/pcreate.py
+++ b/pyramid/scripts/pcreate.py
@@ -88,13 +88,19 @@ class PCreateCommand(object):
         # get pyramid package version
         pyramid_version = self.pyramid_dist.version
 
-        # map pyramid package version of the documentation branch
-        # by finding the version.major version
-        vmatch = re.match(r'(\d+\.\d+)', self.pyramid_dist.version)
-        if vmatch is not None:
-            pyramid_docs_branch = "%s-branch" % vmatch.group()
+        ## map pyramid package version of the documentation branch ##
+        # if version ends with 'dev' then docs version is 'master'
+        if self.pyramid_dist.version[-3:] == 'dev':
+            pyramid_docs_branch = 'master'
         else:
-            pyramid_docs_branch = 'latest'
+            # if not version is not 'dev' find the version.major_version string
+            # and combine it with '-branch'
+            version_match = re.match(r'(\d+\.\d+)', self.pyramid_dist.version)
+            if version_match is not None:
+                pyramid_docs_branch = "%s-branch" % version_match.group()
+            # if can not parse the version then default to 'latest'
+            else:
+                pyramid_docs_branch = 'latest'
 
         vars = {
             'project': project_name,
diff --git a/pyramid/tests/test_scripts/test_pcreate.py b/pyramid/tests/test_scripts/test_pcreate.py
index 8d90ac442..2488e9595 100644
--- a/pyramid/tests/test_scripts/test_pcreate.py
+++ b/pyramid/tests/test_scripts/test_pcreate.py
@@ -183,7 +183,7 @@ class TestPCreateCommand(unittest.TestCase):
             scaffold.vars,
             {'project': 'Distro', 'egg': 'Distro', 'package': 'distro',
              'pyramid_version': '0.12dev',
-             'pyramid_docs_branch': '0.12-branch'})
+             'pyramid_docs_branch': 'master'})
 
     def test_scaffold_with_dev_pyramid_long_version(self):
         cmd = self._makeOne('-s', 'dummy', 'Distro')
@@ -196,7 +196,7 @@ class TestPCreateCommand(unittest.TestCase):
             scaffold.vars,
             {'project': 'Distro', 'egg': 'Distro', 'package': 'distro',
              'pyramid_version': '0.10.1dev',
-             'pyramid_docs_branch': '0.10-branch'})
+             'pyramid_docs_branch': 'master'})
 
 
 class Test_main(unittest.TestCase):
-- 
cgit v1.2.3


From e5346a5dae13357917b7a91472e129a8841e79c9 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Mon, 21 Apr 2014 14:37:30 -0700
Subject: Update background section same as quick_tour.rst

Update text of ``background`` section same as ``sessions`` section of ``quick_tour.rst``
---
 docs/quick_tutorial/sessions.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/quick_tutorial/sessions.rst b/docs/quick_tutorial/sessions.rst
index 0f284e9a7..b4887beb8 100644
--- a/docs/quick_tutorial/sessions.rst
+++ b/docs/quick_tutorial/sessions.rst
@@ -13,10 +13,10 @@ When people use your web application, they frequently perform a task
 that requires semi-permanent data to be saved. For example, a shopping
 cart. This is called a :term:`session`.
 
-Pyramid has basic built-in support for sessions, with add-ons
-or your own custom sessioning engine) that can provide
-richer session support. Let's take a look at the
-:ref:`built-in sessioning support <sessions_chapter>`.
+Pyramid has basic built-in support for sessions.  Third party packages such as
+``pyramid_redis_sessions`` provide richer session support.  Or you can create
+your own custom sessioning engine.  Let's take a look at the
+:doc:`built-in sessioning support <../narr/sessions>`.
 
 Objectives
 ==========
-- 
cgit v1.2.3


From d292b97587c19b4aa7fa0150a8b5ecc8d758b783 Mon Sep 17 00:00:00 2001
From: Bert JW Regeer <bertjw@regeer.org>
Date: Tue, 22 Apr 2014 20:00:53 -0600
Subject: Verify that wrapped is not None

If wrapped is None we raise a ValueError to let the user know that we
are unable to continue.
---
 pyramid/tests/test_wsgi.py | 22 ++++++++++++++++++++++
 pyramid/wsgi.py            |  7 +++++++
 2 files changed, 29 insertions(+)

diff --git a/pyramid/tests/test_wsgi.py b/pyramid/tests/test_wsgi.py
index 63499b43b..432fb72ae 100644
--- a/pyramid/tests/test_wsgi.py
+++ b/pyramid/tests/test_wsgi.py
@@ -5,6 +5,17 @@ class WSGIAppTests(unittest.TestCase):
         from pyramid.wsgi import wsgiapp
         return wsgiapp(app)
 
+    def test_wsgiapp_none(self):
+        self.assertRaises(ValueError, self._callFUT, None)
+
+    def test_wsgiapp_none_func(self):
+        from pyramid.wsgi import wsgiapp
+
+        def some_func():
+            pass
+
+        self.assertRaises(ValueError, wsgiapp, some_func())
+
     def test_decorator(self):
         context = DummyContext()
         request = DummyRequest()
@@ -25,6 +36,17 @@ class WSGIApp2Tests(unittest.TestCase):
         from pyramid.wsgi import wsgiapp2
         return wsgiapp2(app)
 
+    def test_wsgiapp2_none(self):
+        self.assertRaises(ValueError, self._callFUT, None)
+
+    def test_wsgiapp2_none_func(self):
+        from pyramid.wsgi import wsgiapp2
+
+        def some_func():
+            pass
+
+        self.assertRaises(ValueError, wsgiapp2, some_func())
+
     def test_decorator_with_subpath_and_view_name(self):
         context = DummyContext()
         request = DummyRequest()
diff --git a/pyramid/wsgi.py b/pyramid/wsgi.py
index d176e4ce5..1c1bded32 100644
--- a/pyramid/wsgi.py
+++ b/pyramid/wsgi.py
@@ -29,6 +29,10 @@ def wsgiapp(wrapped):
     view.
 
     """
+
+    if wrapped is None:
+        raise ValueError('wrapped can not be None')
+
     def decorator(context, request):
         return request.get_response(wrapped)
 
@@ -69,6 +73,9 @@ def wsgiapp2(wrapped):
     subpath is used as the ``SCRIPT_NAME``.  The new environment is passed to
     the downstream WSGI application."""
 
+    if wrapped is None:
+        raise ValueError('wrapped can not be None')
+
     def decorator(context, request):
         return call_app_with_subpath_as_path_info(request, wrapped)
 
-- 
cgit v1.2.3


From 2eb28f583cc423ab2c6b9b830cf40da7795ca04a Mon Sep 17 00:00:00 2001
From: Bert JW Regeer <bertjw@regeer.org>
Date: Tue, 22 Apr 2014 20:03:45 -0600
Subject: Update CHANGES for wsgiapp and wsgiapp2

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

diff --git a/CHANGES.txt b/CHANGES.txt
index b0495617b..2761c29dc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,8 @@ Next release
   introspectable but not when passed for registration. This would mean that
   add_route_predicate for example can not take a string and turn it into the
   actual callable function.
+- p.wsgi.wsgiapp and p.wsgi.wsgiapp2 now raise ValueError when accidentally
+  passed None.
 
 1.5 (2014-04-08)
 ================
-- 
cgit v1.2.3


From de2721019b20452217062a8fa447c60816d5e336 Mon Sep 17 00:00:00 2001
From: Omid Raha <omidraha.com@gmail.com>
Date: Wed, 23 Apr 2014 15:27:26 +0430
Subject: Remove repeated word.

Remove repeated `use` word.
---
 docs/whatsnew-1.5.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/whatsnew-1.5.rst b/docs/whatsnew-1.5.rst
index 65e8393f8..455822aaa 100644
--- a/docs/whatsnew-1.5.rst
+++ b/docs/whatsnew-1.5.rst
@@ -386,7 +386,7 @@ Other Backwards Incompatibilities
 
 - If you send an ``X-Vhm-Root`` header with a value that ends with a slash (or
   any number of slashes), the trailing slash(es) will be removed before a URL
-  is generated when you use use :meth:`~pyramid.request.Request.resource_url`
+  is generated when you use :meth:`~pyramid.request.Request.resource_url`
   or :meth:`~pyramid.request.Request.resource_path`.  Previously the virtual
   root path would not have trailing slashes stripped, which would influence URL
   generation.
-- 
cgit v1.2.3


From cb06eb02b145f7471b66b5fb2a5c031efd9575b7 Mon Sep 17 00:00:00 2001
From: Omid Raha <omidraha.com@gmail.com>
Date: Thu, 24 Apr 2014 00:17:53 +0430
Subject: Improving `X-Vhm-Root` paragraphs.

Improving text of `X-Vhm-Root` paragraphs in `Other Backwards Incompatibilities` section.
---
 docs/whatsnew-1.5.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/whatsnew-1.5.rst b/docs/whatsnew-1.5.rst
index 455822aaa..1d863c937 100644
--- a/docs/whatsnew-1.5.rst
+++ b/docs/whatsnew-1.5.rst
@@ -384,8 +384,8 @@ Other Backwards Incompatibilities
   are now "reified" properties that look up a locale name and localizer
   respectively using the machinery described in :ref:`i18n_chapter`.
 
-- If you send an ``X-Vhm-Root`` header with a value that ends with a slash (or
-  any number of slashes), the trailing slash(es) will be removed before a URL
+- If you send an ``X-Vhm-Root`` header with a value that ends with any number
+  of slashes, the trailing slashes will be removed before the URL
   is generated when you use :meth:`~pyramid.request.Request.resource_url`
   or :meth:`~pyramid.request.Request.resource_path`.  Previously the virtual
   root path would not have trailing slashes stripped, which would influence URL
-- 
cgit v1.2.3


From 09beb29cb2a142c798d97caf17ead9def79f0843 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Wed, 23 Apr 2014 23:25:19 -0500
Subject: remove redundant tests

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 2761c29dc..c14939d81 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,8 +10,9 @@ Next release
   introspectable but not when passed for registration. This would mean that
   add_route_predicate for example can not take a string and turn it into the
   actual callable function.
-- p.wsgi.wsgiapp and p.wsgi.wsgiapp2 now raise ValueError when accidentally
-  passed None.
+
+- ``pyramid.wsgi.wsgiapp`` and ``pyramid.wsgi.wsgiapp2`` now raise
+  ``ValueError`` when accidentally passed ``None``.
 
 1.5 (2014-04-08)
 ================
diff --git a/pyramid/tests/test_wsgi.py b/pyramid/tests/test_wsgi.py
index 432fb72ae..4ddbc9201 100644
--- a/pyramid/tests/test_wsgi.py
+++ b/pyramid/tests/test_wsgi.py
@@ -8,14 +8,6 @@ class WSGIAppTests(unittest.TestCase):
     def test_wsgiapp_none(self):
         self.assertRaises(ValueError, self._callFUT, None)
 
-    def test_wsgiapp_none_func(self):
-        from pyramid.wsgi import wsgiapp
-
-        def some_func():
-            pass
-
-        self.assertRaises(ValueError, wsgiapp, some_func())
-
     def test_decorator(self):
         context = DummyContext()
         request = DummyRequest()
@@ -39,14 +31,6 @@ class WSGIApp2Tests(unittest.TestCase):
     def test_wsgiapp2_none(self):
         self.assertRaises(ValueError, self._callFUT, None)
 
-    def test_wsgiapp2_none_func(self):
-        from pyramid.wsgi import wsgiapp2
-
-        def some_func():
-            pass
-
-        self.assertRaises(ValueError, wsgiapp2, some_func())
-
     def test_decorator_with_subpath_and_view_name(self):
         context = DummyContext()
         request = DummyRequest()
-- 
cgit v1.2.3


From cef139b9c2f163694968ae5b7efe7eae07e72c04 Mon Sep 17 00:00:00 2001
From: bobby <bobby@jackprogram.com>
Date: Wed, 23 Apr 2014 23:04:00 -0700
Subject: Typo found in second Declarative code block

There were two import statements for Configurator.
I removed the second import statement in the "__main__" since most of the
documentation declares all imports on the top of the source.

	modified:   configuration.rst
---
 docs/narr/configuration.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/narr/configuration.rst b/docs/narr/configuration.rst
index f7a69d613..52615533d 100644
--- a/docs/narr/configuration.rst
+++ b/docs/narr/configuration.rst
@@ -114,7 +114,6 @@ in a package and its subpackages.  For example:
        return Response('Hello')
 
    if __name__ == '__main__':
-       from pyramid.config import Configurator
        config = Configurator()
        config.scan()
        app = config.make_wsgi_app()
-- 
cgit v1.2.3


From 44a20139152b6855bfaa6138214d745939ca82f9 Mon Sep 17 00:00:00 2001
From: Fenton Travers <fenton.travers@oracle.com>
Date: Thu, 24 Apr 2014 13:05:52 -0700
Subject: The copyright symbol causes this error:

UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 2559: ordinal not in range(128)
---
 pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
index 976011ecb..a1b07a1ca 100644
--- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
@@ -50,7 +50,7 @@
         </div>
         <div class="row">
           <div class="copyright">
-            Copyright © Pylons Project
+            Copyright Pylons Project
           </div>
         </div>
       </div>
-- 
cgit v1.2.3


From 6541717478e958143b73256f113cf709ebaa40d6 Mon Sep 17 00:00:00 2001
From: Fenton Travers <fenton.travers@oracle.com>
Date: Thu, 24 Apr 2014 14:03:49 -0700
Subject: Replaced non-ascii copyright character with HTML equivalent.

---
 docs/narr/MyProject/myproject/templates/mytemplate.pt            | 2 +-
 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 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt
index d1af4f42c..e6b00a145 100644
--- a/docs/narr/MyProject/myproject/templates/mytemplate.pt
+++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt
@@ -50,7 +50,7 @@
         </div>
         <div class="row">
           <div class="copyright">
-            Copyright © Pylons Project
+            Copyright &copy; Pylons Project
           </div>
         </div>
       </div>
diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
index a1b07a1ca..73d0976b9 100644
--- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
@@ -50,7 +50,7 @@
         </div>
         <div class="row">
           <div class="copyright">
-            Copyright Pylons Project
+            Copyright &copy; Pylons Project
           </div>
         </div>
       </div>
diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
index 3c27906a0..738a16817 100644
--- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
@@ -50,7 +50,7 @@
         </div>
         <div class="row">
           <div class="copyright">
-            Copyright © Pylons Project
+            Copyright &copy; Pylons Project
           </div>
         </div>
       </div>
diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
index 56efda8b4..855944899 100644
--- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
@@ -50,7 +50,7 @@
         </div>
         <div class="row">
           <div class="copyright">
-            Copyright © Pylons Project
+            Copyright &copy; Pylons Project
           </div>
         </div>
       </div>
-- 
cgit v1.2.3


From dab7485e3fb20e8372d54c8dd815e7071b2580db Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Sun, 27 Apr 2014 09:41:16 -0700
Subject: Replaced five minutes with one hour

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

diff --git a/pyramid/static.py b/pyramid/static.py
index 63ca58597..0987ffde6 100644
--- a/pyramid/static.py
+++ b/pyramid/static.py
@@ -11,7 +11,7 @@ from os.path import (
 
 from pkg_resources import (
     resource_exists,
-    resource_filename,
+    resource_filename,

     resource_isdir,
     )
 
@@ -58,7 +58,7 @@ class static_view(object):
 
     ``cache_max_age`` influences the ``Expires`` and ``Max-Age``
     response headers returned by the view (default is 3600 seconds or
-    five minutes).
+    one hour).
 
     ``use_subpath`` influences whether ``request.subpath`` will be used as
     ``PATH_INFO`` when calling the underlying WSGI application which actually
-- 
cgit v1.2.3


From 934d7fe27b92d0e329c0c1a76bdd3e0870e2f09a Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Sun, 27 Apr 2014 09:42:00 -0700
Subject: Update static.py

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

diff --git a/pyramid/static.py b/pyramid/static.py
index 0987ffde6..aa67568d3 100644
--- a/pyramid/static.py
+++ b/pyramid/static.py
@@ -11,7 +11,7 @@ from os.path import (
 
 from pkg_resources import (
     resource_exists,
-    resource_filename,

+    resource_filename,
     resource_isdir,
     )
 
-- 
cgit v1.2.3


From dd4f73f2543e350c0b4141efe31842be00161fa9 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Tue, 29 Apr 2014 20:32:08 -0500
Subject: require ISession.invalidate to leave behind a usable session

---
 CHANGES.txt           | 3 +++
 pyramid/interfaces.py | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c14939d81..02be109db 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,9 @@ Next release
 - ``pyramid.wsgi.wsgiapp`` and ``pyramid.wsgi.wsgiapp2`` now raise
   ``ValueError`` when accidentally passed ``None``.
 
+- Clarify a previously-implied detail of the ``ISession.invalidate`` API
+  documentation.
+
 1.5 (2014-04-08)
 ================
 
diff --git a/pyramid/interfaces.py b/pyramid/interfaces.py
index 75b9b1cb9..aa2dbdafd 100644
--- a/pyramid/interfaces.py
+++ b/pyramid/interfaces.py
@@ -910,7 +910,13 @@ class ISession(IDict):
         ``invalidate`` is implementation-dependent, but it should have
         the effect of completely dissociating any data stored in the
         session with the current request.  It might set response
-        values (such as one which clears a cookie), or it might not."""
+        values (such as one which clears a cookie), or it might not.
+
+        An invalidated session may be used after the call to ``invalidate``
+        with the effect that a new session is created to store the data. This
+        enables workflows requiring an entirely new session, such as in the
+        case of changing privilege levels or preventing fixation attacks.
+        """
 
     def changed():
         """ Mark the session as changed. A user of a session should
-- 
cgit v1.2.3


From 306c298d897acb5b751fa7dc0b8081b48007686f Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 1 May 2014 13:34:17 -0500
Subject: fix #1253

---
 docs/narr/viewconfig.rst | 13 ++++++++-----
 pyramid/config/views.py  | 10 +++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index adc53bd11..a0feef8d7 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -295,11 +295,14 @@ configured view.
   *This is an advanced feature, not often used by "civilians"*.
 
 ``request_method``
-  This value can be a string (typically ``"GET"``, ``"POST"``, ``"PUT"``,
-  ``"DELETE"``, or ``"HEAD"``) representing an HTTP ``REQUEST_METHOD``.  A view
-  declaration with this argument ensures that the view will only be called
-  when the request's ``method`` attribute (aka the ``REQUEST_METHOD`` of the
-  WSGI environment) string matches the supplied value.
+  This value can be either a string (such as ``"GET"``, ``"POST"``,
+  ``"PUT"``, ``"DELETE"``, ``"HEAD"`` or ``"OPTIONS"``) representing an
+  HTTP ``REQUEST_METHOD``, or a tuple containing one or more of these
+  strings.  A view declaration with this argument ensures that the
+  view will only be called when the ``method`` attribute of the
+  request (aka the ``REQUEST_METHOD`` of the WSGI environment) matches
+  a supplied value.  Note that use of ``"GET"`` also implies that the
+  view will respond to ``"HEAD"`` as of Pyramid 1.4.
 
   If ``request_method`` is not supplied, the view will be invoked regardless
   of the ``REQUEST_METHOD`` of the :term:`WSGI` environment.
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index 2f6c758ab..7a6157ec8 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -879,11 +879,11 @@ class ViewsConfiguratorMixin(object):
 
         request_method
 
-          This value can be either a strings (such as ``GET``, ``POST``,
-          ``PUT``, ``DELETE``, or ``HEAD``) representing an HTTP
-          ``REQUEST_METHOD``, or a tuple containing one or more of these
-          strings.  A view declaration with this argument ensures that the
-          view will only be called when the ``method`` attribute of the
+          This value can be either a string (such as ``"GET"``, ``"POST"``,
+          ``"PUT"``, ``"DELETE"``, ``"HEAD"`` or ``"OPTIONS"``) representing
+          an HTTP ``REQUEST_METHOD``, or a tuple containing one or more of
+          these strings.  A view declaration with this argument ensures that
+          the view will only be called when the ``method`` attribute of the
           request (aka the ``REQUEST_METHOD`` of the WSGI environment) matches
           a supplied value.  Note that use of ``GET`` also implies that the
           view will respond to ``HEAD`` as of Pyramid 1.4.
-- 
cgit v1.2.3


From 7096d92efd27b96ae48c798a207905f4c38b13c5 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sat, 3 May 2014 22:34:53 -0700
Subject: - spelling

---
 docs/glossary.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/glossary.rst b/docs/glossary.rst
index 2cc461a77..deb4c1c8b 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -936,7 +936,7 @@ Glossary
      `Akhet <http://docs.pylonsproject.org/projects/akhet/en/latest/>`_ is a 
      Pyramid library and demo application with a Pylons-like feel.
      It's most known for its former application scaffold, which helped 
-     users transition from Pylons and those prefering a more Pylons-like API.
+     users transition from Pylons and those preferring a more Pylons-like API.
      The scaffold has been retired but the demo plays a similar role. 
 
    Pyramid Cookbook
-- 
cgit v1.2.3


From c6c8c5ce12bceaf34a3950c2ee51e2961acaef67 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sat, 3 May 2014 22:41:51 -0700
Subject: - add cookbook to intersphinx mapping

---
 docs/conf.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/conf.py b/docs/conf.py
index eba776628..d15b1270e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -58,6 +58,7 @@ extensions = [
 # Looks for objects in external projects
 intersphinx_mapping = {
     'tutorials': ('http://docs.pylonsproject.org/projects/pyramid_tutorials/en/latest/', None),
+    'cookbook': ('http://docs.pylonsproject.org/projects/pyramid_cookbook/en/latest/', None),
     'jinja2': ('http://docs.pylonsproject.org/projects/pyramid_jinja2/en/latest/', None),
     'tm': (
         'http://docs.pylonsproject.org/projects/pyramid_tm/en/latest/',
-- 
cgit v1.2.3


From fc4740061c65692f6d2f23585f5efeff515cff99 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sat, 3 May 2014 22:46:35 -0700
Subject: - looks like _ are now - in RTD

---
 docs/conf.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index d15b1270e..4bc8e2172 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -57,9 +57,9 @@ extensions = [
 
 # Looks for objects in external projects
 intersphinx_mapping = {
-    'tutorials': ('http://docs.pylonsproject.org/projects/pyramid_tutorials/en/latest/', None),
-    'cookbook': ('http://docs.pylonsproject.org/projects/pyramid_cookbook/en/latest/', None),
-    'jinja2': ('http://docs.pylonsproject.org/projects/pyramid_jinja2/en/latest/', None),
+    'tutorials': ('http://docs.pylonsproject.org/projects/pyramid-tutorials/en/latest/', None),
+    'cookbook': ('http://docs.pylonsproject.org/projects/pyramid-cookbook/en/latest/', None),
+    'jinja2': ('http://docs.pylonsproject.org/projects/pyramid-jinja2/en/latest/', None),
     'tm': (
         'http://docs.pylonsproject.org/projects/pyramid_tm/en/latest/',
         None,
@@ -83,10 +83,10 @@ intersphinx_mapping = {
     'venusian':
         ('http://docs.pylonsproject.org/projects/venusian/en/latest', None),
     'toolbar':
-        ('http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/en/latest',
+        ('http://docs.pylonsproject.org/projects/pyramid-debugtoolbar/en/latest',
          None),
     'zcml':
-        ('http://docs.pylonsproject.org/projects/pyramid_zcml/en/latest',
+        ('http://docs.pylonsproject.org/projects/pyramid-zcml/en/latest',
          None),
 }
 
-- 
cgit v1.2.3


From 0f14d8db1b7ca13f62e967305e3583ff4b74abb1 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sat, 3 May 2014 23:12:48 -0700
Subject: - add a reference

---
 docs/index.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/index.rst b/docs/index.rst
index 78a00966d..ac16ff237 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -119,6 +119,8 @@ Narrative documentation in chapter form explaining how to use
    narr/threadlocals
    narr/zca
 
+.. _html_tutorials:
+
 Tutorials
 =========
 
-- 
cgit v1.2.3


From 1e5c58acf871f7e95e3b86e9cac9b0a2c889ea5f Mon Sep 17 00:00:00 2001
From: flibustenet <flibustenet@users.noreply.github.com>
Date: Mon, 5 May 2014 18:48:19 +0200
Subject: Order of response_callback in the docstring

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

diff --git a/pyramid/request.py b/pyramid/request.py
index f8514066e..6318049ee 100644
--- a/pyramid/request.py
+++ b/pyramid/request.py
@@ -59,8 +59,8 @@ class CallbackMethodsMixin(object):
         called if an exception happens in application code, or if the
         response object returned by :term:`view` code is invalid.
 
-        All response callbacks are called *after* the
-        :class:`pyramid.events.NewResponse` event is sent.
+        All response callbacks are called *after* the tweens and 
+        *before* the :class:`pyramid.events.NewResponse` event is sent.
 
         Errors raised by callbacks are not handled specially.  They
         will be propagated to the caller of the :app:`Pyramid`
-- 
cgit v1.2.3


From 7a6bf6f0ff1b85d0158ad49fc21037db4999c1cf Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Mon, 5 May 2014 23:53:25 -0400
Subject: modify changes wrt logging config stripping

---
 CHANGES.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 264497f5b..da8db870f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,12 @@
 Next release
 ============
 
-- ...
+Docs
+----
+
+- Removed logging configuration from Quick Tutorial ini files except for
+  scaffolding- and logging-related chapters to avoid needing to explain it too
+  early.
 
 1.5 (2014-04-08)
 ================
-- 
cgit v1.2.3


From d24055e3ec0c09974f180a459143676ba457a32f Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 24 Apr 2014 00:24:54 -0500
Subject: modify p.testing.setUp() to configure the package relative to caller

---
 CHANGES.txt                   |  5 +++++
 pyramid/testing.py            | 20 +++++++++++++++++---
 pyramid/tests/test_testing.py |  5 +++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2b80e87e2..de0a4324b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,11 @@ Bug Fixes
   add_route_predicate for example can not take a string and turn it into the
   actual callable function.
 
+- Fix ``pyramid.testing.setUp`` to return a ``Configurator`` with a proper
+  package. Previously it was not possible to do package-relative includes
+  using the returned ``Configurator`` during testing. There is now a
+  ``package`` argument that can override this behavior as well.
+
 Docs
 ----
 
diff --git a/pyramid/testing.py b/pyramid/testing.py
index 91dc41dd5..8cbd8b82b 100644
--- a/pyramid/testing.py
+++ b/pyramid/testing.py
@@ -21,6 +21,7 @@ from pyramid.compat import (
 
 from pyramid.config import Configurator
 from pyramid.decorator import reify
+from pyramid.path import caller_package
 from pyramid.response import Response
 from pyramid.registry import Registry
 
@@ -388,7 +389,7 @@ class DummyRequest(
 have_zca = True
 
 def setUp(registry=None, request=None, hook_zca=True, autocommit=True,
-          settings=None):
+          settings=None, package=None):
     """
     Set :app:`Pyramid` registry and request thread locals for the
     duration of a single unit test.
@@ -432,9 +433,15 @@ def setUp(registry=None, request=None, hook_zca=True, autocommit=True,
     :mod:`zope.component` package cannot be imported, or if
     ``hook_zca`` is ``False``, the hook will not be set.
 
-    If ``settings`` is not None, it must be a dictionary representing the
+    If ``settings`` is not ``None``, it must be a dictionary representing the
     values passed to a Configurator as its ``settings=`` argument.
 
+    If ``package`` is ``None`` it will be set to the caller's package. The
+    ``package`` setting in the :class:`pyramid.config.Configurator` will
+    affect any relative imports made via
+    :meth:`pyramid.config.Configurator.include` or
+    :meth:`pyramid.config.Configurator.maybe_dotted`.
+
     This function returns an instance of the
     :class:`pyramid.config.Configurator` class, which can be
     used for further configuration to set up an environment suitable
@@ -447,7 +454,10 @@ def setUp(registry=None, request=None, hook_zca=True, autocommit=True,
     manager.clear()
     if registry is None:
         registry = Registry('testing')
-    config = Configurator(registry=registry, autocommit=autocommit)
+    if package is None:
+        package = caller_package()
+    config = Configurator(registry=registry, autocommit=autocommit,
+                          package=package)
     if settings is None:
         settings = {}
     if getattr(registry, 'settings', None) is None:
@@ -505,6 +515,10 @@ def tearDown(unhook_zca=True):
 
 def cleanUp(*arg, **kw):
     """ An alias for :func:`pyramid.testing.setUp`. """
+    package = kw.get('package', None)
+    if package is None:
+        package = caller_package()
+        kw['package'] = package
     return setUp(*arg, **kw)
 
 class DummyRendererFactory(object):
diff --git a/pyramid/tests/test_testing.py b/pyramid/tests/test_testing.py
index da57c6301..2d0548b33 100644
--- a/pyramid/tests/test_testing.py
+++ b/pyramid/tests/test_testing.py
@@ -347,6 +347,7 @@ class Test_setUp(unittest.TestCase):
         self.assertEqual(config.registry, current['registry'])
         self.assertEqual(current['registry'].__class__, Registry)
         self.assertEqual(current['request'], None)
+        self.assertEqual(config.package.__name__, 'pyramid.tests')
         self._assertSMHook(get_current_registry)
 
     def test_it_with_registry(self):
@@ -364,6 +365,10 @@ class Test_setUp(unittest.TestCase):
         current = manager.get()
         self.assertEqual(current['request'], request)
 
+    def test_it_with_package(self):
+        config = self._callFUT(package='pyramid')
+        self.assertEqual(config.package.__name__, 'pyramid')
+
     def test_it_with_hook_zca_false(self):
         from pyramid.registry import Registry
         registry = Registry()
-- 
cgit v1.2.3


From 93bc46364b13723194dba62fe78dee8b358d6401 Mon Sep 17 00:00:00 2001
From: Fenton Travers <fenton.travers@oracle.com>
Date: Tue, 6 May 2014 23:28:23 -0700
Subject: Added required notes to changes/contributors file.

---
 CHANGES.txt      | 3 +++
 CONTRIBUTORS.txt | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index c14939d81..1e2e42413 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,9 @@ Next release
 - ``pyramid.wsgi.wsgiapp`` and ``pyramid.wsgi.wsgiapp2`` now raise
   ``ValueError`` when accidentally passed ``None``.
 
+- Removed non-ascii copyright symbol from templates, as this was
+  causing the scaffolds to fail for project generation.
+
 1.5 (2014-04-08)
 ================
 
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index d1ac72df5..c77d3e92c 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -230,3 +230,5 @@ Contributors
 - Antti Haapala, 2013/11/15
 
 - Amit Mane, 2014/01/23
+
+- Fenton Travers, 2014/05/06
-- 
cgit v1.2.3


From fbcce774fb33b57673c99f9e82058c507e212611 Mon Sep 17 00:00:00 2001
From: synthomat <info@sublink.de>
Date: Tue, 13 May 2014 13:29:56 +0200
Subject: Update hooks.rst

'self' param was omitted in the constructor of simple_tween_factory class
---
 docs/narr/hooks.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index f2542f1d7..94be31bbc 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -1023,7 +1023,7 @@ method:
     :linenos:
 
     class simple_tween_factory(object):
-        def __init__(handler, registry):
+        def __init__(self, handler, registry):
             self.handler = handler
             self.registry = registry
 
-- 
cgit v1.2.3


From 739fbc26639a06900a8638d0e5de7441e41ff810 Mon Sep 17 00:00:00 2001
From: "Karl O. Pinc" <kop@meme.com>
Date: Fri, 16 May 2014 10:32:42 -0500
Subject: Docs: narr/templates.rst: Doc default extensions of each template
 system.

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

diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index 038dd2594..cd13afde8 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -450,15 +450,15 @@ Available Add-On Template System Bindings
 The Pylons Project maintains several packages providing bindings to different
 templating languages including the following:
 
-+------------------------------+------------------------------+
-| Template Language            | Pyramid Bindings             |
-+==============================+==============================+
-| Chameleon_                   | pyramid_chameleon_           |
-+------------------------------+------------------------------+
-| Jinja2_                      | pyramid_jinja2_              |
-+------------------------------+------------------------------+
-| Mako_                        | pyramid_mako_                |
-+------------------------------+------------------------------+
++---------------------------+----------------------------+--------------------+
+| Template Language         | Pyramid Bindings           | Default Extensions |
++===========================+============================+====================+
+| Chameleon_                | pyramid_chameleon_         | .pt, .txt          |
++---------------------------+----------------------------+--------------------+
+| Jinja2_                   | pyramid_jinja2_            | .jinja2            |
++---------------------------+----------------------------+--------------------+
+| Mako_                     | pyramid_mako_              | .mak, .mako        |
++---------------------------+----------------------------+--------------------+
 
 .. _Chameleon: http://chameleon.readthedocs.org/en/latest/
 .. _pyramid_chameleon: https://pypi.python.org/pypi/pyramid_chameleon
-- 
cgit v1.2.3


From 71ad608da8651417d238bcce3337362db72d25b0 Mon Sep 17 00:00:00 2001
From: krysros <krystian.rosinski@gmail.com>
Date: Fri, 16 May 2014 22:03:39 +0200
Subject: fix typo

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

diff --git a/pyramid/security.py b/pyramid/security.py
index c98d4e6cc..041155563 100644
--- a/pyramid/security.py
+++ b/pyramid/security.py
@@ -59,7 +59,7 @@ def has_permission(permission, context, request):
 deprecated(
     'has_permission',
     'As of Pyramid 1.5 the "pyramid.security.has_permission" API is now '
-    'deprecated.  It will be removed in Pyramd 1.8.  Use the '
+    'deprecated.  It will be removed in Pyramid 1.8.  Use the '
     '"has_permission" method of the Pyramid request instead.'
     )
 
@@ -77,7 +77,7 @@ def authenticated_userid(request):
 deprecated(
     'authenticated_userid',
     'As of Pyramid 1.5 the "pyramid.security.authenticated_userid" API is now '
-    'deprecated.  It will be removed in Pyramd 1.8.  Use the '
+    'deprecated.  It will be removed in Pyramid 1.8.  Use the '
     '"authenticated_userid" attribute of the Pyramid request instead.'
     )
 
@@ -94,7 +94,7 @@ def unauthenticated_userid(request):
 deprecated(
     'unauthenticated_userid',
     'As of Pyramid 1.5 the "pyramid.security.unauthenticated_userid" API is '
-    'now deprecated.  It will be removed in Pyramd 1.8.  Use the '
+    'now deprecated.  It will be removed in Pyramid 1.8.  Use the '
     '"unauthenticated_userid" attribute of the Pyramid request instead.'
     )
 
@@ -111,7 +111,7 @@ def effective_principals(request):
 deprecated(
     'effective_principals',
     'As of Pyramid 1.5 the "pyramid.security.effective_principals" API is '
-    'now deprecated.  It will be removed in Pyramd 1.8.  Use the '
+    'now deprecated.  It will be removed in Pyramid 1.8.  Use the '
     '"effective_principals" attribute of the Pyramid request instead.'
     )
 
-- 
cgit v1.2.3


From e858454e9cc375a633bfb7b39bdd4391f79e2531 Mon Sep 17 00:00:00 2001
From: "Karl O. Pinc" <kop@meme.com>
Date: Fri, 16 May 2014 17:18:00 -0500
Subject: Docs: narr/templates.rst: Link template bindings to pyramid docs.

---
 docs/narr/templates.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index cd13afde8..460cda8ee 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -461,10 +461,13 @@ templating languages including the following:
 +---------------------------+----------------------------+--------------------+
 
 .. _Chameleon: http://chameleon.readthedocs.org/en/latest/
-.. _pyramid_chameleon: https://pypi.python.org/pypi/pyramid_chameleon
+.. _pyramid_chameleon:
+   http://docs.pylonsproject.org/projects/pyramid-chameleon/en/latest/
 
 .. _Jinja2: http://jinja.pocoo.org/docs/
-.. _pyramid_jinja2: https://pypi.python.org/pypi/pyramid_jinja2
+.. _pyramid_jinja2:
+   http://docs.pylonsproject.org/projects/pyramid-jinja2/en/latest/
 
 .. _Mako: http://www.makotemplates.org/
-.. _pyramid_mako: https://pypi.python.org/pypi/pyramid_mako
+.. _pyramid_mako:
+   http://docs.pylonsproject.org/projects/pyramid-mako/en/latest/
-- 
cgit v1.2.3


From 8dbe013e65134001bd48eb54935beb71d7333a37 Mon Sep 17 00:00:00 2001
From: dobesv <dobesv@gmail.com>
Date: Thu, 27 Feb 2014 16:22:36 -0800
Subject: Don't incorrectly default charset on FileResponse

By passing the content_type into the constructor to Response, we can allow it to decide intelligently whether the default charset should apply.  Otherwise we'd have to replicate that logic somehow, or live with weird charset annotations on images, pdfs, and zips.
---
 pyramid/response.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pyramid/response.py b/pyramid/response.py
index 0f61af472..ff1dd25d5 100644
--- a/pyramid/response.py
+++ b/pyramid/response.py
@@ -28,6 +28,14 @@ _BLOCK_SIZE = 4096 * 64 # 256K
 class Response(_Response):
     pass
 
+def maybe_guess_mimetype(content_type, content_encoding, path):
+    if content_type is None:
+        content_type, content_encoding = mimetypes.guess_type(path,
+                                                              strict=False)
+        if content_type is None:
+            content_type = 'application/octet-stream'
+    return dict(content_type=content_type, content_encoding=content_encoding)
+
 class FileResponse(Response):
     """
     A Response object that can be used to serve a static file from disk
@@ -52,15 +60,8 @@ class FileResponse(Response):
     """
     def __init__(self, path, request=None, cache_max_age=None,
                  content_type=None, content_encoding=None):
-        super(FileResponse, self).__init__(conditional_response=True)
+        super(FileResponse, self).__init__(conditional_response=True, **maybe_guess_mimetype(content_type, content_encoding, path))
         self.last_modified = getmtime(path)
-        if content_type is None:
-            content_type, content_encoding = mimetypes.guess_type(path,
-                                                                  strict=False)
-        if content_type is None:
-            content_type = 'application/octet-stream'
-        self.content_type = content_type
-        self.content_encoding = content_encoding
         content_length = getsize(path)
         f = open(path, 'rb')
         app_iter = None
-- 
cgit v1.2.3


From 4823d8577f3dd09f908ed8e4381b4050400022db Mon Sep 17 00:00:00 2001
From: Dobes Vandermeer <dvandermeer@roovy.com>
Date: Thu, 6 Mar 2014 19:34:29 -0800
Subject: Add tests for the content_type fix.

---
 pyramid/response.py                |  18 +++++++++---------
 pyramid/tests/fixtures/minimal.pdf | Bin 0 -> 1054 bytes
 pyramid/tests/fixtures/minimal.xml |   1 +
 pyramid/tests/test_response.py     |  23 +++++++++++++++++------
 4 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100755 pyramid/tests/fixtures/minimal.pdf
 create mode 100644 pyramid/tests/fixtures/minimal.xml

diff --git a/pyramid/response.py b/pyramid/response.py
index ff1dd25d5..6b5f0a561 100644
--- a/pyramid/response.py
+++ b/pyramid/response.py
@@ -28,14 +28,6 @@ _BLOCK_SIZE = 4096 * 64 # 256K
 class Response(_Response):
     pass
 
-def maybe_guess_mimetype(content_type, content_encoding, path):
-    if content_type is None:
-        content_type, content_encoding = mimetypes.guess_type(path,
-                                                              strict=False)
-        if content_type is None:
-            content_type = 'application/octet-stream'
-    return dict(content_type=content_type, content_encoding=content_encoding)
-
 class FileResponse(Response):
     """
     A Response object that can be used to serve a static file from disk
@@ -60,7 +52,15 @@ class FileResponse(Response):
     """
     def __init__(self, path, request=None, cache_max_age=None,
                  content_type=None, content_encoding=None):
-        super(FileResponse, self).__init__(conditional_response=True, **maybe_guess_mimetype(content_type, content_encoding, path))
+        if content_type is None:
+            content_type, content_encoding = mimetypes.guess_type(path, strict=False)
+            if content_type is None:
+                content_type = 'application/octet-stream'
+        super(FileResponse, self).__init__(
+            conditional_response=True,
+            content_type=content_type,
+            content_encoding=content_encoding
+        )
         self.last_modified = getmtime(path)
         content_length = getsize(path)
         f = open(path, 'rb')
diff --git a/pyramid/tests/fixtures/minimal.pdf b/pyramid/tests/fixtures/minimal.pdf
new file mode 100755
index 000000000..e267be996
Binary files /dev/null and b/pyramid/tests/fixtures/minimal.pdf differ
diff --git a/pyramid/tests/fixtures/minimal.xml b/pyramid/tests/fixtures/minimal.xml
new file mode 100644
index 000000000..1972c155d
--- /dev/null
+++ b/pyramid/tests/fixtures/minimal.xml
@@ -0,0 +1 @@
+<hello/>
\ No newline at end of file
diff --git a/pyramid/tests/test_response.py b/pyramid/tests/test_response.py
index e6d90f979..afd354d97 100644
--- a/pyramid/tests/test_response.py
+++ b/pyramid/tests/test_response.py
@@ -23,21 +23,32 @@ class TestFileResponse(unittest.TestCase):
         from pyramid.response import FileResponse
         return FileResponse(file, **kw)
 
-    def _getPath(self):
+    def _getPath(self, suffix='txt'):
         here = os.path.dirname(__file__)
-        return os.path.join(here, 'fixtures', 'minimal.txt')
+        return os.path.join(here, 'fixtures', 'minimal.%s'%(suffix,))
 
     def test_with_content_type(self):
         path = self._getPath()
         r = self._makeOne(path, content_type='image/jpeg')
         self.assertEqual(r.content_type, 'image/jpeg')
+        self.assertEqual(r.headers.get('content-type'), 'image/jpeg')
+        path = self._getPath()
+        r = self._makeOne(path, content_type='application/xml')
+        self.assertEqual(r.content_type, 'application/xml')
+        self.assertEqual(r.headers['content-type'], 'application/xml; charset=UTF-8')
         r.app_iter.close()
 
     def test_without_content_type(self):
-        path = self._getPath()
-        r = self._makeOne(path)
-        self.assertEqual(r.content_type, 'text/plain')
-        r.app_iter.close()
+        for suffix, content_type in (
+            ('txt', 'text/plain; charset=UTF-8'),
+            ('xml', 'application/xml; charset=UTF-8'),
+            ('pdf', 'application/pdf')
+        ):
+            path = self._getPath(suffix)
+            r = self._makeOne(path)
+            self.assertEqual(r.content_type, content_type.split(';')[0])
+            self.assertEqual(r.headers['content-type'], content_type)
+            r.app_iter.close()
 
 class TestFileIter(unittest.TestCase):
     def _makeOne(self, file, block_size):
-- 
cgit v1.2.3


From c8a58abb1ed5705defb7d7464e4f0d086fe13a21 Mon Sep 17 00:00:00 2001
From: Dobes Vandermeer <dvandermeer@roovy.com>
Date: Thu, 6 Mar 2014 21:29:52 -0800
Subject: Expand tests - make sure pdf, jpeg types also are not annotated with
 a charset.

---
 pyramid/tests/fixtures/minimal.jpg | Bin 0 -> 631 bytes
 pyramid/tests/test_response.py     |  16 +++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 pyramid/tests/fixtures/minimal.jpg

diff --git a/pyramid/tests/fixtures/minimal.jpg b/pyramid/tests/fixtures/minimal.jpg
new file mode 100644
index 000000000..1cda9a53d
Binary files /dev/null and b/pyramid/tests/fixtures/minimal.jpg differ
diff --git a/pyramid/tests/test_response.py b/pyramid/tests/test_response.py
index afd354d97..8061ecac5 100644
--- a/pyramid/tests/test_response.py
+++ b/pyramid/tests/test_response.py
@@ -27,17 +27,27 @@ class TestFileResponse(unittest.TestCase):
         here = os.path.dirname(__file__)
         return os.path.join(here, 'fixtures', 'minimal.%s'%(suffix,))
 
-    def test_with_content_type(self):
-        path = self._getPath()
+    def test_with_image_content_type(self):
+        path = self._getPath('jpg')
         r = self._makeOne(path, content_type='image/jpeg')
         self.assertEqual(r.content_type, 'image/jpeg')
-        self.assertEqual(r.headers.get('content-type'), 'image/jpeg')
+        self.assertEqual(r.headers['content-type'], 'image/jpeg')
         path = self._getPath()
+
+    def test_with_xml_content_type(self):
+        path = self._getPath('xml')
         r = self._makeOne(path, content_type='application/xml')
         self.assertEqual(r.content_type, 'application/xml')
         self.assertEqual(r.headers['content-type'], 'application/xml; charset=UTF-8')
         r.app_iter.close()
 
+    def test_with_pdf_content_type(self):
+        path = self._getPath('xml')
+        r = self._makeOne(path, content_type='application/pdf')
+        self.assertEqual(r.content_type, 'application/pdf')
+        self.assertEqual(r.headers['content-type'], 'application/pdf')
+        r.app_iter.close()
+
     def test_without_content_type(self):
         for suffix, content_type in (
             ('txt', 'text/plain; charset=UTF-8'),
-- 
cgit v1.2.3


From 745edec7be7c4c4be56cbdf01ffe3543cb3348e2 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Fri, 16 May 2014 21:34:02 -0500
Subject: close resources and 80-char line width

---
 pyramid/response.py            | 3 ++-
 pyramid/tests/test_response.py | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pyramid/response.py b/pyramid/response.py
index 6b5f0a561..adc903b44 100644
--- a/pyramid/response.py
+++ b/pyramid/response.py
@@ -53,7 +53,8 @@ class FileResponse(Response):
     def __init__(self, path, request=None, cache_max_age=None,
                  content_type=None, content_encoding=None):
         if content_type is None:
-            content_type, content_encoding = mimetypes.guess_type(path, strict=False)
+            content_type, content_encoding = (
+                mimetypes.guess_type(path, strict=False))
             if content_type is None:
                 content_type = 'application/octet-stream'
         super(FileResponse, self).__init__(
diff --git a/pyramid/tests/test_response.py b/pyramid/tests/test_response.py
index 8061ecac5..8731fa764 100644
--- a/pyramid/tests/test_response.py
+++ b/pyramid/tests/test_response.py
@@ -25,7 +25,7 @@ class TestFileResponse(unittest.TestCase):
 
     def _getPath(self, suffix='txt'):
         here = os.path.dirname(__file__)
-        return os.path.join(here, 'fixtures', 'minimal.%s'%(suffix,))
+        return os.path.join(here, 'fixtures', 'minimal.%s' % (suffix,))
 
     def test_with_image_content_type(self):
         path = self._getPath('jpg')
@@ -33,12 +33,14 @@ class TestFileResponse(unittest.TestCase):
         self.assertEqual(r.content_type, 'image/jpeg')
         self.assertEqual(r.headers['content-type'], 'image/jpeg')
         path = self._getPath()
+        r.app_iter.close()
 
     def test_with_xml_content_type(self):
         path = self._getPath('xml')
         r = self._makeOne(path, content_type='application/xml')
         self.assertEqual(r.content_type, 'application/xml')
-        self.assertEqual(r.headers['content-type'], 'application/xml; charset=UTF-8')
+        self.assertEqual(r.headers['content-type'],
+                         'application/xml; charset=UTF-8')
         r.app_iter.close()
 
     def test_with_pdf_content_type(self):
-- 
cgit v1.2.3


From dc9c386fb762defd97313cb6261fcd95f7321e71 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Fri, 16 May 2014 21:54:40 -0500
Subject: update changelog

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 0c461e550..e60c6efac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,9 @@ Bug Fixes
   using the returned ``Configurator`` during testing. There is now a
   ``package`` argument that can override this behavior as well.
 
+- Fix an issue where a ``pyramid.response.FileResponse`` may apply a charset
+  where it does not belong. See https://github.com/Pylons/pyramid/pull/1251
+
 Docs
 ----
 
-- 
cgit v1.2.3


From d194f3df5b5941251a36e0e7d535eaf0d633dd1b Mon Sep 17 00:00:00 2001
From: flibustenet <flibustenet@users.noreply.github.com>
Date: Sun, 18 May 2014 11:26:48 +0200
Subject: Draw attention that tweens instances are unique and shared between
 threads

Forgetting that tween instance are not instantiated for each request leads to threads issues difficult to detect
---
 docs/narr/hooks.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index 94be31bbc..91392ce7a 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -1017,7 +1017,8 @@ You can write the tween factory as a simple closure-returning function:
         return simple_tween
 
 Alternatively, the tween factory can be a class with the ``__call__`` magic
-method:
+method (the instance will be unique, be aware that it will be shared 
+between threads):
 
 .. code-block:: python
     :linenos:
-- 
cgit v1.2.3


From bf669af7f10ec81280fd8dbee43e414fa75457c5 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Wed, 21 May 2014 11:03:13 -0500
Subject: clarify tween thread-safety

---
 docs/narr/hooks.rst | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index 91392ce7a..fe7749cac 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -985,7 +985,7 @@ Creating a Tween
 
 To create a tween, you must write a "tween factory".  A tween factory
 must be a globally importable callable which accepts two arguments:
-``handler`` and ``registry``.  ``handler`` will be the either the main
+``handler`` and ``registry``.  ``handler`` will be either the main
 Pyramid request handling function or another tween.  ``registry`` will be the
 Pyramid :term:`application registry` represented by this Configurator.  A
 tween factory must return the tween (a callable object) when it is called.
@@ -995,6 +995,11 @@ A tween is called with a single argument, ``request``, which is the
 A tween should return a :term:`response`, usually the one generated by the
 downstream Pyramid application.
 
+The tween factory will be shared between requests and is used to create one
+tween per-request. Shared mutable state on the factory itself needs to be
+carefully handled, and should be avoided unless you are willing to handle
+the race conditions that may arise.
+
 You can write the tween factory as a simple closure-returning function:
 
 .. code-block:: python
@@ -1017,8 +1022,7 @@ You can write the tween factory as a simple closure-returning function:
         return simple_tween
 
 Alternatively, the tween factory can be a class with the ``__call__`` magic
-method (the instance will be unique, be aware that it will be shared 
-between threads):
+method:
 
 .. code-block:: python
     :linenos:
-- 
cgit v1.2.3


From 2c096b0a8b7a83f5ded54a3fd6c048cd5f01b9a4 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Wed, 21 May 2014 12:20:56 -0500
Subject: oops, re-clarify that tweens should not have mutable state

---
 docs/narr/hooks.rst | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index fe7749cac..4da36e730 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -995,11 +995,6 @@ A tween is called with a single argument, ``request``, which is the
 A tween should return a :term:`response`, usually the one generated by the
 downstream Pyramid application.
 
-The tween factory will be shared between requests and is used to create one
-tween per-request. Shared mutable state on the factory itself needs to be
-carefully handled, and should be avoided unless you are willing to handle
-the race conditions that may arise.
-
 You can write the tween factory as a simple closure-returning function:
 
 .. code-block:: python
@@ -1045,6 +1040,10 @@ method:
 
             return response
 
+You should avoid mutating any state on the tween instance. The tween is
+invoked once per request and any shared mutable state needs to be carefully
+handled to avoid any race conditions.
+
 The closure style performs slightly better and enables you to conditionally
 omit the tween from the request processing pipeline (see the following timing
 tween example), whereas the class style makes it easier to have shared mutable
-- 
cgit v1.2.3


From c740e8bd20c049cbab43ce0a1cd5a4533fe6b849 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 22 May 2014 10:41:02 -0500
Subject: fix project url

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

diff --git a/setup.py b/setup.py
index 54ced84e3..c832d3fc8 100644
--- a/setup.py
+++ b/setup.py
@@ -91,7 +91,7 @@ setup(name='pyramid',
       keywords='web wsgi pylons pyramid',
       author="Chris McDonough, Agendaless Consulting",
       author_email="pylons-discuss@googlegroups.com",
-      url="http://pylonsproject.org",
+      url="http://docs.pylonsproject.org/en/latest/docs/pyramid.html",
       license="BSD-derived (http://www.repoze.org/LICENSE.txt)",
       packages=find_packages(),
       include_package_data=True,
-- 
cgit v1.2.3