From 0c05adf5759e660e04d0aced68c388a37f69c6a1 Mon Sep 17 00:00:00 2001 From: Daniel Kimsey Date: Fri, 20 Jan 2012 09:37:22 -0500 Subject: Changing mytemplate.pt to a .pt_tmpl for starter --- .../starter/+package+/templates/mytemplate.pt | 76 ---------------------- .../starter/+package+/templates/mytemplate.pt_tmpl | 76 ++++++++++++++++++++++ 2 files changed, 76 insertions(+), 76 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 0bfac946e..000000000 --- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt +++ /dev/null @@ -1,76 +0,0 @@ - - - - The Pyramid Web Application Development Framework - - - - - - - - - - -
-
-
-
pyramid
-
-
-
-
-

- Welcome to ${project}, an application generated by
- the Pyramid web application development framework. -

-
-
-
-
-
-

Search documentation

-
- - -
-
- -
-
-
- - - 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..0bfac946e --- /dev/null +++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl @@ -0,0 +1,76 @@ + + + + The Pyramid Web Application Development Framework + + + + + + + + + + +
+
+
+
pyramid
+
+
+
+
+

+ Welcome to ${project}, an application generated by
+ the Pyramid web application development framework. +

+
+
+
+
+
+

Search documentation

+
+ + +
+
+ +
+
+
+ + + -- cgit v1.2.3 From 015dbc082ce60ba6d465f39e52eb9eb0adee1214 Mon Sep 17 00:00:00 2001 From: Daniel Kimsey Date: Fri, 20 Jan 2012 09:38:00 -0500 Subject: Hard-coded /static references now use request.static_url --- pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl index 0bfac946e..8d85ed991 100644 --- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl @@ -5,19 +5,19 @@ - - + +
-
pyramid
+
pyramid
-- cgit v1.2.3 From 3c1affd62c7674e3cacd494f02db3ea91975149e Mon Sep 17 00:00:00 2001 From: davidjb Date: Wed, 25 Jan 2012 11:43:01 +1000 Subject: Minor change - remove duplicated word --- docs/narr/views.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/narr/views.rst b/docs/narr/views.rst index a3fd61098..fa34cca61 100644 --- a/docs/narr/views.rst +++ b/docs/narr/views.rst @@ -233,7 +233,7 @@ provided within :mod:`pyramid.httpexceptions`. How Pyramid Uses HTTP Exceptions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -HTTP exceptions are meant to be used directly by application application +HTTP exceptions are meant to be used directly by application developers. However, Pyramid itself will raise two HTTP exceptions at various points during normal operations: :exc:`pyramid.httpexceptions.HTTPNotFound` and -- cgit v1.2.3 From 7eefb69a6b2dd8a4a68430f60bbd1ef34c1a98d3 Mon Sep 17 00:00:00 2001 From: davidjb Date: Wed, 25 Jan 2012 11:48:31 +1000 Subject: Minor fix - change attribute to be prevent_auto rather than preserve_auto --- docs/narr/viewconfig.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst index 03000629c..d1188eaec 100644 --- a/docs/narr/viewconfig.rst +++ b/docs/narr/viewconfig.rst @@ -926,7 +926,7 @@ there's a ``should_cache`` GET or POST variable: return response Note that the ``http_cache`` machinery will overwrite or add to caching -headers you set within the view itself unless you use ``preserve_auto``. +headers you set within the view itself unless you use ``prevent_auto``. You can also turn of the effect of ``http_cache`` entirely for the duration of a Pyramid application lifetime. To do so, set the -- cgit v1.2.3