Merge

Author: xiaq

.hgignore

@@ -42,4 +42,5 @@ locale/*.mo
 locale/*.bak
 locale/*.poedit
 website/www/_tmp/
+website/www/docs
 website/www/html/

doc/ZPL.txt

@@ -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 @@ Contents
    customizing
    admin_guide
    xmlrpc
-   spec
    original design <design>
    developers
    tracker_templates
-   contact
    acknowledgements
    license

doc/contact.txt

@@ -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:

doc/index.txt

@@ -21,8 +21,10 @@ www.roundup-tracker.org:
       . 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"

doc/license.txt

@@ -11,7 +11,10 @@ help:
 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)
 

website/README.txt

@@ -6,11 +6,14 @@ Docs
 
    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