summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-11-04 13:16:52 -0400
committerChris McDonough <chrism@plope.com>2010-11-04 13:16:52 -0400
commit093628449ad6d1a14c93a9e6c5a05fdfec2f4816 (patch)
tree8d2f054f88092d80d568cc83587b56806d4c17d4
parent5df6be0896a7a149ac692a3a9cdf30115da848b6 (diff)
downloadpyramid-093628449ad6d1a14c93a9e6c5a05fdfec2f4816.tar.gz
pyramid-093628449ad6d1a14c93a9e6c5a05fdfec2f4816.tar.bz2
pyramid-093628449ad6d1a14c93a9e6c5a05fdfec2f4816.zip
comment out inappropriate sections, add contributors
-rw-r--r--docs/conventions.rst4
-rw-r--r--docs/copyright.rst29
-rw-r--r--docs/narr/introduction.rst5
3 files changed, 19 insertions, 19 deletions
diff --git a/docs/conventions.rst b/docs/conventions.rst
index aaa4e8d09..a764a372a 100644
--- a/docs/conventions.rst
+++ b/docs/conventions.rst
@@ -31,11 +31,11 @@ variables using the following style:
References to glossary terms are presented using the following style:
- :term:`Repoze`
+ :term:`Pylons`
URLs are presented using the following style:
- `Repoze <http://repoze.org>`_
+ `Pylons <http://pylonshq.com>`_
References to sections and chapters are presented using the following
style:
diff --git a/docs/copyright.rst b/docs/copyright.rst
index ac01c8d53..30aeac978 100644
--- a/docs/copyright.rst
+++ b/docs/copyright.rst
@@ -9,11 +9,11 @@ by Chris McDonough
Copyright |copy| 2008-2010, Agendaless Consulting.
-ISBN-10: 0615345379
+.. ISBN-10: 0615345379
-ISBN-13: 978-0-615-34537-6
+.. ISBN-13: 978-0-615-34537-6
-First print publishing: February, 2010
+.. First print publishing: February, 2010
All rights reserved. This material may be copied or distributed only
subject to the terms and conditions set forth in the `Creative Commons
@@ -48,25 +48,22 @@ with respect to the use of the information contained herein.
Attributions
------------
-Foreword:
- Paul Everitt
+Contributors:
+ Ben Bangert, Blaise Laflamme, Carlos de la Guardia, Paul Everitt
-Technical Reviewer:
- Andrew Sawyers
-
-Cover Designer:
- Nat Hardwick of `Electrosoup <http://www.electrosoup.co.uk>`_.
+.. 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.
-Print Production
-----------------
+.. 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
------------------------
@@ -81,7 +78,7 @@ HTML Version and Source Code
----------------------------
An HTML version of this book is freely available via
-http://pylonshq.com/pyramid.
+http://docs.pylonshq.com
The source code for the examples used in this book are available
within the :mod:`pyramid` software distribution, always available
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index c7455dd2e..f8dcdbf62 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -95,7 +95,7 @@ Openness
<http://repoze.org/license.html>`_.
.. index::
- single: Repoze
+ single: Pylons
single: Agendaless Consulting
single: repoze namespace package
@@ -107,6 +107,9 @@ under the :term:`Pylons` "brand". :term:`Pylons` software is written
by a loose-knit community of contributors. The `Pylons website
<http://pylonshq.com>`_ describes the Pylons brand in more detail.
+See `http://docs.pylonshq.com <http://docs.pylonshq.com>`_ for an overview of
+the Pyramid project and how it relates to Pylons.
+
.. index::
single: pyramid and other frameworks
single: Zope