diff options
| author | Michael Merickel <michael@merickel.org> | 2015-02-06 01:12:24 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2015-02-06 01:12:24 -0600 |
| commit | b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f (patch) | |
| tree | 695d4b5e5ae974d0770acfbe9b8231ea1c71288a /docs/narr/hybrid.rst | |
| parent | d35a916095943b020f30acb90e878abe9bfd4fb1 (diff) | |
| parent | 4b13e0dfcdf47b3ef9befd529c0d78af8a2712d5 (diff) | |
| download | pyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.tar.gz pyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.tar.bz2 pyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.zip | |
Merge branch 'master' into feature.re-entrant-config
Diffstat (limited to 'docs/narr/hybrid.rst')
| -rw-r--r-- | docs/narr/hybrid.rst | 2 |
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) |