diff options
| author | Chris McDonough <chrism@plope.com> | 2013-11-18 07:03:51 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-11-18 07:03:51 -0500 |
| commit | c503891d43251e7bf6111c6c1f521b43c55d917b (patch) | |
| tree | 3028630a1d1e331718e16be26a54d69c56d76b9d /docs/narr/upgrading.rst | |
| parent | 345694c8eb6dff9ef7375374c5032e53b764c1de (diff) | |
| parent | fb15c26a2960d5f7bf598c147f1dd6ad6a062952 (diff) | |
| download | pyramid-c503891d43251e7bf6111c6c1f521b43c55d917b.tar.gz pyramid-c503891d43251e7bf6111c6c1f521b43c55d917b.tar.bz2 pyramid-c503891d43251e7bf6111c6c1f521b43c55d917b.zip | |
Merge branch 'master' into 1.5-branch
Diffstat (limited to 'docs/narr/upgrading.rst')
| -rw-r--r-- | docs/narr/upgrading.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/upgrading.rst b/docs/narr/upgrading.rst index 64343ca3e..eb3194a65 100644 --- a/docs/narr/upgrading.rst +++ b/docs/narr/upgrading.rst @@ -137,7 +137,7 @@ In the above case, it's line #3 in the ``myproj.views`` module (``from pyramid.view import static``) that is causing the problem: .. code-block:: python - :linenos: + :linenos: from pyramid.view import view_config @@ -148,7 +148,7 @@ The deprecation warning tells me how to fix it, so I can change the code to do things the newer way: .. code-block:: python - :linenos: + :linenos: from pyramid.view import view_config |