Merge

Author: caulagi

.hgignore

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

CHANGES.txt

@@ -69,6 +69,13 @@ Fixed:
   also consume xml data and do something different. So require the use
   of 'http(s)://.../xmlrpc' uri to trigger the xmlrpc interface.
   (John Rouillard)
+- issue2550774: Remove generating documentation with rst2html, and update the
+  README.txt with how to create the html docs using sphinx, thanks Kai Storbeck
+  (John Kristensen)
+- issue2550774: Include doc/conf.py in the release tarball, so people can build
+  their own documentation in html, thanks Kai Storbeck (John Kristensen)
+- issue2550774: Update website/www/Makefile to symlink COPYING.txt so "make"
+  works again, thanks Kai Storbeck (John Kristensen)
 
 2012-05-15: 1.4.20
 

MANIFEST.in

@@ -8,7 +8,7 @@ recursive-include doc *.html *.png *.txt *.css *.1 *.example
 recursive-include detectors *.py
 recursive-include templates *.* home* page*
 global-exclude .svn .cvsignore *.pyc *.pyo .DS_Store
-include run_tests.py *.txt demo.py MANIFEST.in MANIFEST
+include run_tests.py *.txt demo.py MANIFEST.in MANIFEST doc/conf.py
 exclude BUILD.txt I18N_PROGRESS.txt TODO.txt
 exclude doc/security.txt doc/templating.txt
 include locale/*.po locale/*.mo locale/roundup.pot

README.txt

@@ -37,8 +37,9 @@ Usage and Other Information
 ===========================
 See the index.txt file in the "doc" directory.
 The *.txt files in the "doc" directory are written in reStructedText. If
-you have rst2html installed (part of the docutils suite) you can convert
-these to HTML by running "make html" in the "doc" directory.
+you have Sphinx installed, you can convert these to HTML by running
+  $ python setup.py build_doc
+from the top of the release directory.
 
 
 For Developers

doc/Makefile

@@ -9,10 +9,11 @@ help:
 	@echo "  linkcheck to check all external links for integrity"
 
 clean:
-	-rm -rf $(TMP)
+	-rm -rf $(TMP) $(HTML) docs COPYING.txt
 
 docs:
 	ln -s ../../doc ./docs
+	ln -s ../../COPYING.txt
 
 html: docs
 	mkdir -p $(TMP)/doctrees $(HTML)