diff options
| author | Michael Merickel <michael@digitalartefacts.com> | 2013-10-19 02:04:02 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@digitalartefacts.com> | 2013-10-19 02:04:02 -0500 |
| commit | c137eccf36aed3200592da0b170bc7f3ba1313b6 (patch) | |
| tree | 3599f91b8c4863613be977ce847e5739b1f34804 /docs/narr/upgrading.rst | |
| parent | 8385569b371a2586acf1680937ca656136c2502c (diff) | |
| parent | 3acee31f86bcde8abbb4e63715afc5ca67976eaf (diff) | |
| download | pyramid-c137eccf36aed3200592da0b170bc7f3ba1313b6.tar.gz pyramid-c137eccf36aed3200592da0b170bc7f3ba1313b6.tar.bz2 pyramid-c137eccf36aed3200592da0b170bc7f3ba1313b6.zip | |
Merge branch 'master' into feature.signed-cookie-session
Diffstat (limited to 'docs/narr/upgrading.rst')
| -rw-r--r-- | docs/narr/upgrading.rst | 2 |
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) |