7 files changed, 29 insertions, 15 deletions
diff --git a/docs/TodoTutorial.txt b/docs/TodoTutorial.txt
index 59dd3d9..4d8bd23 100644
--- a/docs/TodoTutorial.txt
+++ b/docs/TodoTutorial.txt
@@ -16,8 +16,11 @@ To-Do: A Tutorial
     tested, and so must be inspected by eye after the document is
     assembled.
 
-Introduction
-============
+Introduction and Audience
+=========================
+
+This tutorial is intended for people interested in developing
+applications in Paste.
 
 This is a tutorial for building a simple to-do list application using
 `Python Paste <http://pythonpaste.org>`_, SQLObject_, and `Zope Page Templates`_.  You can view the
@@ -28,11 +31,7 @@ http://svn.w4py.org/Paste/trunk/examples/todo_sql/
 .. _SQLObject: http://sqlobject.org
 .. _Zope Page Templates: http://www.zope.org/DevHome/Wikis/DevSite/Projects/ZPT/FrontPage
 
-If you have questions about this tutorial, please contact the `paste
-mailing list <http://pythonpaste.org/mailman/listinfo/paste-users>`_
-or try IRC (``#webware`` on freenode.net).  If there's something that
-confused you and you want to give feedback, please `submit an issue
-<http://pythonpaste.org/trac/newticket?component=documentation>`_.
+.. include:: include/contact.txt
 
 Setting up the files
 ====================
diff --git a/docs/blog-tutorial.txt b/docs/blog-tutorial.txt
index bb36f86..9e5f242 100644
--- a/docs/blog-tutorial.txt
+++ b/docs/blog-tutorial.txt
@@ -3,8 +3,8 @@ Blog Tutorial
 +++++++++++++
 
 :author: Ian Bicking <ianb@colorstudy.com>
-:revision: $Rev: 2321 $
-:date: $LastChangedDate: 2005-04-09 17:55:39 -0500 (Sat, 09 Apr 2005) $
+:revision: $Rev$
+:date: $LastChangedDate$
 
 .. contents::
 
diff --git a/docs/include/contact.txt b/docs/include/contact.txt
new file mode 100644
index 0000000..9a46845
--- /dev/null
+++ b/docs/include/contact.txt
@@ -0,0 +1,5 @@
+If you have questions about this document, please contact the `paste
+mailing list <http://pythonpaste.org/mailman/listinfo/paste-users>`_
+or try IRC (``#webware`` on freenode.net).  If there's something that
+confused you and you want to give feedback, please `submit an issue
+<http://pythonpaste.org/trac/newticket?component=documentation>`_.
diff --git a/docs/rebuild b/docs/rebuild
index 26d2dae..ca98789 100755
--- a/docs/rebuild
+++ b/docs/rebuild
@@ -6,7 +6,7 @@ echo "Adding $parent to \$PYTHONPATH"
 export PYTHONPATH=$parent:$PYTHONPATH
 
 NORMAL="DeveloperGuidelines Paste servers StyleGuide web/index \
-        what-is-paste testing-applications"
+        what-is-paste testing-applications url-parsing-with-wsgi"
 DOCTEST_BUILD="blog-tutorial TodoTutorial"
 
 for NAME in $NORMAL ; do
diff --git a/docs/servers.txt b/docs/servers.txt
index 9540f02..a0a478e 100644
--- a/docs/servers.txt
+++ b/docs/servers.txt
@@ -4,7 +4,7 @@ Python Paste Servers
 
 :author: A.M. Kuchling <amk@amk.ca>
 :revision: $Rev$
-:date: $LastChangedDate: 2005-04-14 15:33:14 -0400 (Thu, 14 Apr 2005) $
+:date: $LastChangedDate$
 
 
 Introduction 
diff --git a/docs/testing-applications.txt b/docs/testing-applications.txt
index 3838efd..c583225 100644
--- a/docs/testing-applications.txt
+++ b/docs/testing-applications.txt
@@ -2,8 +2,8 @@ Testing Applications with Paste
 +++++++++++++++++++++++++++++++
 
 :author: Ian Bicking <ianb@colorstudy.com>
-:revision: $Rev: 2385 $
-:date: $LastChangedDate: 2005-04-25 20:20:16 -0500 (Mon, 25 Apr 2005) $
+:revision: $Rev$
+:date: $LastChangedDate$
 
 .. contents::
 
@@ -19,6 +19,8 @@ invited.  Feedback and discussion should take place on the
 These facilities let you test your Paste and WSGI-based applications
 easily and without a server. 
 
+.. include:: include/contact.txt
+
 The Test Environment
 ====================
 
diff --git a/docs/web/index.txt b/docs/web/index.txt
index 2b19419..2adbce3 100644
--- a/docs/web/index.txt
+++ b/docs/web/index.txt
@@ -67,8 +67,16 @@ More abstract discussion about Python web programming in general:
 Resources
 =========
 
-* `To-do tutorial`_, an introduction to Paste installation and application
-  design
+* `To-Do Tutorial`_, an introduction to Paste installation and application
+  design.
+
+* `Testing Applications with Paste <docs/testing-applications.html>`_,
+  an introduction to Paste's acceptance testing functionality.
+
+* `URL Parsing with WSGI and Paste
+  <docs/url-parsing-with-wsgi.html>`_, an introduction into the
+  architecture of Paste's URL parsing, and the ways you can bring WSGI
+  deeper into your framework.
 
 * `What is Paste? <./docs/what-is-paste.html>`_: a description of the
   project scope (see also the older documents `What is WSGIKit?