diff options
| author | Chris McDonough <chrism@plope.com> | 2011-01-03 01:16:44 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-01-03 01:16:44 -0500 |
| commit | 45461e9e7d1d7f06669a57f421aa569a8dc86e31 (patch) | |
| tree | de54a89e1ce5ff6c2742e40e2808b1d1057d4fec /docs/copyright.rst | |
| parent | f8b6d2982292fe323008ad5af394786015206922 (diff) | |
| parent | 419b2260ad97cbc9816b2fe075ef3d9acdb79581 (diff) | |
| download | pyramid-45461e9e7d1d7f06669a57f421aa569a8dc86e31.tar.gz pyramid-45461e9e7d1d7f06669a57f421aa569a8dc86e31.tar.bz2 pyramid-45461e9e7d1d7f06669a57f421aa569a8dc86e31.zip | |
Merge git://github.com/caseman/pyramid into caseman-master
Diffstat (limited to 'docs/copyright.rst')
| -rw-r--r-- | docs/copyright.rst | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/copyright.rst b/docs/copyright.rst index fa564a785..691080ba7 100644 --- a/docs/copyright.rst +++ b/docs/copyright.rst @@ -50,7 +50,7 @@ Attributions Contributors: Ben Bangert, Blaise Laflamme, Carlos de la Guardia, Paul Everitt, - Marius Gedminas + Marius Gedminas, Casey Duncan .. Cover Designer: .. Nat Hardwick of `Electrosoup <http://www.electrosoup.co.uk>`_. @@ -59,6 +59,9 @@ Used with permission: The :ref:`webob_chapter` chapter is adapted, with permission, from documentation originally written by Ian Bicking. + The :ref:`much_ado_about_traversal_chapter` chapter is adapted, + with permission, from an article written by Rob Miller. + .. Print Production .. ---------------- |