summaryrefslogtreecommitdiff
path: root/docs/narr/hybrid.rst
diff options
context:
space:
mode:
authorJohn Anderson <sontek@gmail.com>2015-02-07 10:48:10 -0800
committerJohn Anderson <sontek@gmail.com>2015-02-07 10:48:10 -0800
commit50921e94c539318cb9e1789a2f9363352a820542 (patch)
tree77430b23c95c50f79fb47e258528cec102de3e66 /docs/narr/hybrid.rst
parente094ab229eed6f8bf9e7a6a4d4406faefece41e4 (diff)
parentb17fa8b19da6e8272515588abbd2299f03bc2942 (diff)
downloadpyramid-50921e94c539318cb9e1789a2f9363352a820542.tar.gz
pyramid-50921e94c539318cb9e1789a2f9363352a820542.tar.bz2
pyramid-50921e94c539318cb9e1789a2f9363352a820542.zip
Merge branch 'master' of https://github.com/Pylons/pyramid into catch_bad_request_method_name
Diffstat (limited to 'docs/narr/hybrid.rst')
-rw-r--r--docs/narr/hybrid.rst2
1 files changed, 1 insertions, 1 deletions
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)