summaryrefslogtreecommitdiff
path: root/docs/narr/upgrading.rst
diff options
context:
space:
mode:
authorKarl O. Pinc <kop@meme.com>2013-10-07 22:08:16 -0500
committerKarl O. Pinc <kop@meme.com>2013-10-07 22:08:16 -0500
commita274ed67afab341fe54c0a57328e0e810a7c90dc (patch)
treefeeb80189b077285909926e48daa15aa9f251f71 /docs/narr/upgrading.rst
parent6461f60320106b5114bb7f226959c7d7f2995ec2 (diff)
parentcba6a8d33f674a1f873851a80358972184544d71 (diff)
downloadpyramid-a274ed67afab341fe54c0a57328e0e810a7c90dc.tar.gz
pyramid-a274ed67afab341fe54c0a57328e0e810a7c90dc.tar.bz2
pyramid-a274ed67afab341fe54c0a57328e0e810a7c90dc.zip
Merge branch 'master' into doc_interactive_dev
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)