diff options
| author | Chris McDonough <chrism@plope.com> | 2011-09-07 06:26:28 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-09-07 06:26:28 -0400 |
| commit | d8fc16f447c1a9ac91a24bb41f56a534706dfe41 (patch) | |
| tree | 9a0fe6185e5d96539c423ed0b0d81892045cbe1b /docs | |
| parent | 68a01e26af1a0a1ab448d4dad517001186d134b2 (diff) | |
| download | pyramid-d8fc16f447c1a9ac91a24bb41f56a534706dfe41.tar.gz pyramid-d8fc16f447c1a9ac91a24bb41f56a534706dfe41.tar.bz2 pyramid-d8fc16f447c1a9ac91a24bb41f56a534706dfe41.zip | |
garden
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/narr/introduction.rst | 2 | ||||
| -rw-r--r-- | docs/whatsnew-1.2.rst | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst index 5524f698d..9c6f85680 100644 --- a/docs/narr/introduction.rst +++ b/docs/narr/introduction.rst @@ -65,6 +65,8 @@ Openness As with Python, the Pyramid software is distributed under a `permissive open source license <http://repoze.org/license.html>`_. +.. _what_makes_pyramid_unique: + What Makes Pyramid Unique ------------------------- diff --git a/docs/whatsnew-1.2.rst b/docs/whatsnew-1.2.rst index 8a64e2756..38284a7aa 100644 --- a/docs/whatsnew-1.2.rst +++ b/docs/whatsnew-1.2.rst @@ -284,6 +284,10 @@ Documentation Enhancements - The ZODB wiki tutorial now uses the ``pyramid_zodbconn`` package rather than the ``repoze.zodbconn`` package to provide ZODB integration. +- Added :ref:`what_makes_pyramid_unique` to the Introduction narrative + chapter. + + Dependency Changes ------------------ |