diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-28 21:02:36 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-28 21:02:36 -0500 |
| commit | fcfc5aebc259fa34d8d2313adde7c2f57bab2e53 (patch) | |
| tree | c52e454f30ca7453da814e57635accc302d61b2b /docs/tutorials/wiki/installation.rst | |
| parent | e8f26928bf5c8fb8490a72436718cedf8fe19281 (diff) | |
| parent | 02c43fe07f1ffe0cc27e539618ed8d96014cddee (diff) | |
| download | pyramid-fcfc5aebc259fa34d8d2313adde7c2f57bab2e53.tar.gz pyramid-fcfc5aebc259fa34d8d2313adde7c2f57bab2e53.tar.bz2 pyramid-fcfc5aebc259fa34d8d2313adde7c2f57bab2e53.zip | |
Merge branch 'master' into viewderiver
Diffstat (limited to 'docs/tutorials/wiki/installation.rst')
| -rw-r--r-- | docs/tutorials/wiki/installation.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst index cb05611b7..82265170d 100644 --- a/docs/tutorials/wiki/installation.rst +++ b/docs/tutorials/wiki/installation.rst @@ -251,7 +251,8 @@ assumptions: - you are willing to use :term:`traversal` to map URLs to code. -- you want to use :term:`ZCML` to perform configuration. +- you want to use imperative code plus a :term:`scan` to perform + configuration. .. note:: |