summaryrefslogtreecommitdiff
path: root/docs/narr/upgrading.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-10-08 12:41:36 +0200
committerChris McDonough <chrism@plope.com>2013-10-08 12:41:36 +0200
commit39417d93441c5a46896fb765599e25bd1c1aa6db (patch)
treec5d3e77b3121addcf4062a78490d503b1aa10d14 /docs/narr/upgrading.rst
parent9951556030aeed07978472f59b7843273bcb84a8 (diff)
parent6a3eed4ddc4178d19c0002ec72b9a1d6494e01ae (diff)
downloadpyramid-39417d93441c5a46896fb765599e25bd1c1aa6db.tar.gz
pyramid-39417d93441c5a46896fb765599e25bd1c1aa6db.tar.bz2
pyramid-39417d93441c5a46896fb765599e25bd1c1aa6db.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/upgrading.rst')
-rw-r--r--docs/narr/upgrading.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/upgrading.rst b/docs/narr/upgrading.rst
index ca6dc565b..64343ca3e 100644
--- a/docs/narr/upgrading.rst
+++ b/docs/narr/upgrading.rst
@@ -150,7 +150,7 @@ do things the newer way:
.. code-block:: python
:linenos:
- from pyramid.view. import view_config
+ from pyramid.view import view_config
from pyramid.static import static_view
myview = static_view('static', 'static', use_subpath=True)