--- a/.hgignore	Tue Apr 24 09:45:59 2012 +0800
+++ b/.hgignore	Wed Apr 25 12:54:31 2012 +0800
@@ -42,4 +42,5 @@
 locale/*.bak
 locale/*.poedit
 website/www/_tmp/
+website/www/docs
 website/www/html/

--- a/doc/ZPL.txt	Tue Apr 24 09:45:59 2012 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-Zope Public License (ZPL) Version 2.0
------------------------------------------------
-
-This software is Copyright (c) Zope Corporation (tm) and
-Contributors. All rights reserved.
-
-This license has been certified as open source. It has also
-been designated as GPL compatible by the Free Software
-Foundation (FSF).
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions in source code must retain the above
-   copyright notice, this list of conditions, and the following
-   disclaimer.
-
-2. Redistributions in binary form must reproduce the above
-   copyright notice, this list of conditions, and the following
-   disclaimer in the documentation and/or other materials
-   provided with the distribution.
-
-3. The name Zope Corporation (tm) must not be used to
-   endorse or promote products derived from this software
-   without prior written permission from Zope Corporation.
-
-4. The right to distribute this software or to use it for
-   any purpose does not give you the right to use Servicemarks
-   (sm) or Trademarks (tm) of Zope Corporation. Use of them is
-   covered in a separate agreement (see
-   http://www.zope.com/Marks).
-
-5. If any files are modified, you must cause the modified
-   files to carry prominent notices stating that you changed
-   the files and the date of any change.
-
-Disclaimer
-
-  THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ``AS IS''
-  AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-  NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
-  NO EVENT SHALL ZOPE CORPORATION OR ITS CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-  DAMAGE.
-
-
-This software consists of contributions made by Zope
-Corporation and many individuals on behalf of Zope
-Corporation.  Specific attributions are listed in the
-accompanying credits file.

--- a/doc/contact.txt	Tue Apr 24 09:45:59 2012 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-Contact
-=======
-
-For general support enquiries about usage, a mailing list is available:
-
-    roundup-users@sourceforge.net
-
-If you've got a great idea for roundup, or have found a bug, please
-submit an issue to the tracker at: 
-
-    http://sourceforge.net/tracker/?group_id=31577
-
-For discussions about developing or enhancing roundup:
-
-    roundup-devel@sourceforge.net
-
-The admin for this project is Richard Jones:
-
-    richard@users.sourceforge.net
-
-but he should only be contacted directly when none of the
-above avenues of contact are suitable.

--- a/doc/index.txt	Tue Apr 24 09:45:59 2012 +0800
+++ b/doc/index.txt	Wed Apr 25 12:54:31 2012 +0800
@@ -2,6 +2,8 @@
 Roundup: an Issue-Tracking System for Knowledge Workers
 =======================================================
 
+For how to contact the community see http://www.roundup-tracker.org .
+
 Contents
 ========
 
@@ -16,10 +18,8 @@
    customizing
    admin_guide
    xmlrpc
-   spec
    original design <design>
    developers
    tracker_templates
-   contact
    acknowledgements
    license

--- a/doc/license.txt	Tue Apr 24 09:45:59 2012 +0800
+++ b/doc/license.txt	Wed Apr 25 12:54:31 2012 +0800
@@ -1,5 +1,8 @@
 License
 =======
 
-See COPYING.txt in the software distribution for the licensing terms.
+Roundup is Free Software under the following license (from the file
+COPYING.txt in the software distribution):
 
+  .. include:: ../../../COPYING.txt
+    :literal:

--- a/website/README.txt	Tue Apr 24 09:45:59 2012 +0800
+++ b/website/README.txt	Wed Apr 25 12:54:31 2012 +0800
@@ -21,8 +21,10 @@
       . docbuilder/bin/activate
  * update the working copy
       cd ${project_home}/src/roundup/website/www
-      FIXME hg pull -u
-      FIXME ln -s ../../doc/ docs
+      hg pull -u /home/scm_hg/r/ro/roundup/roundup
+   (The warning about "Not trusting file 
+   /home/scm_hg/r/ro/roundup/roundup/.hg/hgrc from untrusted user" 
+   can be ignored)
  * build it
       make html
  * you may also "make clean"

--- a/website/www/Makefile	Tue Apr 24 09:45:59 2012 +0800
+++ b/website/www/Makefile	Wed Apr 25 12:54:31 2012 +0800
@@ -11,7 +11,10 @@
 clean:
 	-rm -rf $(TMP)
 
-html:
+docs:
+	ln -s ../../doc ./docs
+
+html: docs
 	mkdir -p $(TMP)/doctrees $(HTML)
 	sphinx-build -b html -d $(TMP)/doctrees . $(HTML)
 

--- a/website/www/docs.txt	Tue Apr 24 09:45:59 2012 +0800
+++ b/website/www/docs.txt	Wed Apr 25 12:54:31 2012 +0800
@@ -6,11 +6,14 @@
 
    docs/features
    docs/installation
+   docs/upgrading
    docs/FAQ
    docs/user_guide
    docs/customizing
    docs/admin_guide
    docs/xmlrpc
-   docs/upgrading
    Design (original) <docs/design>
    docs/developers
+   docs/tracker_templates
+   docs/acknowledgements
+   docs/license