summaryrefslogtreecommitdiff
path: root/docs/copyright.rst
diff options
context:
space:
mode:
authorAlexandre Bourget <alexandre.bourget@savoirfairelinux.com>2011-03-24 12:07:09 -0400
committerAlexandre Bourget <alexandre.bourget@savoirfairelinux.com>2011-03-24 12:07:09 -0400
commit95e799d074de2e81914d513b4c331df1e738c00e (patch)
treeb3039037533610d8c86d82bb28f139d8a3777013 /docs/copyright.rst
parent22d3253a26767501827d86b56db3a9b79bef6c4e (diff)
parentb596e1812627c359908759d7a8d83c339f08e385 (diff)
downloadpyramid-95e799d074de2e81914d513b4c331df1e738c00e.tar.gz
pyramid-95e799d074de2e81914d513b4c331df1e738c00e.tar.bz2
pyramid-95e799d074de2e81914d513b4c331df1e738c00e.zip
Merge remote branch 'source/master'
Conflicts: docs/narr/hooks.rst
Diffstat (limited to 'docs/copyright.rst')
-rw-r--r--docs/copyright.rst37
1 files changed, 23 insertions, 14 deletions
diff --git a/docs/copyright.rst b/docs/copyright.rst
index fa564a785..64f84879a 100644
--- a/docs/copyright.rst
+++ b/docs/copyright.rst
@@ -7,13 +7,13 @@ by Chris McDonough
.. |copy| unicode:: U+000A9 .. COPYRIGHT SIGN
-Copyright |copy| 2008-2010, Agendaless Consulting.
+Copyright |copy| 2008-2011, Agendaless Consulting.
-.. ISBN-10: 0615345379
+ISBN-10: 0615445675
-.. ISBN-13: 978-0-615-34537-6
+ISBN-13: 978-0615445670
-.. First print publishing: February, 2010
+First print publishing: February, 2011
All rights reserved. This material may be copied or distributed only
subject to the terms and conditions set forth in the `Creative Commons
@@ -48,23 +48,32 @@ 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
+ Ben Bangert, Blaise Laflamme, Rob Miller, Mike Orr, Carlos de la Guardia,
+ Paul Everitt, Tres Seaver, John Shipman, Marius Gedminas, Chris Rossi,
+ Joachim Krebs, Xavier Spriet, Reed O'Brien, William Chambers, Charlie
+ Choiniere, Jamaludin Ahmad, Graham Higgins.
-.. Cover Designer:
-.. Nat Hardwick of `Electrosoup <http://www.electrosoup.co.uk>`_.
+Cover Designer:
+ Hugues Laflamme of `Kemeneur <http://www.kemeneur.com/>`_.
Used with permission:
+
The :ref:`webob_chapter` chapter is adapted, with permission, from
documentation originally written by Ian Bicking.
-.. Print Production
-.. ----------------
+ The :ref:`much_ado_about_traversal_chapter` chapter is adapted,
+ with permission, from an article written by Rob Miller.
+
+Print Production
+----------------
-.. The print version of this book was produced using the `Sphinx
-.. <http://sphinx.pocoo.org/>`_ documentation generation system and the
-.. `LaTeX <http://www.latex-project.org/>`_ typesetting system.
+The print version of this book was produced using the `Sphinx
+<http://sphinx.pocoo.org/>`_ documentation generation system and the
+`LaTeX <http://www.latex-project.org/>`_ typesetting system.
Contacting The Publisher
------------------------
@@ -79,7 +88,7 @@ HTML Version and Source Code
----------------------------
An HTML version of this book is freely available via
-http://docs.pylonshq.com
+http://docs.pylonsproject.org
The source code for the examples used in this book are available
within the :app:`Pyramid` software distribution, always available