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

Pylons · Jan 29, 2012 · 7636382 · 7636382
2 parents 87233a6 + 29d3f0a
commit 7636382
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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

diff --git 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

diff --git a/...starter/+package+/templates/mytemplate.pt → ...er/+package+/templates/mytemplate.pt_tmpl b/...starter/+package+/templates/mytemplate.pt → ...er/+package+/templates/mytemplate.pt_tmpl
@@ -5,19 +5,19 @@
   <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="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="/static/ie6.css" type="text/css" media="screen" charset="utf-8" />
+  <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="/static/pyramid.png" width="750" height="169" alt="pyramid"/></div>
+          <div><img src="${request.static_url('{{package}}:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div>
       </div>
     </div>
     <div id="middle">