--- a/doc/index.txt	Mon Jul 29 00:27:36 2002 +0000
+++ b/doc/index.txt	Mon Jul 29 00:54:41 2002 +0000
@@ -5,15 +5,12 @@
 Contents
 ========
 
-- Features_
-- Overview_
-- Installation_
-- `Getting Started`_
+- Overview_ and Features_
+- Installation_ and `Getting Started`_ (and Upgrading_)
 - `User Guide`_
 - `Customising Roundup`_
-- `Roundup's Design Document`_
+- `Roundup's Design`_ (original_)
 - `Developing Roundup`_
-- Upgrading_
 - Contact_
 - Acknowledgements_
 - License_
@@ -25,7 +22,8 @@
 .. _`User Guide`: user_guide.html
 .. _`Customising Roundup`: customizing.html
 .. _`Developing Roundup`: developers.html
-.. _`Roundup's Design Document`: spec.html
+.. _`Roundup's Design`: design.html
+.. _original: spec.html
 .. _Upgrading: upgrading.html
 
 
@@ -61,31 +59,19 @@
 implement this system on their time.
 
 Thanks also to the many people on the mailing list and in the sourceforge
-project: Anthony Baxter, Juergen Hermann, Roch'e Compaan, Engelbert Gruber,
-Titus Brown, Jeff Blaine and Patrick Ohly.
+project:
+Anthony Baxter,
+Jeff Blaine,
+Titus Brown,
+Roch'e Compaan,
+Engelbert Gruber,
+Juergen Hermann,
+Gordon McMillan,
+Patrick Ohly.
 
 
 License
 =======
 
-Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/)
-
-This module is free software, and you may redistribute it and/or modify
-under the same terms as Python, so long as this copyright message and
-disclaimer are retained in their original form.
-
-IN NO EVENT SHALL BIZAR SOFTWARE PTY LTD BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OF THIS CODE, EVEN IF BIZAR SOFTWARE PTY LTD HAS BEEN
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+See COPYING.txt in the software distribution for the licensing terms.
 
-BIZAR SOFTWARE PTY LTD SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS"
-BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
-SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
-
-The stylesheet included with this package has been copied from the Zope
-management interface and presumably belongs to Digital Creations.
-