summaryrefslogtreecommitdiff
path: root/docs/copyright.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-15 19:18:26 -0500
committerChris McDonough <chrism@plope.com>2011-01-15 19:18:26 -0500
commitfe847fad6768c9a7f2cb1b61d88164a370f6b2db (patch)
tree77f92e85d6c886b56e240dc9ea69879d2c25bbe6 /docs/copyright.rst
parent2c4cd00d071d53efc560fb38f63d7db4a162e13b (diff)
downloadpyramid-fe847fad6768c9a7f2cb1b61d88164a370f6b2db.tar.gz
pyramid-fe847fad6768c9a7f2cb1b61d88164a370f6b2db.tar.bz2
pyramid-fe847fad6768c9a7f2cb1b61d88164a370f6b2db.zip
credit john shipman appropriately
Diffstat (limited to 'docs/copyright.rst')
-rw-r--r--docs/copyright.rst10
1 files changed, 7 insertions, 3 deletions
diff --git a/docs/copyright.rst b/docs/copyright.rst
index aa4efc6cb..c8fc01609 100644
--- a/docs/copyright.rst
+++ b/docs/copyright.rst
@@ -54,20 +54,24 @@ Editor:
Contributors:
Ben Bangert, Blaise Laflamme, Rob Miller, Mike Orr, Carlos de la Guardia,
- Paul Everitt, Tres Seaver, Marius Gedminas, Chris Rossi, Joachim Krebs,
- Xavier Spriet, Reed O'Brien, William Chambers, Charlie Choiniere, Jamaludin
- Ahmad.
+ Paul Everitt, Tres Seaver, John Shipman, Marius Gedminas, Chris Rossi,
+ Joachim Krebs, Xavier Spriet, Reed O'Brien, William Chambers, Charlie
+ Choiniere, Jamaludin Ahmad.
.. Cover Designer:
.. Nat Hardwick of `Electrosoup <http://www.electrosoup.co.uk>`_.
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.
+ The :ref:`wiki2_flow_of_authentication` section was contributed by John
+ Shipman.
+
.. Print Production
.. ----------------