diff options
| author | Alexandre Bourget <alexandre.bourget@savoirfairelinux.com> | 2011-03-24 12:07:09 -0400 |
|---|---|---|
| committer | Alexandre Bourget <alexandre.bourget@savoirfairelinux.com> | 2011-03-24 12:07:09 -0400 |
| commit | 95e799d074de2e81914d513b4c331df1e738c00e (patch) | |
| tree | b3039037533610d8c86d82bb28f139d8a3777013 /docs/authorintro.rst | |
| parent | 22d3253a26767501827d86b56db3a9b79bef6c4e (diff) | |
| parent | b596e1812627c359908759d7a8d83c339f08e385 (diff) | |
| download | pyramid-95e799d074de2e81914d513b4c331df1e738c00e.tar.gz pyramid-95e799d074de2e81914d513b4c331df1e738c00e.tar.bz2 pyramid-95e799d074de2e81914d513b4c331df1e738c00e.zip | |
Merge remote branch 'source/master'
Conflicts:
docs/narr/hooks.rst
Diffstat (limited to 'docs/authorintro.rst')
| -rw-r--r-- | docs/authorintro.rst | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/docs/authorintro.rst b/docs/authorintro.rst index f5ac402b0..38152fb99 100644 --- a/docs/authorintro.rst +++ b/docs/authorintro.rst @@ -54,7 +54,7 @@ technologies. Book Content ============ -This book is divided into four major parts: +This book is divided into three major parts: :ref:`narrative_documentation` @@ -79,12 +79,6 @@ This book is divided into four major parts: :app:`Pyramid`. The API documentation is organized alphabetically by module name. -:ref:`zcml_reference` - - Comprehensive reference material for every :term:`ZCML directive` - provided by :app:`Pyramid`. The ZCML directive documentation is - organized alphabetically by directive name. - .. index:: single: repoze.zope2 single: Zope 3 @@ -163,6 +157,13 @@ others' technology. single: Holth, Daniel single: Hathaway, Shane single: Akkerman, Wichert + single: Laflamme, Blaise + single: Laflamme, Hugues + single: Bangert, Ben + single: Duncan, Casey + single: Orr, Mike + single: Shipman, John + single: Beelby, Chris Thanks ====== @@ -173,11 +174,11 @@ typewriter (a Royal), and my mother, who bought me my first computer Thanks to the following people for providing expertise, resources, and software. Without the help of these folks, neither this book nor the -software which it details would exist: Paul Everitt, Tres Seaver, -Andrew Sawyers, Malthe Borch, Carlos de la Guardia, Chris Rossi, Shane -Hathaway, Daniel Holth, Wichert Akkerman, Georg Brandl, Simon Oram and -Nat Hardwick of Electrosoup, Ian Bicking of the Open Planning Project, -Jim Fulton of Zope Corporation, Tom Moroz of the Open Society +software which it details would exist: Paul Everitt, Tres Seaver, Andrew +Sawyers, Malthe Borch, Carlos de la Guardia, Chris Rossi, Shane Hathaway, +Daniel Holth, Wichert Akkerman, Georg Brandl, Blaise Laflamme, Ben Bangert, +Casey Duncan, Hugues Laflamme, Mike Orr, John Shipman, Chris Beelby, Simon +Oram, Nat Hardwick, Ian Bicking, Jim Fulton, Tom Moroz of the Open Society Institute, and Todd Koym of Environmental Health Sciences. Thanks to Guido van Rossum and Tim Peters for Python. |