summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/copyright.rst10
-rw-r--r--docs/narr/muchadoabouttraversal.rst5
2 files changed, 13 insertions, 2 deletions
diff --git a/docs/copyright.rst b/docs/copyright.rst
index 691080ba7..f5f12ad03 100644
--- a/docs/copyright.rst
+++ b/docs/copyright.rst
@@ -48,9 +48,15 @@ with respect to the use of the information contained herein.
Attributions
------------
+Editor:
+ Casey Duncan
+
Contributors:
- Ben Bangert, Blaise Laflamme, Carlos de la Guardia, Paul Everitt,
- Marius Gedminas, Casey Duncan
+
+ 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.
.. Cover Designer:
.. Nat Hardwick of `Electrosoup <http://www.electrosoup.co.uk>`_.
diff --git a/docs/narr/muchadoabouttraversal.rst b/docs/narr/muchadoabouttraversal.rst
index 9bd829754..cb1c6f73a 100644
--- a/docs/narr/muchadoabouttraversal.rst
+++ b/docs/narr/muchadoabouttraversal.rst
@@ -4,6 +4,11 @@
Much Ado About Traversal
========================
+.. note:: This chapter was adapted, with permission, from a blog post by `Rob
+ Miller <http://blog.nonsequitarian.org/>`_, originally published at
+ `http://blog.nonsequitarian.org/2010/much-ado-about-traversal/
+ <http://blog.nonsequitarian.org/2010/much-ado-about-traversal/>`_.
+
A lot of folks who have been using Pylons (and, therefore, Routes-based
URL matching) are being exposed for the first time, via :app:`Pyramid`,
to new ideas such as ":term:`traversal`" and ":term:`view lookup`" as a