summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavlo Kapyshin <i@93z.org>2015-01-07 14:42:27 +0200
committerPavlo Kapyshin <i@93z.org>2015-01-07 14:42:27 +0200
commitef2a4abb2850af8d21995f04e9f30e6a8949ff9d (patch)
treeb9c4ade5704fd9fd6470089680493222e0759915
parent2d659e41d01926acaa8670c4d20be20300bcedb7 (diff)
downloadpyramid-ef2a4abb2850af8d21995f04e9f30e6a8949ff9d.tar.gz
pyramid-ef2a4abb2850af8d21995f04e9f30e6a8949ff9d.tar.bz2
pyramid-ef2a4abb2850af8d21995f04e9f30e6a8949ff9d.zip
Fix "pyramid" spelling
-rw-r--r--HISTORY.txt2
-rw-r--r--docs/narr/hybrid.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/HISTORY.txt b/HISTORY.txt
index 6aad221a8..242568e98 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -1327,7 +1327,7 @@ Bug Fixes
- Make test suite pass on 32-bit systems; closes #286. closes #306.
See also https://github.com/Pylons/pyramid/issues/286
-- The ``pryamid.view.view_config`` decorator did not accept a ``match_params``
+- The ``pyramid.view.view_config`` decorator did not accept a ``match_params``
predicate argument. See https://github.com/Pylons/pyramid/pull/308
- The AuthTktCookieHelper could potentially generate Unicode headers
diff --git a/docs/narr/hybrid.rst b/docs/narr/hybrid.rst
index 4a3258d35..1c324d22b 100644
--- a/docs/narr/hybrid.rst
+++ b/docs/narr/hybrid.rst
@@ -453,7 +453,7 @@ commonly in route declarations that look like this:
.. code-block:: python
:linenos:
- from pryamid.static import static_view
+ from pyramid.static import static_view
www = static_view('mypackage:static', use_subpath=True)