summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/whatsnew-1.2.rst2
-rw-r--r--pyramid/mako_templating.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/whatsnew-1.2.rst b/docs/whatsnew-1.2.rst
index 8bc133bfa..49854a7e7 100644
--- a/docs/whatsnew-1.2.rst
+++ b/docs/whatsnew-1.2.rst
@@ -139,7 +139,7 @@ Minor Feature Additions
- The :meth:`pyramid.request.Request.static_url` API (and its brethren
:meth:`pyramid.request.Request.static_path`,
:func:`pyramid.url.static_url`, and :func:`pyramid.url.static_path`) now
- accept an asbolute filename as a "path" argument. This will generate a URL
+ accept an absolute filename as a "path" argument. This will generate a URL
to an asset as long as the filename is in a directory which was previously
registered as a static view. Previously, trying to generate a URL to an
asset using an absolute file path would raise a ValueError.
diff --git a/pyramid/mako_templating.py b/pyramid/mako_templating.py
index 5fde4e346..c79de7217 100644
--- a/pyramid/mako_templating.py
+++ b/pyramid/mako_templating.py
@@ -50,7 +50,7 @@ class PkgResourceTemplateLookup(TemplateLookup):
if os.path.isfile(srcfile):
return self._load(srcfile, uri)
raise exceptions.TopLevelLookupException(
- "Cant locate template for uri %r" % uri)
+ "Can not locate template for uri %r" % uri)
return TemplateLookup.get_template(self, uri)